hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #657 from romainneutron/jquery-move-to-top

Browse Source 
Fix #1484 : Fix jquery dialog moveToTop non working call
This commit is contained in:
Romain Neutron
2013-09-25 02:02:47 -07:00
parent 67900cbfca 3c89f93b1b
commit b13a5294db
1 changed files with 17 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
www/skins/prod/jquery.Feedback.js
View File

@@ -35,36 +35,22 @@
url: $this.attr('href'),
dataType: 'html',
beforeSend:function(){
if($('#user_adder_dialog').length === 0)
{
$('body').append('<div id="user_adder_dialog" title="' + $this.html() + '" style="display:none;"></div>');
}
$('#user_adder_dialog').addClass('loading').empty().dialog({
buttons:{},
draggable:false,
resizable:false,
closeOnEscape:true,
modal:true,
width:'400',
height:'400'
}).dialog( "moveToTop" );
var options = {
size : 'Medium',
title : $this.html()
};
p4.Dialog.Create(options, 2).getDomElement().addClass('loading');
},
success: function(data){
$('#user_adder_dialog').removeClass('loading').empty().append(data);
p4.Dialog.get(2).getDomElement().removeClass('loading').empty().append(data);
return;
},
error: function(){
if ($('#user_adder_dialog').data("ui-dialog")) {
$('#user_adder_dialog').dialog('destroy');
}
$('#user_adder_dialog').remove();
p4.Dialog.get(2).Close();
return;
},
timeout: function(){
if ($('#user_adder_dialog').data("ui-dialog")) {
$('#user_adder_dialog').dialog('destroy');
}
$('#user_adder_dialog').remove();
p4.Dialog.get(2).Close();
return;
}
});
@@ -469,36 +455,21 @@
url: $this.attr('href'),
dataType: 'html',
beforeSend:function(){
if($('#user_adder_dialog').length === 0)
{
$('body').append('<div id="user_adder_dialog" style="display:none;"></div>');
}
$('#user_adder_dialog').addClass('loading').empty().dialog({
buttons:{},
draggable:false,
resizable:false,
closeOnEscape:true,
modal:true,
width:'400',
height:'400'
}).dialog( "moveToTop" );
},
var options = {
size : 'Medium',
title : $this.html()
};
p4.Dialog.Create(options, 2).getDomElement().addClass('loading'); },
success: function(data){
$('#user_adder_dialog').removeClass('loading').empty().append(data);
p4.Dialog.get(2).getDomElement().removeClass('loading').empty().append(data);
return;
},
error: function(){
if ($('#user_adder_dialog').data("ui-dialog")) {
$('#user_adder_dialog').dialog('destroy');
}
$('#user_adder_dialog').remove();
p4.Dialog.get(2).Close();
return;
},
timeout: function(){
if ($('#user_adder_dialog').data("ui-dialog")) {
$('#user_adder_dialog').dialog('destroy');
}
$('#user_adder_dialog').remove();
p4.Dialog.get(2).Close();
return;
}
});
@@ -739,4 +710,4 @@
window.Feedback = Feedback;
window.ListManager = ListManager;
}(window));
}(window));