浏览代码

merge origin repository

codepiano 10 年之前
父节点
当前提交
0f7e3c35bf
共有 4 个文件被更改,包括 12 次插入1 次删除
  1. 1 0
      changelog.txt
  2. 5 0
      dist/js/bootstrap-dialog.js
  3. 1 1
      dist/js/bootstrap-dialog.min.js
  4. 5 0
      src/js/bootstrap-dialog.js

+ 1 - 0
changelog.txt

@@ -2,6 +2,7 @@ LASTEST NOT RELEASED
 ------------------------------
 * Refs #176 *
 * Refs #109, Add methods getDialog(), setDialog() and addDialog() to BootstrapDialog. *
+* Refs #201 *
 
 V1.34.6
 ------------------------------

+ 5 - 0
dist/js/bootstrap-dialog.js

@@ -861,6 +861,11 @@
             // Dynamically add extra functions to $button
             this.enhanceButton($button);
 
+            //Initialize enabled or not
+            if(typeof button.enabled !== 'undefined') {
+              $button.toggleEnable(button.enabled);
+            }
+
             return $button;
         },
         /**

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


+ 5 - 0
src/js/bootstrap-dialog.js

@@ -861,6 +861,11 @@
             // Dynamically add extra functions to $button
             this.enhanceButton($button);
 
+            //Initialize enabled or not
+            if(typeof button.enabled !== 'undefined') {
+              $button.toggleEnable(button.enabled);
+            }
+
             return $button;
         },
         /**