From 572f7b0f82632287581b71b15c6ba31cf302efee Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Fri, 11 Sep 2015 13:10:14 +0000 Subject: [PATCH] Minor fixes --- plugins/c9.ide.dialog.common/filechange.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/c9.ide.dialog.common/filechange.js b/plugins/c9.ide.dialog.common/filechange.js index 37883cf1..189777b1 100644 --- a/plugins/c9.ide.dialog.common/filechange.js +++ b/plugins/c9.ide.dialog.common/filechange.js @@ -41,14 +41,14 @@ define(function(require, module, exports) { if (options.merge) { var mergeBoth = plugin.getElement("mergeboth"); - if (options.merge.caption) mergeBoth.setAttribute("caption", options.mergeBoth.caption); + if (options.merge.caption) mergeBoth.setAttribute("caption", options.merge.caption); } plugin.update([ { id: "keepmine", onclick: function(){ plugin.hide(); onlocal(cb.value); } }, { id: "useremote", onclick: function(){ plugin.hide(); onremote(cb.value); } }, - { id: "mergeboth", visible: options.merge, onclick: function(){ plugin.hide(); onmerge(cb.value); } } + { id: "mergeboth", visible: !!options.merge, onclick: function(){ plugin.hide(); onmerge(cb.value); } } ]); }); }