Remove duplicate code.

hyphyphyph · Jun 5, 2012 · 87ff76e · 87ff76e
1 parent fae23cc
commit 87ff76e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/build/ui.js b/build/ui.js
@@ -563,6 +563,14 @@ Confirmation.prototype.render = function(options){
   actions.find('.cancel').click(function(e){
     e.preventDefault();
     self.emit('cancel');
+    if(self.async){
+        self.callback(false, function () {
+            self.hide();
+        });
+    }
+    else {
+        (self.callback(false) !== false && self.hide());
+    }
     self.callback(false)
     self.hide();
   });
@@ -576,7 +584,7 @@ Confirmation.prototype.render = function(options){
       });
     }
     else{
-      self.callback(true) !== false && self.hide();
+      (self.callback(true) !== false && self.hide());
     }
   });
 };

diff --git a/lib/components/confirmation/confirmation.js b/lib/components/confirmation/confirmation.js
@@ -129,8 +129,6 @@ Confirmation.prototype.render = function(options){
     else {
         (self.callback(false) !== false && self.hide());
     }
-    self.callback(false)
-    self.hide();
   });
 
   actions.find('.ok').click(function(e){