Merge branch 'master' into csrf

README.rst

@@ -52,7 +52,7 @@ External code
 
 The following external libraries are provided with Modoboa:
 
- * jQuery version 1.7.1 (http://www.jquery.org/)
- * jQuery-UI 1.8+ (http://jqueryui.com/)
- * Bootstrap, from Twitter version 2.3.1 (http://twitter.github.com/bootstrap/)
- * Bootstrap datepicker (https://bitbucket.org/eternicode/bootstrap-datepicker)
+* jQuery version 1.9.1 (http://www.jquery.org/)
+* jQuery-UI 1.10+ (http://jqueryui.com/)
+* Bootstrap, from Twitter version 2.3.1 (http://twitter.github.com/bootstrap/)
+* Bootstrap datepicker (https://bitbucket.org/eternicode/bootstrap-datepicker)

modoboa/static/js/global.js

@@ -38,20 +38,31 @@ function modalbox(e, css, defhref, defcb, defclosecb) {
             }
             return;
         }
-        var $div = $('<div id="modalbox" class="modal" >' + data + '</div>')
-            .one('shown', function() {
-                $(".help").popover().click(function(e) {e.preventDefault();});
-                if (modalcb != undefined) {
-                    if (typeof modalcb === "function") modalcb(); else eval(modalcb + '()');
-                }
-            })
-            .on('hidden', function() {
-                $("#modalbox").remove();
-                if (closecb != undefined) {
-                    if (typeof closecb === "function") closecb(); else eval(closecb + '()');
-                }
-            })
-            .modal();
+        var $div = $('<div />', {
+            id: "modalbox", 'class': "modal", html: data
+        });
+
+        $div.modal({show: false});
+        $div.one('shown', function() {
+            $(".help").popover({
+                container: "#modalbox"
+            }).click(function(e) {e.preventDefault();});
+            if (modalcb != undefined) {
+                if (typeof modalcb === "function") modalcb(); else eval(modalcb + '()');
+            }
+        })
+        .on('hidden', function(e) {
+            var $target = $(e.target);
+
+            if (!$target.is($(this))) {
+                return;
+            }
+            $("#modalbox").remove();
+            if (closecb != undefined) {
+                if (typeof closecb === "function") closecb(); else eval(closecb + '()');
+            }
+        });
+        $div.modal('show');
 
         if (css != undefined) {
             $div.css(css);