Return false from ui.Confirmation callback will avoid closing the dia…

…log.
hyphyphyph · Jun 4, 2012 · c18b882 · c18b882
1 parent c1737db
commit c18b882
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/build/ui.js b/build/ui.js
@@ -330,9 +330,9 @@ Dialog.prototype.hide = function(ms){
   // hide / remove
   this.el.addClass('hide');
   if (this._effect) {
-    setTimeout(function(self){
+    setTimeout(function(){
       self.remove();
-    }, 500, this);
+    }, 500);
   } else {
     self.remove();
   }
@@ -448,7 +448,7 @@ Overlay.prototype.hide = function(){
 exports.Confirmation = Confirmation;
 
 /**
- * Return a new `Confirmation` dialog with the given 
+ * Return a new `Confirmation` dialog with the given
  * `title` and `msg`.
  *
  * @param {String} title or msg
@@ -562,15 +562,16 @@ Confirmation.prototype.render = function(options){
   actions.find('.cancel').click(function(e){
     e.preventDefault();
     self.emit('cancel');
-    self.callback(false);
+    self.callback(false)
     self.hide();
   });
 
   actions.find('.ok').click(function(e){
     e.preventDefault();
     self.emit('ok');
-    self.callback(true);
-    self.hide();
+    if (self.callback(true) !== false) {
+      self.hide();
+    }
   });
 };
 
@@ -1148,9 +1149,9 @@ Notification.prototype.hide = function(ms){
   // hide / remove
   this.el.addClass('hide');
   if (this._effect) {
-    setTimeout(function(self){
+    setTimeout(function(){
       self.remove();
-    }, 500, this);
+    }, 500);
   } else {
     self.remove();
   }
@@ -1297,7 +1298,7 @@ exports.Menu = Menu;
  */
 
 exports.menu = function(){
-  return new Menu();
+  return new Menu;
 };
 
 /**

diff --git a/lib/components/confirmation/confirmation.js b/lib/components/confirmation/confirmation.js
@@ -6,7 +6,7 @@
 exports.Confirmation = Confirmation;
 
 /**
- * Return a new `Confirmation` dialog with the given 
+ * Return a new `Confirmation` dialog with the given
  * `title` and `msg`.
  *
  * @param {String} title or msg
@@ -120,14 +120,15 @@ Confirmation.prototype.render = function(options){
   actions.find('.cancel').click(function(e){
     e.preventDefault();
     self.emit('cancel');
-    self.callback(false);
+    self.callback(false)
     self.hide();
   });
 
   actions.find('.ok').click(function(e){
     e.preventDefault();
     self.emit('ok');
-    self.callback(true);
-    self.hide();
+    if (self.callback(true) !== false) {
+      self.hide();
+    }
   });
 };