diff --git a/public/static/common/lib/amazeui-dialog/amazeui.dialog.js b/public/static/common/lib/amazeui-dialog/amazeui.dialog.js index 64fd5d4d5..e88098fd8 100755 --- a/public/static/common/lib/amazeui-dialog/amazeui.dialog.js +++ b/public/static/common/lib/amazeui-dialog/amazeui.dialog.js @@ -55,7 +55,7 @@ dialog.alert = function(options) { setTimeout(function() { $this.remove(); - }, 2000); + }, 1000); }); }; @@ -92,32 +92,32 @@ dialog.confirm = function(options) { setTimeout(function() { $this.remove(); - }, 2000); + }, 1000); }); }; dialog.loading = function(options) { - options = options || {}; - options.title = options.title || '正在载入...'; + if(options == 'close') { + $('#my-modal-loading').modal('close'); + } else { + options = options || {}; + options.title = options.title || '正在载入...'; - var html = []; - html.push('
'); - html.push('
'); - html.push('
' + options.title + '
'); - html.push('
'); - html.push(''); - html.push('
'); - html.push('
'); - html.push('
'); + var html = []; + html.push('
'); + html.push('
'); + html.push('
'); + html.push(''); + html.push('' + options.title + ''); + html.push('
'); + html.push('
'); + html.push('
'); - return $(html.join('')).appendTo('body').modal() - .on('closed.modal.amui', function() { - var $this = $(this); - setTimeout(function() - { - $this.remove(); - }, 2000); - }); + return $(html.join('')).appendTo('body').modal() + .on('closed.modal.amui', function() { + $(this).remove(); + }); + } }; dialog.actions = function(options) { @@ -192,7 +192,7 @@ dialog.popup = function(options) { setTimeout(function() { $this.remove(); - }, 2000); + }, 1000); options.onClose(); }); };