mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Dan Stillman 2016-07-07 04:08:11 -04:00
parent 9f9e95ea96
commit 72bad4309b
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
chrome/content/zotero/bindings/merge.xml
View file

@ -299,6 +299,16 @@
<![CDATA[ <![CDATA[
this._data = val; 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) { if (val.deleted) {
this.deleted = true; this.deleted = true;
return; return;
@ -341,18 +351,6 @@
objbox.setAttribute("flex", "1"); objbox.setAttribute("flex", "1");
objbox.mode = this.type == 'file' ? 'filemerge' : 'merge'; 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 // Store JSON
this._data = val; this._data = val;