').appendTo(node)
};
self.trigger('uiready');
@@ -5288,7 +5291,10 @@ var elFinder = function(elm, opts, bootCallback) {
self.ui[ui][name](self, opts);
}
});
-
+
+ self.ui.progressbar.appendTo(self.ui.workzone);
+ self.ui.notify.prev('.ui-dialog-titlebar').append('
');
+
// update size
self.resize(width, height);
@@ -8448,14 +8454,17 @@ elFinder.prototype = {
* @return elFinder
*/
notify : function(opts) {
- var type = opts.type,
+ var self = this,
+ type = opts.type,
id = opts.id? 'elfinder-notify-'+opts.id : '',
msg = this.i18n((typeof opts.msg !== 'undefined')? opts.msg : (this.messages['ntf'+type] ? 'ntf'+type : 'ntfsmth')),
+ hiddens = this.arrayFlip(this.options.notifyDialog.hiddens || []),
ndialog = this.ui.notify,
+ dialog = ndialog.closest('.ui-dialog'),
notify = ndialog.children('.elfinder-notify-'+type+(id? ('.'+id) : '')),
button = notify.children('div.elfinder-notify-cancel').children('button'),
ntpl = '
',
- delta = opts.cnt,
+ delta = opts.cnt + 0,
size = (typeof opts.size != 'undefined')? parseInt(opts.size) : null,
progress = (typeof opts.progress != 'undefined' && opts.progress >= 0) ? opts.progress : null,
fakeint = opts.fakeinterval || 200,
@@ -8465,7 +8474,14 @@ elFinder.prototype = {
var prog = notify.find('.elfinder-notify-progress'),
rm = function() {
notify.remove();
- !ndialog.children().length && ndialog.elfinderdialog('close');
+ if (!ndialog.children(dialog.data('minimized')? void(0) : ':visible').length) {
+ if (dialog.data('minimized')) {
+ dialog.data('minimized').hide();
+ } else {
+ ndialog.elfinderdialog('close');
+ }
+ }
+ setProgressbar();
};
notify._esc && $(document).off('keydown', notify._esc);
if (notify.data('cur') < 100) {
@@ -8480,15 +8496,32 @@ elFinder.prototype = {
var cur;
if (notify.length) {
cur = notify.data('cur') + 1;
- if (cur < 90) {
+ if (cur <= 98) {
notify.find('.elfinder-notify-progress').width(cur + '%');
notify.data('cur', cur);
+ setProgressbar();
setTimeout(function() {
- fakeUp(interval + 10);
+ interval *= 1.05;
+ fakeUp(interval);
}, interval);
}
}
},
+ setProgressbar = function() {
+ var cnt = 0,
+ val = 0,
+ w;
+ ndialog.children('.elfinder-notify').each(function() {
+ cnt++;
+ val += Math.min($(this).data('cur'), 100);
+ });
+ w = cnt? Math.floor(val / (cnt * 100) * 100) + '%' : 0;
+ self.ui.progressbar.width(w);
+ if (dialog.data('minimized')) {
+ dialog.data('minimized').title(w);
+ dialog.data('minimized').dialog().children('.ui-dialog-titlebar').children('.elfinder-ui-progressbar').width(w);
+ }
+ },
cnt, total, prc;
if (!type) {
@@ -8496,9 +8529,15 @@ elFinder.prototype = {
}
if (!notify.length) {
- notify = $(ntpl.replace(/\{type\}/g, type).replace(/\{msg\}/g, msg))
- .appendTo(ndialog)
- .data('cnt', 0);
+ notify = $(ntpl.replace(/\{type\}/g, type).replace(/\{msg\}/g, msg));
+ if (hiddens[type]) {
+ notify.hide();
+ } else {
+ ndialog.on('minimize', function(e) {
+ dialog.data('minimized') && setProgressbar();
+ });
+ }
+ notify.appendTo(ndialog).data('cnt', 0);
if (progress != null) {
notify.data({progress : 0, total : 0, cur : 0});
@@ -8508,7 +8547,7 @@ elFinder.prototype = {
}
if (cancel) {
- button = $('
')
+ button = $('
')
.on('mouseenter mouseleave', function(e) {
$(this).toggleClass(clhover, e.type === 'mouseenter');
});
@@ -8545,7 +8584,13 @@ elFinder.prototype = {
}
!opts.hideCnt && notify.children('.elfinder-notify-cnt').text('('+cnt+')');
- ndialog.is(':hidden') && ndialog.elfinderdialog('open', this).height('auto');
+ if (delta > 0 && ndialog.is(':hidden') && !hiddens[type]) {
+ if (dialog.data('minimized')) {
+ dialog.data('minimized').show();
+ } else {
+ ndialog.elfinderdialog('open', this).height('auto');
+ }
+ }
notify.data('cnt', cnt);
if ((progress != null)
@@ -8567,6 +8612,7 @@ elFinder.prototype = {
width : (progress < 100 ? progress : 100)+'%'
}, 20, function() {
notify.data('cur', progress);
+ setProgressbar();
});
}
diff --git a/js/elFinder.options.js b/js/elFinder.options.js
index bc7e8ca00..9af08b6f1 100644
--- a/js/elFinder.options.js
+++ b/js/elFinder.options.js
@@ -1146,7 +1146,7 @@ elFinder.prototype._options = {
* @default {position: {}, width : null} - Apply CSS definition
* position: CSS object | null (null: position center & middle)
*/
- notifyDialog : {position: {}, width : null},
+ notifyDialog : {position : {}, width : null, canClose : false, hiddens : ['open']},
/**
* Dialog contained in the elFinder node
diff --git a/js/ui/dialog.js b/js/ui/dialog.js
index e2e58126e..46b96f601 100644
--- a/js/ui/dialog.js
+++ b/js/ui/dialog.js
@@ -69,6 +69,8 @@ $.fn.elfinderdialog = function(opts, fm) {
if (opts === 'destroy') {
dialog.remove();
fm.trigger('dialogremoved', {dialog: dialog});
+ } else if (dialog.data('minimized')) {
+ dialog.data('minimized').close();
}
} else if (opts === 'toTop') {
dialog.trigger('totop');
@@ -251,13 +253,24 @@ $.fn.elfinderdialog = function(opts, fm) {
tray = fm.getUI('bottomtray'),
dumStyle = { width: 70, height: 24 },
dum = $('
').css(dumStyle).addClass(dialog.get(0).className + ' elfinder-dialog-minimized'),
+ close = function() {
+ mnode.remove();
+ dialog.removeData('minimized').show();
+ self.elfinderdialog('close');
+ },
pos = {};
e.preventDefault();
e.stopPropagation();
if (!dialog.data('minimized')) {
// minimize
- doffset = dialog.data('minimized', true).position();
+ doffset = dialog.data('minimized', {
+ dialog : function() { return mnode; },
+ show : function() { mnode.show(); },
+ hide : function() { mnode.hide(); },
+ close : close,
+ title : function(v) { mnode.children('.ui-dialog-titlebar').children('.elfinder-dialog-title').text(v); }
+ }).position();
mnode = dialog.clone().on('mousedown', function() {
$this.trigger('mousedown');
}).removeClass('ui-draggable ui-resizable elfinder-frontmost');
@@ -271,9 +284,7 @@ $.fn.elfinderdialog = function(opts, fm) {
mnode.find('.ui-dialog-titlebar-close').on('mousedown', function(e) {
e.stopPropagation();
e.preventDefault();
- mnode.remove();
- dialog.show();
- self.elfinderdialog('close');
+ close();
});
mnode.animate(pos, function() {
mnode.attr('style', '')