Merge pull request #26 from dovrosenberg/master

Possible solution to issue #25
pahans · Feb 23, 2015 · 97676c0 · 97676c0
2 parents 23102ba + ccda501
commit 97676c0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/reactive-modal.js b/lib/reactive-modal.js
@@ -50,7 +50,7 @@ ReactiveModal.initDialog = function (info){
       _.extend(newButton, new EV());
       info.buttons[button] = newButton;
       newButton.closeModalOnClick = (info.buttons[button].closeModalOnClick === undefined || info.buttons[button].closeModalOnClick === true) ? true : false;
-      newButton.disabled = new ReactiveVar((info.buttons[button].disabled === undefined || info.buttons[button].disabled === false) ? false : true);
+      newButton.disabled = new ReactiveVar((info.buttons[button].disabled === undefined || info.buttons[button].disabled === false || (info.buttons[button].disabled instanceof ReactiveVar && info.buttons[button].disabled.curValue===false)) ? false : true);
       newButton.disable =  function () {newButton.disabled.set(true);},
       newButton.enable = function () {newButton.disabled.set(false);}
     };