mirror of
https://github.com/zotero/zotero.git
synced 2026-09-29 01:41:24 +00:00
Indent some switch case statements
For current style
This commit is contained in:
Dan Stillman
parent
c41eb54278
commit
c44d845c8c
2 changed files with 159 additions and 159 deletions
|
|
@ -608,118 +608,118 @@ Zotero.DataObjectUtilities = {
|
|||
}
|
||||
else if (c.op == 'member-add') {
|
||||
switch (c.field) {
|
||||
case 'collections':
|
||||
if (json[c.field].indexOf(c.value) == -1) {
|
||||
json[c.field].push(c.value);
|
||||
}
|
||||
break;
|
||||
|
||||
case 'creators':
|
||||
throw new Error("Unimplemented");
|
||||
break;
|
||||
|
||||
case 'conditions':
|
||||
case 'tags':
|
||||
let found = false;
|
||||
let f = c.field == 'conditions' ? Zotero.SearchConditions : Zotero.Tags;
|
||||
for (let i = 0; i < json[c.field].length; i++) {
|
||||
if (f.equals(json[c.field][i], c.value)) {
|
||||
found = true;
|
||||
break;
|
||||
case 'collections':
|
||||
if (json[c.field].indexOf(c.value) == -1) {
|
||||
json[c.field].push(c.value);
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
json[c.field].push(c.value);
|
||||
}
|
||||
break;
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new Error("Unexpected field '" + c.field + "'");
|
||||
case 'creators':
|
||||
throw new Error("Unimplemented");
|
||||
break;
|
||||
|
||||
case 'conditions':
|
||||
case 'tags':
|
||||
let found = false;
|
||||
let f = c.field == 'conditions' ? Zotero.SearchConditions : Zotero.Tags;
|
||||
for (let i = 0; i < json[c.field].length; i++) {
|
||||
if (f.equals(json[c.field][i], c.value)) {
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
json[c.field].push(c.value);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new Error("Unexpected field '" + c.field + "'");
|
||||
}
|
||||
}
|
||||
else if (c.op == 'member-remove') {
|
||||
switch (c.field) {
|
||||
case 'collections':
|
||||
let pos = json[c.field].indexOf(c.value);
|
||||
if (pos == -1) {
|
||||
continue;
|
||||
}
|
||||
json[c.field].splice(pos, 1);
|
||||
break;
|
||||
|
||||
case 'creators':
|
||||
throw new Error("Unimplemented");
|
||||
break;
|
||||
|
||||
case 'conditions':
|
||||
case 'tags':
|
||||
let f = c.field == 'conditions' ? Zotero.SearchConditions : Zotero.Tags;
|
||||
for (let i = 0; i < json[c.field].length; i++) {
|
||||
if (f.equals(json[c.field][i], c.value)) {
|
||||
json[c.field].splice(i, 1);
|
||||
break;
|
||||
case 'collections':
|
||||
let pos = json[c.field].indexOf(c.value);
|
||||
if (pos == -1) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
break;
|
||||
json[c.field].splice(pos, 1);
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new Error("Unexpected field '" + c.field + "'");
|
||||
case 'creators':
|
||||
throw new Error("Unimplemented");
|
||||
break;
|
||||
|
||||
case 'conditions':
|
||||
case 'tags':
|
||||
let f = c.field == 'conditions' ? Zotero.SearchConditions : Zotero.Tags;
|
||||
for (let i = 0; i < json[c.field].length; i++) {
|
||||
if (f.equals(json[c.field][i], c.value)) {
|
||||
json[c.field].splice(i, 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new Error("Unexpected field '" + c.field + "'");
|
||||
}
|
||||
}
|
||||
else if (c.op == 'property-member-add') {
|
||||
switch (c.field) {
|
||||
case 'relations':
|
||||
let obj = json[c.field];
|
||||
let prop = c.value.key;
|
||||
let val = c.value.value;
|
||||
if (!obj) {
|
||||
obj = json[c.field] = {};
|
||||
}
|
||||
if (!obj[prop]) {
|
||||
obj[prop] = [];
|
||||
}
|
||||
// Convert string to array
|
||||
if (typeof obj[prop] == 'string') {
|
||||
obj[prop] = [obj[prop]];
|
||||
}
|
||||
if (obj[prop].indexOf(val) == -1) {
|
||||
obj[prop].push(val);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new Error("Unexpected field '" + c.field + "'");
|
||||
case 'relations':
|
||||
let obj = json[c.field];
|
||||
let prop = c.value.key;
|
||||
let val = c.value.value;
|
||||
if (!obj) {
|
||||
obj = json[c.field] = {};
|
||||
}
|
||||
if (!obj[prop]) {
|
||||
obj[prop] = [];
|
||||
}
|
||||
// Convert string to array
|
||||
if (typeof obj[prop] == 'string') {
|
||||
obj[prop] = [obj[prop]];
|
||||
}
|
||||
if (obj[prop].indexOf(val) == -1) {
|
||||
obj[prop].push(val);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new Error("Unexpected field '" + c.field + "'");
|
||||
}
|
||||
}
|
||||
else if (c.op == 'property-member-remove') {
|
||||
switch (c.field) {
|
||||
case 'relations':
|
||||
let obj = json[c.field];
|
||||
let prop = c.value.key;
|
||||
let val = c.value.value;
|
||||
if (!obj || !obj[prop]) {
|
||||
continue;
|
||||
}
|
||||
if (typeof obj[prop] == 'string') {
|
||||
// If propetty was the specified string, remove property
|
||||
if (obj[prop] === val) {
|
||||
case 'relations':
|
||||
let obj = json[c.field];
|
||||
let prop = c.value.key;
|
||||
let val = c.value.value;
|
||||
if (!obj || !obj[prop]) {
|
||||
continue;
|
||||
}
|
||||
if (typeof obj[prop] == 'string') {
|
||||
// If propetty was the specified string, remove property
|
||||
if (obj[prop] === val) {
|
||||
delete obj[prop];
|
||||
}
|
||||
continue;
|
||||
}
|
||||
let pos = obj[prop].indexOf(val);
|
||||
if (pos == -1) {
|
||||
continue;
|
||||
}
|
||||
obj[prop].splice(pos, 1);
|
||||
// If no more members in property array, remove property
|
||||
if (obj[prop].length == 0) {
|
||||
delete obj[prop];
|
||||
}
|
||||
continue;
|
||||
}
|
||||
let pos = obj[prop].indexOf(val);
|
||||
if (pos == -1) {
|
||||
continue;
|
||||
}
|
||||
obj[prop].splice(pos, 1);
|
||||
// If no more members in property array, remove property
|
||||
if (obj[prop].length == 0) {
|
||||
delete obj[prop];
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new Error("Unexpected field '" + c.field + "'");
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new Error("Unexpected field '" + c.field + "'");
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
|
|||
|
|
@ -1031,45 +1031,45 @@ Zotero.Sync.Data.Local = {
|
|||
Zotero.debug(ObjectType + " was deleted locally");
|
||||
|
||||
switch (objectType) {
|
||||
case 'item':
|
||||
if (jsonData.deleted) {
|
||||
Zotero.debug("Remote item is in trash -- allowing local deletion to propagate");
|
||||
case 'item':
|
||||
if (jsonData.deleted) {
|
||||
Zotero.debug("Remote item is in trash -- allowing local deletion to propagate");
|
||||
results.push({
|
||||
libraryID,
|
||||
key: objectKey,
|
||||
processed: true
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
results.push({
|
||||
libraryID,
|
||||
key: objectKey,
|
||||
processed: true
|
||||
processed: false,
|
||||
conflict: true,
|
||||
left: {
|
||||
deleted: true,
|
||||
dateDeleted: Zotero.Date.dateToSQL(dateDeleted, true)
|
||||
},
|
||||
right: jsonData
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
results.push({
|
||||
libraryID,
|
||||
key: objectKey,
|
||||
processed: false,
|
||||
conflict: true,
|
||||
left: {
|
||||
deleted: true,
|
||||
dateDeleted: Zotero.Date.dateToSQL(dateDeleted, true)
|
||||
},
|
||||
right: jsonData
|
||||
});
|
||||
return;
|
||||
|
||||
// Auto-restore some locally deleted objects that have changed remotely
|
||||
case 'collection':
|
||||
case 'search':
|
||||
Zotero.debug(`${ObjectType} ${objectKey} was modified remotely `
|
||||
+ '-- restoring');
|
||||
await this.removeObjectsFromDeleteLog(
|
||||
objectType,
|
||||
libraryID,
|
||||
[objectKey]
|
||||
);
|
||||
restored = true;
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new Error("Unknown object type '" + objectType + "'");
|
||||
// Auto-restore some locally deleted objects that have changed remotely
|
||||
case 'collection':
|
||||
case 'search':
|
||||
Zotero.debug(`${ObjectType} ${objectKey} was modified remotely `
|
||||
+ '-- restoring');
|
||||
await this.removeObjectsFromDeleteLog(
|
||||
objectType,
|
||||
libraryID,
|
||||
[objectKey]
|
||||
);
|
||||
restored = true;
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new Error("Unknown object type '" + objectType + "'");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1586,39 +1586,39 @@ Zotero.Sync.Data.Local = {
|
|||
// Disregard member additions/deletions for different values
|
||||
if (c1.op.startsWith('member-') && c2.op.startsWith('member-')) {
|
||||
switch (c1.field) {
|
||||
case 'collections':
|
||||
if (c1.value !== c2.value) {
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
|
||||
case 'tags':
|
||||
if (!Zotero.Tags.equals(c1.value, c2.value)) {
|
||||
// If just a type difference, treat as modify with type 0 if
|
||||
// not type 0 in changeset1
|
||||
if (c1.op == 'member-add' && c2.op == 'member-add'
|
||||
&& c1.value.tag === c2.value.tag) {
|
||||
changeset1.splice(i--, 1);
|
||||
// We're in the inner loop without an incrementor for i, so don't go
|
||||
// below 0
|
||||
if (i < 0) i = 0;
|
||||
changeset2.splice(j--, 1);
|
||||
if (c1.value.type > 0) {
|
||||
changeset2.push({
|
||||
field: "tags",
|
||||
op: "member-remove",
|
||||
value: c1.value
|
||||
});
|
||||
changeset2.push({
|
||||
field: "tags",
|
||||
op: "member-add",
|
||||
value: c2.value
|
||||
});
|
||||
}
|
||||
case 'collections':
|
||||
if (c1.value !== c2.value) {
|
||||
continue;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
break;
|
||||
|
||||
case 'tags':
|
||||
if (!Zotero.Tags.equals(c1.value, c2.value)) {
|
||||
// If just a type difference, treat as modify with type 0 if
|
||||
// not type 0 in changeset1
|
||||
if (c1.op == 'member-add' && c2.op == 'member-add'
|
||||
&& c1.value.tag === c2.value.tag) {
|
||||
changeset1.splice(i--, 1);
|
||||
// We're in the inner loop without an incrementor for i, so don't go
|
||||
// below 0
|
||||
if (i < 0) i = 0;
|
||||
changeset2.splice(j--, 1);
|
||||
if (c1.value.type > 0) {
|
||||
changeset2.push({
|
||||
field: "tags",
|
||||
op: "member-remove",
|
||||
value: c1.value
|
||||
});
|
||||
changeset2.push({
|
||||
field: "tags",
|
||||
op: "member-add",
|
||||
value: c2.value
|
||||
});
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue