summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-08-14 17:49:45 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-08-14 17:49:45 +0200
commit9da49264ea6edbad13455a3e66d7f369f2e8448f (patch)
treecb7a660e62f894f689dc933391b0e53fccc7c112 /core/js
parente1927d5bee11b561a293a9488bd27d90c2c043e6 (diff)
downloadnextcloud-server-9da49264ea6edbad13455a3e66d7f369f2e8448f.tar.gz
nextcloud-server-9da49264ea6edbad13455a3e66d7f369f2e8448f.zip
change filelist ui updates
Diffstat (limited to 'core/js')
-rw-r--r--core/js/jquery.ocdialog.js9
-rw-r--r--core/js/oc-dialogs.js9
2 files changed, 7 insertions, 11 deletions
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index 52ff5633f9a..ce991052271 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -40,6 +40,9 @@
}
// Escape
if(event.keyCode === 27 && self.options.closeOnEscape) {
+ if (self.closeCB) {
+ self.closeCB();
+ }
self.close();
return false;
}
@@ -190,7 +193,7 @@
}
},
widget: function() {
- return this.$dialog
+ return this.$dialog;
},
close: function() {
this._destroyOverlay();
@@ -203,10 +206,10 @@
},
destroy: function() {
if(this.$title) {
- this.$title.remove()
+ this.$title.remove();
}
if(this.$buttonrow) {
- this.$buttonrow.remove()
+ this.$buttonrow.remove();
}
if(this.originalTitle) {
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index cf77f5018a6..88a3f6628cb 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -297,14 +297,7 @@ var OCdialogs = {
closeOnEscape: true,
modal: true,
buttons: buttonlist,
- close: function(event, ui) {
- try {
- $(this).ocdialog('destroy').remove();
- } catch(e) {
- alert (e);
- }
- self.$ = null;
- }
+ closeButton: null
});
OCdialogs.dialogs_counter++;