浏览代码

improving.

Dante 10 年之前
父节点
当前提交
d19d2ce4b2
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      assets/bootstrap-dialog/js/bootstrap-dialog.js
  2. 1 1
      assets/bootstrap-dialog/js/bootstrap-dialog.min.js

+ 2 - 2
assets/bootstrap-dialog/js/bootstrap-dialog.js

@@ -21,7 +21,7 @@
     }
     // AMD module is defined
     else if (typeof define === "function" && define.amd) {
-        define("bootstrap-dialog", ["jquery"], function($) {
+        define("bootstrap-dialog", ["jquery", "bootstrap"], function($) {
             return factory($);
         });
     } else {
@@ -56,7 +56,7 @@
 
         return version;
     };
-    BootstrapDialogModal.ORIGINAL_BODY_PADDING = $('body').css('padding-right') || 0;
+    BootstrapDialogModal.ORIGINAL_BODY_PADDING = parseInt(($('body').css('padding-right') || 0), 10);
     BootstrapDialogModal.METHODS_TO_OVERRIDE = {};
     BootstrapDialogModal.METHODS_TO_OVERRIDE['v3.1'] = {};
     BootstrapDialogModal.METHODS_TO_OVERRIDE['v3.2'] = {

文件差异内容过多而无法显示
+ 1 - 1
assets/bootstrap-dialog/js/bootstrap-dialog.min.js