www

commit 72bad4309b77a02ac642c4643f0981565a5b9aa6
parent 9f9e95ea96ff634a5a72d127a58fdad73bec93e5
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu,  7 Jul 2016 04:08:11 -0400

Show "Choose Parent" button for deleted items in CR window

Diffstat:
M
chrome/content/zotero/bindings/merge.xml
 | 
22
++++++++++------------

1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/chrome/content/zotero/bindings/merge.xml b/chrome/content/zotero/bindings/merge.xml
@@ -299,6 +299,16 @@
 				<![CDATA[
 					this._data = val;
 					
+					var button = this._id('choose-button');
+					if (this.showButton) {
+						button.label = Zotero.getString('sync.conflict.chooseThisVersion');
+						button.onclick = () => this.parent.choosePane(this);
+						button.hidden = false;
+					}
+					else {
+						button.hidden = true;
+					}
+					
 					if (val.deleted) {
 						this.deleted = true;
 						return;
@@ -341,18 +351,6 @@
 					objbox.setAttribute("flex", "1");
 					objbox.mode = this.type == 'file' ? 'filemerge' : 'merge';
 					
-					var button = this._id('choose-button');
-					if (this.showButton) {
-						button.label = Zotero.getString('sync.conflict.chooseThisVersion');
-						button.onclick = function () {
-							this.parent.choosePane(this);
-						}.bind(this);
-						button.hidden = false;
-					}
-					else {
-						button.hidden = true;
-					}
-					
 					// Store JSON
 					this._data = val;