From f3d2f9a25bd7096756e0b80d1b795d406d82f647 Mon Sep 17 00:00:00 2001 From: dovrosenberg Date: Thu, 19 Feb 2015 20:24:13 -0500 Subject: [PATCH 1/2] FIx bug when resubmitting a settings object multiple times .disabled was being improperly set to true if it was not a boolean coming in --- lib/reactive-modal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reactive-modal.js b/lib/reactive-modal.js index c3bc7e6..f2ffb1d 100644 --- 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); + 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);} }; From ccda5012d7e50c25b670d560e9a1f0871fc3f134 Mon Sep 17 00:00:00 2001 From: dovrosenberg Date: Mon, 23 Feb 2015 09:07:06 -0500 Subject: [PATCH 2/2] fix error introduced in branch related to .disabled --- lib/reactive-modal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reactive-modal.js b/lib/reactive-modal.js index f2ffb1d..4504697 100644 --- 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; - 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.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);} };