Merge pull request olton#236 from Kation/master

Fix And New Feature
spidla · May 16, 2013 · 6e63d79 · 6e63d79
2 parents 37fd723 + bb794f9
commit 6e63d79
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/css/modern.css b/css/modern.css
@@ -7231,7 +7231,7 @@ License:	CC BY-SA 3.0 -- http://creativecommons.org/licenses/by-sa/3.0/
   top: 0;
   left: 0;
   background-color: rgba(235, 235, 235, 0.5);
-  z-index: 1;
+  z-index: 9999;
 }
 .metrouicss .calendar {
   background-color: #ffffff !important;

diff --git a/javascript/dialog.js b/javascript/dialog.js
@@ -137,9 +137,12 @@
             buttons.eq(i++).click(function(){
                 // Calling function and hide the dialog   
 
-                obj.action();
-                $.Dialog.hide();
-                return false;
+                //Get button return value
+                var result = obj.action();
+                if (result != false){
+                    $.Dialog.hide();
+                    return false;
+                }
             });
         });
     }