From eca00d8fce1e46799ffa9cf2071dfe6075200831 Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Tue, 22 Oct 2013 12:50:44 -0400
Subject: [PATCH] Adds onApprove/deny callback can cancel hide

---
 src/modules/modal.js | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/modules/modal.js b/src/modules/modal.js
index 7131481ce..34d1862fa 100755
--- a/src/modules/modal.js
+++ b/src/modules/modal.js
@@ -63,6 +63,11 @@ $.fn.modal = function(parameters) {
         initialize: function() {
           module.verbose('Initializing dimmer', $context);
 
+          if(typeof $.fn.dimmer === undefined) {
+            module.error(error.dimmer);
+            return;
+          }
+
           $dimmable = $context
             .dimmer({
               closable : false,
@@ -140,12 +145,18 @@ $.fn.modal = function(parameters) {
           close: function() {
             module.verbose('Closing element pressed');
             if( $(this).is(selector.approve) ) {
-              $.proxy(settings.onApprove, element)();
+              if($.proxy(settings.onApprove, element)()) {
+                modal.hide();
+              }
             }
             if( $(this).is(selector.deny) ) {
-              $.proxy(settings.onDeny, element)();
+              if($.proxy(settings.onDeny, element)()) {
+                modal.hide();
+              }
+            }
+            else {
+              module.hide();
             }
-            module.hide();
           },
           click: function(event) {
             module.verbose('Determining if event occured on dimmer', event);
@@ -282,7 +293,7 @@ $.fn.modal = function(parameters) {
 
         restore: {
           focus: function() {
-            if($focusedElement.size() > 0) {
+            if($focusedElement && $focusedElement.size() > 0) {
               $focusedElement.focus();
             }
           }
@@ -571,8 +582,8 @@ $.fn.modal.settings = {
 
   onShow      : function(){},
   onHide      : function(){},
-  onApprove   : function(){},
-  onDeny      : function(){},
+  onApprove   : function(){ return true; },
+  onDeny      : function(){ return true; },
 
   selector    : {
     close    : '.close, .actions .button',
@@ -580,6 +591,7 @@ $.fn.modal.settings = {
     deny     : '.actions .negative, .actions .cancel'
   },
   error : {
+    dimmer : 'UI Dimmer, a required component is not included in this page',
     method : 'The method you called is not defined.'
   },
   className : {