v + "=?").join(", ")
+ " WHERE libraryID=?";
yield Zotero.DB.queryAsync(sql, params);
diff --git a/chrome/content/zotero/xpcom/data/notes.js b/chrome/content/zotero/xpcom/data/notes.js
index bc48ec619..f2cda0d58 100644
--- a/chrome/content/zotero/xpcom/data/notes.js
+++ b/chrome/content/zotero/xpcom/data/notes.js
@@ -28,9 +28,9 @@ Zotero.Notes = new function() {
this.noteToTitle = noteToTitle;
this.__defineGetter__("MAX_TITLE_LENGTH", function() { return 120; });
- this.__defineGetter__("defaultNote", function () '');
- this.__defineGetter__("notePrefix", function () '');
- this.__defineGetter__("noteSuffix", function () '
');
+ this.__defineGetter__("defaultNote", function () { return ''; });
+ this.__defineGetter__("notePrefix", function () { return ''; });
+ this.__defineGetter__("noteSuffix", function () { return '
'; });
/**
* Return first line (or first MAX_LENGTH characters) of note content
diff --git a/chrome/content/zotero/xpcom/data/search.js b/chrome/content/zotero/xpcom/data/search.js
index 209ec4895..91a28cb48 100644
--- a/chrome/content/zotero/xpcom/data/search.js
+++ b/chrome/content/zotero/xpcom/data/search.js
@@ -62,31 +62,31 @@ Zotero.Search.prototype.setName = function(val) {
}
Zotero.defineProperty(Zotero.Search.prototype, 'id', {
- get: function() this._get('id'),
- set: function(val) this._set('id', val)
+ get: function() { return this._get('id'); },
+ set: function(val) { return this._set('id', val); }
});
Zotero.defineProperty(Zotero.Search.prototype, 'libraryID', {
- get: function() this._get('libraryID'),
- set: function(val) this._set('libraryID', val)
+ get: function() { return this._get('libraryID'); },
+ set: function(val) { return this._set('libraryID', val); }
});
Zotero.defineProperty(Zotero.Search.prototype, 'key', {
- get: function() this._get('key'),
- set: function(val) this._set('key', val)
+ get: function() { return this._get('key'); },
+ set: function(val) { return this._set('key', val); }
});
Zotero.defineProperty(Zotero.Search.prototype, 'name', {
- get: function() this._get('name'),
- set: function(val) this._set('name', val)
+ get: function() { return this._get('name'); },
+ set: function(val) { return this._set('name', val); }
});
Zotero.defineProperty(Zotero.Search.prototype, 'version', {
- get: function() this._get('version'),
- set: function(val) this._set('version', val)
+ get: function() { return this._get('version'); },
+ set: function(val) { return this._set('version', val); }
});
Zotero.defineProperty(Zotero.Search.prototype, 'synced', {
- get: function() this._get('synced'),
- set: function(val) this._set('synced', val)
+ get: function() { return this._get('synced'); },
+ set: function(val) { return this._set('synced', val); }
});
Zotero.defineProperty(Zotero.Search.prototype, 'conditions', {
- get: function() this.getConditions()
+ get: function() { return this.getConditions(); }
});
Zotero.defineProperty(Zotero.Search.prototype, '_canHaveParent', {
value: false
@@ -175,14 +175,14 @@ Zotero.Search.prototype._saveData = Zotero.Promise.coroutine(function* (env) {
env.sqlColumns.unshift('savedSearchID');
env.sqlValues.unshift(searchID ? { int: searchID } : null);
- let placeholders = env.sqlColumns.map(function () '?').join();
+ let placeholders = env.sqlColumns.map(() => '?').join();
let sql = "INSERT INTO savedSearches (" + env.sqlColumns.join(', ') + ") "
+ "VALUES (" + placeholders + ")";
yield Zotero.DB.queryAsync(sql, env.sqlValues);
}
else {
let sql = 'UPDATE savedSearches SET '
- + env.sqlColumns.map(function (x) x + '=?').join(', ') + ' WHERE savedSearchID=?';
+ + env.sqlColumns.map(x => x + '=?').join(', ') + ' WHERE savedSearchID=?';
env.sqlValues.push(searchID ? { int: searchID } : null);
yield Zotero.DB.queryAsync(sql, env.sqlValues);
}
@@ -255,7 +255,7 @@ Zotero.Search.prototype.clone = function (libraryID) {
var conditions = this.getConditions();
- for each(var condition in conditions) {
+ for (let condition of Object.values(conditions)) {
var name = condition.mode ?
condition.condition + '/' + condition.mode :
condition.condition
@@ -299,7 +299,7 @@ Zotero.Search.prototype.addCondition = function (condition, operator, value, req
if (condition.match(/^quicksearch/)) {
var parts = Zotero.SearchConditions.parseSearchString(value);
- for each(var part in parts) {
+ for (let part of parts) {
this.addCondition('blockStart');
// If search string is 8 characters, see if this is a item key
@@ -329,7 +329,7 @@ Zotero.Search.prototype.addCondition = function (condition, operator, value, req
}
else {
var splits = Zotero.Fulltext.semanticSplitter(part.text);
- for each(var split in splits) {
+ for (let split of splits) {
this.addCondition('fulltextWord', operator, split, false);
}
}
@@ -498,7 +498,7 @@ Zotero.Search.prototype.getConditions = function(){
Zotero.Search.prototype.hasPostSearchFilter = function() {
this._requireData('conditions');
- for each(var i in this._conditions){
+ for (let i of Object.values(this._conditions)) {
if (i.condition == 'fulltextContent'){
return true;
}
@@ -530,7 +530,7 @@ Zotero.Search.prototype.search = Zotero.Promise.coroutine(function* (asTempTable
var joinMode = 'all';
// Set some variables for conditions to avoid further lookups
- for each(var condition in this._conditions) {
+ for (let condition of Object.values(this._conditions)) {
switch (condition.condition) {
case 'joinMode':
if (condition.operator == 'any') {
@@ -632,9 +632,9 @@ Zotero.Search.prototype.search = Zotero.Promise.coroutine(function* (asTempTable
// If join mode ANY or there's a quicksearch (which we assume
// fulltextContent is part of), return the union of the main search and
// (a separate fulltext word search filtered by fulltext content)
- for each(var condition in this._conditions){
+ for (let condition of Object.values(this._conditions)){
if (condition['condition']=='fulltextContent'){
- var fulltextWordIntersectionFilter = function (val, index, array) !!hash[val];
+ var fulltextWordIntersectionFilter = (val, index, array) => !!hash[val];
var fulltextWordIntersectionConditionFilter = function(val, index, array) {
return hash[val] ?
(condition.operator == 'contains') :
@@ -669,7 +669,7 @@ Zotero.Search.prototype.search = Zotero.Promise.coroutine(function* (asTempTable
// Add any necessary conditions to the fulltext word search --
// those that are required in an ANY search and any outside the
// quicksearch in an ALL search
- for each(var c in this._conditions) {
+ for (let c of Object.values(this._conditions)) {
if (c.condition == 'blockStart') {
var inQS = true;
continue;
@@ -688,7 +688,7 @@ Zotero.Search.prototype.search = Zotero.Promise.coroutine(function* (asTempTable
}
var splits = Zotero.Fulltext.semanticSplitter(condition.value);
- for each(var split in splits){
+ for (let split of splits){
s.addCondition('fulltextWord', condition.operator, split);
}
var fulltextWordIDs = yield s.search();
@@ -1043,7 +1043,7 @@ Zotero.Search.prototype._buildQuery = Zotero.Promise.coroutine(function* () {
if (this._hasPrimaryConditions) {
sql += " AND ";
- for each(var condition in conditions){
+ for (let condition of Object.values(conditions)){
var skipOperators = false;
var openParens = 0;
var condSQL = '';
@@ -1088,7 +1088,7 @@ Zotero.Search.prototype._buildQuery = Zotero.Promise.coroutine(function* () {
if (typeFields) {
condSQL += 'fieldID IN (?,';
// Add type-specific fields
- for each(var fieldID in typeFields) {
+ for (let fieldID of typeFields) {
condSQL += '?,';
condSQLParams.push(fieldID);
}
@@ -1113,7 +1113,7 @@ Zotero.Search.prototype._buildQuery = Zotero.Promise.coroutine(function* () {
if (dateFields) {
condSQL += 'fieldID IN (?,';
// Add type-specific date fields (dateEnacted, dateDecided, issueDate)
- for each(var fieldID in dateFields) {
+ for (let fieldID of dateFields) {
condSQL += '?,';
condSQLParams.push(fieldID);
}
@@ -1148,7 +1148,7 @@ Zotero.Search.prototype._buildQuery = Zotero.Promise.coroutine(function* () {
// for the collection/search
if (objLibraryID === undefined) {
let foundLibraryID = false;
- for each (let c in this._conditions) {
+ for (let c of Object.values(this._conditions)) {
if (c.condition == 'libraryID' && c.operator == 'is') {
foundLibraryID = true;
obj = yield objectTypeClass.getByLibraryAndKeyAsync(
@@ -1246,7 +1246,7 @@ Zotero.Search.prototype._buildQuery = Zotero.Promise.coroutine(function* () {
+ 'fileTypeID=?)';
var patterns = yield Zotero.DB.columnQueryAsync(ftSQL, { int: condition.value });
if (patterns) {
- for each(str in patterns) {
+ for (let str of patterns) {
condSQL += 'contentType LIKE ? OR ';
condSQLParams.push(str + '%');
}
@@ -1402,7 +1402,7 @@ Zotero.Search.prototype._buildQuery = Zotero.Promise.coroutine(function* () {
if (useFreeform && dateparts['part']){
go = true;
var parts = dateparts['part'].split(' ');
- for each (var part in parts){
+ for (let part of parts) {
condSQL += " AND SUBSTR(" + condition['field'] + ", 12, 100)";
condSQL += " LIKE ?";
condSQLParams.push('%' + part + '%');
diff --git a/chrome/content/zotero/xpcom/data/tags.js b/chrome/content/zotero/xpcom/data/tags.js
index e0f04edbe..e5b689bbf 100644
--- a/chrome/content/zotero/xpcom/data/tags.js
+++ b/chrome/content/zotero/xpcom/data/tags.js
@@ -248,7 +248,7 @@ Zotero.Tags = new function() {
oldItemIDs,
Zotero.DB.MAX_BOUND_PARAMETERS - 2,
Zotero.Promise.coroutine(function* (chunk) {
- let placeholders = chunk.map(function () '?').join(',');
+ let placeholders = chunk.map(() => '?').join(',');
// This is ugly, but it's much faster than doing replaceTag() for each item
let sql = 'UPDATE OR REPLACE itemTags SET tagID=?, type=0 '
@@ -349,7 +349,7 @@ Zotero.Tags = new function() {
Zotero.Utilities.arrayUnique(oldItemIDs),
Zotero.DB.MAX_BOUND_PARAMETERS - 1,
Zotero.Promise.coroutine(function* (chunk) {
- let placeholders = chunk.map(function () '?').join(',');
+ let placeholders = chunk.map(() => '?').join(',');
sql = 'UPDATE items SET synced=0, clientDateModified=? '
+ 'WHERE itemID IN (' + placeholders + ')'
@@ -539,7 +539,7 @@ Zotero.Tags = new function() {
return;
}
- tagColors = tagColors.filter(function (val) val.name != name);
+ tagColors = tagColors.filter(val => val.name != name);
}
else {
// Get current position if present
@@ -620,7 +620,7 @@ Zotero.Tags = new function() {
var affectedItems = [];
// Get all items linked to previous or current tag colors
- var tagNames = tagColors.concat(previousTagColors).map(function (val) val.name);
+ var tagNames = tagColors.concat(previousTagColors).map(val => val.name);
tagNames = Zotero.Utilities.arrayUnique(tagNames);
if (tagNames.length) {
for (let i=0; i x.match(/^( [0-9]+)?$/));
// If none found or first one has a suffix, use default name
if (!suffixes.length || suffixes[0]) {
@@ -841,15 +841,15 @@ Zotero.DBConnection.prototype.executeSQLFile = Zotero.Promise.coroutine(function
// Ugly hack to parse triggers with embedded semicolons
.replace(/;---/g, "TEMPSEMI")
.split("\n")
- .filter(function (x) nonCommentRE.test(x))
- .map(function (x) x.match(trailingCommentRE)[1])
+ .filter(x => nonCommentRE.test(x))
+ .map(x => x.match(trailingCommentRE)[1])
.join("");
if (sql.substr(-1) == ";") {
sql = sql.substr(0, sql.length - 1);
}
var statements = sql.split(";")
- .map(function (x) x.replace(/TEMPSEMI/g, ";"));
+ .map(x => x.replace(/TEMPSEMI/g, ";"));
this.requireTransaction();
diff --git a/chrome/content/zotero/xpcom/duplicates.js b/chrome/content/zotero/xpcom/duplicates.js
index d0a066e10..778483698 100644
--- a/chrome/content/zotero/xpcom/duplicates.js
+++ b/chrome/content/zotero/xpcom/duplicates.js
@@ -36,8 +36,8 @@ Zotero.Duplicates = function (libraryID) {
}
-Zotero.Duplicates.prototype.__defineGetter__('name', function () Zotero.getString('pane.collections.duplicate'));
-Zotero.Duplicates.prototype.__defineGetter__('libraryID', function () this._libraryID);
+Zotero.Duplicates.prototype.__defineGetter__('name', function () { return Zotero.getString('pane.collections.duplicate'); });
+Zotero.Duplicates.prototype.__defineGetter__('libraryID', function () { return this._libraryID; });
/**
* Get duplicates, populate a temporary table, and return a search based
@@ -251,7 +251,7 @@ Zotero.Duplicates.prototype._findDuplicates = Zotero.Promise.coroutine(function*
+ "JOIN itemData USING (itemID) "
+ "JOIN itemDataValues USING (valueID) "
+ "WHERE libraryID=? AND fieldID IN ("
- + dateFields.map(function () '?').join() + ") "
+ + dateFields.map(() => '?').join() + ") "
+ "AND SUBSTR(value, 1, 4) != '0000' "
+ "AND itemID NOT IN (SELECT itemID FROM deletedItems) "
+ "ORDER BY value";
@@ -392,7 +392,7 @@ Zotero.Duplicates.prototype._findDuplicates = Zotero.Promise.coroutine(function*
// Match on exact fields
/*var fields = [''];
- for each(var field in fields) {
+ for (let field of fields) {
var sql = "SELECT itemID, value FROM items JOIN itemData USING (itemID) "
+ "JOIN itemDataValues USING (valueID) "
+ "WHERE libraryID=? AND fieldID=? "
diff --git a/chrome/content/zotero/xpcom/file.js b/chrome/content/zotero/xpcom/file.js
index 27245a148..c9af26f25 100644
--- a/chrome/content/zotero/xpcom/file.js
+++ b/chrome/content/zotero/xpcom/file.js
@@ -124,7 +124,7 @@ Zotero.File = new function(){
this.getBinaryContents = function(file) {
var iStream = Components.classes["@mozilla.org/network/file-input-stream;1"]
.createInstance(Components.interfaces.nsIFileInputStream);
- iStream.init(file, 0x01, 0664, 0);
+ iStream.init(file, 0x01, 0o664, 0);
var bStream = Components.classes["@mozilla.org/binaryinputstream;1"]
.createInstance(Components.interfaces.nsIBinaryInputStream);
bStream.setInputStream(iStream);
@@ -154,7 +154,7 @@ Zotero.File = new function(){
} else if(file instanceof Components.interfaces.nsIFile) {
fis = Components.classes["@mozilla.org/network/file-input-stream;1"].
createInstance(Components.interfaces.nsIFileInputStream);
- fis.init(file, 0x01, 0664, 0);
+ fis.init(file, 0x01, 0o664, 0);
} else {
throw new Error("File is not an nsIInputStream or nsIFile");
}
@@ -347,7 +347,7 @@ Zotero.File = new function(){
}
var fos = Components.classes["@mozilla.org/network/file-output-stream;1"].
createInstance(Components.interfaces.nsIFileOutputStream);
- fos.init(file, 0x02 | 0x08 | 0x20, 0664, 0); // write, create, truncate
+ fos.init(file, 0x02 | 0x08 | 0x20, 0o664, 0); // write, create, truncate
var os = Components.classes["@mozilla.org/intl/converter-output-stream;1"]
.createInstance(Components.interfaces.nsIConverterOutputStream);
@@ -642,7 +642,7 @@ Zotero.File = new function(){
.getTypeFromFile(file);
var inputStream = Components.classes["@mozilla.org/network/file-input-stream;1"]
.createInstance(Components.interfaces.nsIFileInputStream);
- inputStream.init(file, 0x01, 0600, 0);
+ inputStream.init(file, 0x01, 0o600, 0);
var stream = Components.classes["@mozilla.org/binaryinputstream;1"]
.createInstance(Components.interfaces.nsIBinaryInputStream);
stream.setInputStream(inputStream);
@@ -768,7 +768,7 @@ Zotero.File = new function(){
file = this.pathToFile(file);
newFile = this.pathToFile(newFile);
- newFile.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644);
+ newFile.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0o644);
var newName = newFile.leafName;
newFile.remove(null);
@@ -807,7 +807,7 @@ Zotero.File = new function(){
if (dir.exists() && !dir.isDirectory()) {
dir.remove(null);
}
- dir.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0755);
+ dir.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0o755);
}
}
@@ -818,7 +818,7 @@ Zotero.File = new function(){
path,
{
ignoreExisting: true,
- unixMode: 0755
+ unixMode: 0o755
}
)
);
diff --git a/chrome/content/zotero/xpcom/http.js b/chrome/content/zotero/xpcom/http.js
index bc46e6278..f0bf02260 100644
--- a/chrome/content/zotero/xpcom/http.js
+++ b/chrome/content/zotero/xpcom/http.js
@@ -637,7 +637,7 @@ Zotero.HTTP = new function() {
* through the error log and doing a fragile string comparison.
*/
_pacInstalled = function () {
- return Zotero.getErrors(true).some(function (val) val.indexOf("PAC file installed") == 0)
+ return Zotero.getErrors(true).some(val => val.indexOf("PAC file installed") == 0)
}
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index 547b6082e..ef31ddc11 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -1500,7 +1500,7 @@ Zotero.Integration.Fields.prototype._processFields = function(i) {
e.setContext(this, i)
} else if(e instanceof Zotero.Integration.MissingItemException) {
// Check if we've already decided to remove this field code
- for each(var reselectKey in e.reselectKeys) {
+ for (let reselectKey of e.reselectKeys) {
if(this._removeCodeKeys[reselectKey]) {
this._removeCodeFields[i] = true;
removeCode = true;
@@ -2173,7 +2173,7 @@ Zotero.Integration.Session.prototype.reselectItem = function(doc, exception) {
var itemID = io.dataOut[0];
// add reselected item IDs to hash, so they can be used
- for each(var reselectKey in exception.reselectKeys) {
+ for (let reselectKey of exception.reselectKeys) {
me.reselectedItems[reselectKey] = itemID;
}
// add old URIs to map, so that they will be included
@@ -2379,7 +2379,7 @@ Zotero.Integration.Session.prototype.lookupItems = function(citation, index) {
}
// look to see if item has already been reselected
- for each(var reselectKey in reselectKeys) {
+ for (let reselectKey of reselectKeys) {
if(this.reselectedItems[reselectKey]) {
zoteroItem = Zotero.Items.get(this.reselectedItems[reselectKey]);
citationItem.id = zoteroItem.id;
@@ -2479,7 +2479,7 @@ Zotero.Integration.Session.prototype.unserializeCitation = function(arg, index)
if(!citation.properties) citation.properties = {};
- for each(var citationItem in citation.citationItems) {
+ for (let citationItem of citation.citationItems) {
// for upgrade from Zotero 2.0 or earlier
if(citationItem.locatorType) {
citationItem.label = citationItem.locatorType;
@@ -2634,7 +2634,7 @@ Zotero.Integration.Session.prototype.formatCitation = function(index, citation)
Zotero.debug("Integration: style.processCitationCluster("+citation.toSource()+", "+citationsPre.toSource()+", "+citationsPost.toSource());
}
var newCitations = this.style.processCitationCluster(citation, citationsPre, citationsPost);
- for each(var newCitation in newCitations[1]) {
+ for (let newCitation of newCitations[1]) {
this.citationText[citationIndices[newCitation[0]]] = newCitation[1];
this.updateIndices[citationIndices[newCitation[0]]] = true;
}
@@ -2651,7 +2651,7 @@ Zotero.Integration.Session.prototype._updateCitations = function* () {
if(force) {
allUpdatesForced = true;
// make sure at least one citation gets updated
- updateLoop: for each(var indexList in [this.newIndices, this.updateIndices]) {
+ updateLoop: for (let indexList of [this.newIndices, this.updateIndices]) {
for(var i in indexList) {
if(!this.citationsByIndex[i].properties.delete) {
allUpdatesForced = false;
@@ -2736,7 +2736,7 @@ Zotero.Integration.Session.prototype.loadBibliographyData = function(json) {
if(documentData.uncited[0]) {
// new style array of arrays with URIs
let zoteroItem, needUpdate;
- for each(var uris in documentData.uncited) {
+ for (let uris of documentData.uncited) {
[zoteroItem, needUpdate] = this.uriMap.getZoteroItemForURIs(uris);
var id = zoteroItem.cslItemID ? zoteroItem.cslItemID : zoteroItem.id;
if(zoteroItem && !this.citationsByItemID[id]) {
@@ -2765,7 +2765,7 @@ Zotero.Integration.Session.prototype.loadBibliographyData = function(json) {
if(documentData.custom[0]) {
// new style array of arrays with URIs
var zoteroItem, needUpdate;
- for each(var custom in documentData.custom) {
+ for (let custom of documentData.custom) {
[zoteroItem, needUpdate] = this.uriMap.getZoteroItemForURIs(custom[0]);
if(!zoteroItem) continue;
if(needUpdate) this.bibliographyDataHasChanged = true;
@@ -2794,7 +2794,7 @@ Zotero.Integration.Session.prototype.loadBibliographyData = function(json) {
// set entries to be omitted from bibliography
if(documentData.omitted) {
let zoteroItem, needUpdate;
- for each(var uris in documentData.omitted) {
+ for (let uris of documentData.omitted) {
[zoteroItem, update] = this.uriMap.getZoteroItemForURIs(uris);
var id = zoteroItem.cslItemID ? zoteroItem.cslItemID : zoteroItem.id;
if(zoteroItem && this.citationsByItemID[id]) {
diff --git a/chrome/content/zotero/xpcom/ipc.js b/chrome/content/zotero/xpcom/ipc.js
index fedb07206..81ffbca4d 100755
--- a/chrome/content/zotero/xpcom/ipc.js
+++ b/chrome/content/zotero/xpcom/ipc.js
@@ -33,7 +33,7 @@ Zotero.IPC = new function() {
if(!Zotero.isWin) { // no pipe support on Fx 3.6
_instancePipe = _getPipeDirectory();
if(!_instancePipe.exists()) {
- _instancePipe.create(Ci.nsIFile.DIRECTORY_TYPE, 0700);
+ _instancePipe.create(Ci.nsIFile.DIRECTORY_TYPE, 0o700);
}
_instancePipe.append(Zotero.instanceID);
@@ -126,7 +126,7 @@ Zotero.IPC = new function() {
// On Linux, O_NONBLOCK = 00004000
// On both, O_WRONLY = 0x0001
var mode = 0x0001;
- if(!block) mode = mode | (Zotero.isLinux ? 00004000 : 0x0004);
+ if(!block) mode = mode | (Zotero.isLinux ? 0o0004000 : 0x0004);
var fd = open(pipe.path, mode);
if(fd === -1) return false;
@@ -387,7 +387,7 @@ Zotero.IPC.Pipe = new function() {
}
// make pipe
- var ret = _mkfifo(file.path, 0600);
+ var ret = _mkfifo(file.path, 0o600);
return file.exists();
}
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
index 312fc082a..9fbaa5fb2 100644
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -480,7 +480,7 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
// Clear item type icon and tag colors when a tag is added to or removed from an item
if (type == 'item-tag') {
// TODO: Only update if colored tag changed?
- ids.map(function (val) val.split("-")[0]).forEach(function (val) {
+ ids.map(val => val.split("-")[0]).forEach(function (val) {
delete this._itemImages[val];
}.bind(this));
return;
@@ -516,7 +516,7 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
var col = this._treebox.columns.getNamedColumn(
'zotero-items-column-' + extraData.column
);
- for each(var id in ids) {
+ for (let id of ids) {
if (extraData.column == 'title') {
delete this._itemImages[id];
}
@@ -524,7 +524,7 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
}
}
else {
- for each(var id in ids) {
+ for (let id of ids) {
delete this._itemImages[id];
this._treebox.invalidateRow(this._rowMap[id]);
}
@@ -589,7 +589,7 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
}
var splitIDs = [];
- for each(var id in ids) {
+ for (let id of ids) {
var split = id.split('-');
// Skip if not an item in this collection
if (split[0] != collectionTreeRow.ref.id) {
@@ -764,7 +764,7 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
var allDeleted = true;
var isTrash = collectionTreeRow.isTrash();
var items = Zotero.Items.get(ids);
- for each(var item in items) {
+ for (let item of items) {
// If not viewing trash and all items were deleted, ignore modify
if (allDeleted && !isTrash && !item.deleted) {
allDeleted = false;
@@ -857,7 +857,7 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
var items = Zotero.Items.get(ids);
if (items) {
var found = false;
- for each(var item in items) {
+ for (let item of items) {
// Check for note and attachment type, since it's quicker
// than checking for parent item
if (item.itemTypeID == 1 || item.itemTypeID == 14) {
@@ -1432,7 +1432,7 @@ Zotero.ItemTreeView.prototype.sort = function (itemID) {
// Cache primary values while sorting, since base-field-mapped getField()
// calls are relatively expensive
var cache = {};
- sortFields.forEach(function (x) cache[x] = {})
+ sortFields.forEach(x => cache[x] = {})
// Get the display field for a row (which might be a placeholder title)
function getField(field, row) {
@@ -1778,7 +1778,7 @@ Zotero.ItemTreeView.prototype.selectItems = function(ids) {
}
var rows = [];
- for each(var id in ids) {
+ for (let id of ids) {
if(this._rowMap[id] !== undefined) rows.push(this._rowMap[id]);
}
rows.sort(function (a, b) {
@@ -2045,7 +2045,7 @@ Zotero.ItemTreeView.prototype._saveOpenState = function (close) {
Zotero.ItemTreeView.prototype.rememberOpenState = function (itemIDs) {
var rowsToOpen = [];
- for each(var id in itemIDs) {
+ for (let id of itemIDs) {
var row = this._rowMap[id];
// Item may not still exist
if (row == undefined) {
@@ -2190,7 +2190,7 @@ Zotero.ItemTreeView.prototype.getVisibleFields = function() {
*/
Zotero.ItemTreeView.prototype.getSortedItems = function(asIDs) {
var items = [];
- for each(var item in this._rows) {
+ for (let item of this._rows) {
if (asIDs) {
items.push(item.ref.id);
}
@@ -2673,7 +2673,7 @@ Zotero.ItemTreeView.fileDragDataProvider.prototype = {
if (destDir.exists()) {
destDir.remove(true);
}
- destDir.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0755);
+ destDir.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0o755);
}
var copiedFiles = [];
@@ -2721,7 +2721,7 @@ Zotero.ItemTreeView.fileDragDataProvider.prototype = {
// directory, it's a duplicate, so give this one
// a different name
else {
- copiedFile.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644);
+ copiedFile.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0o644);
var newName = copiedFile.leafName;
copiedFile.remove(null);
}
@@ -2762,7 +2762,7 @@ Zotero.ItemTreeView.fileDragDataProvider.prototype = {
// it's a duplicate, so give this one a different
// name
else {
- copiedFile.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644);
+ copiedFile.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0o644);
var newName = copiedFile.leafName;
copiedFile.remove(null);
}
@@ -2863,7 +2863,7 @@ Zotero.ItemTreeView.prototype.canDropCheck = function (row, orient, dataTransfer
if (rowItem) {
var canDrop = false;
- for each(var item in items) {
+ for (let item of items) {
// If any regular items, disallow drop
if (item.isRegularItem()) {
return false;
@@ -2885,7 +2885,7 @@ Zotero.ItemTreeView.prototype.canDropCheck = function (row, orient, dataTransfer
// In library, allow children to be dragged out of parent
else if (collectionTreeRow.isLibrary(true) || collectionTreeRow.isCollection()) {
- for each(var item in items) {
+ for (let item of items) {
// Don't allow drag if any top-level items
if (item.isTopLevelItem()) {
return false;
diff --git a/chrome/content/zotero/xpcom/locateManager.js b/chrome/content/zotero/xpcom/locateManager.js
index dc3c09f00..87222c318 100644
--- a/chrome/content/zotero/xpcom/locateManager.js
+++ b/chrome/content/zotero/xpcom/locateManager.js
@@ -75,7 +75,7 @@ Zotero.LocateManager = new function() {
/**
* Returns an array of all search engines
*/
- this.getEngines = function() _locateEngines.slice(0);
+ this.getEngines = function() { return _locateEngines.slice(0); }
/**
* Returns an array of all search engines visible that should be visible in the dropdown
@@ -89,7 +89,7 @@ Zotero.LocateManager = new function() {
*/
this.getEngineByName = function(engineName) {
engineName = engineName.toLowerCase();
- for each(var engine in _locateEngines) if(engine.name.toLowerCase() == engineName) return engine;
+ for (let engine of _locateEngines) if(engine.name.toLowerCase() == engineName) return engine;
return null;
}
@@ -98,7 +98,7 @@ Zotero.LocateManager = new function() {
*/
this.getEngineByAlias = function(engineAlias) {
engineAlias = engineAlias.toLowerCase();
- for each(var engine in _locateEngines) if(engine.alias.toLowerCase() == engineAlias) return engine;
+ for (let engine of _locateEngines) if(engine.alias.toLowerCase() == engineAlias) return engine;
return null;
}
@@ -132,7 +132,7 @@ Zotero.LocateManager = new function() {
if(locateDir.exists()) locateDir.remove(true);
// create new locate dir
- locateDir.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0700);
+ locateDir.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0o700);
// copy default file to new locate dir
Zotero.File.putContents(_jsonFile,
@@ -233,7 +233,7 @@ Zotero.LocateManager = new function() {
// write the icon to the file
var fos = Components.classes["@mozilla.org/network/file-output-stream;1"].
createInstance(Components.interfaces.nsIFileOutputStream);
- fos.init(iconFile, 0x02 | 0x08 | 0x20, 0664, 0); // write, create, truncate
+ fos.init(iconFile, 0x02 | 0x08 | 0x20, 0o664, 0); // write, create, truncate
var bos = Components.classes["@mozilla.org/binaryoutputstream;1"].
createInstance(Components.interfaces.nsIBinaryOutputStream);
bos.setOutputStream(fos);
diff --git a/chrome/content/zotero/xpcom/progressWindow.js b/chrome/content/zotero/xpcom/progressWindow.js
index ed6557c8f..ed2156d57 100644
--- a/chrome/content/zotero/xpcom/progressWindow.js
+++ b/chrome/content/zotero/xpcom/progressWindow.js
@@ -219,7 +219,7 @@ Zotero.ProgressWindow = function(_window = null) {
var newDescription = _progressWindow.document.createElement("description");
var parts = Zotero.Utilities.parseMarkup(text);
- for each(var part in parts) {
+ for (let part of parts) {
if (part.type == 'text') {
var elem = _progressWindow.document.createTextNode(part.text);
}
diff --git a/chrome/content/zotero/xpcom/proxy.js b/chrome/content/zotero/xpcom/proxy.js
index 28f5b0c5f..379d0943c 100644
--- a/chrome/content/zotero/xpcom/proxy.js
+++ b/chrome/content/zotero/xpcom/proxy.js
@@ -49,8 +49,8 @@ Zotero.Proxies = new function() {
rows.map(row => this.newProxyFromRow(row))
);
- for each(var proxy in Zotero.Proxies.proxies) {
- for each(var host in proxy.hosts) {
+ for (let proxy of Zotero.Proxies.proxies) {
+ for (let host of proxy.hosts) {
Zotero.Proxies.hosts[host] = proxy;
}
}
@@ -104,7 +104,7 @@ Zotero.Proxies = new function() {
// see if there is a proxy we already know
var m = false;
var proxy;
- for each(proxy in Zotero.Proxies.proxies) {
+ for (proxy of Zotero.Proxies.proxies) {
if(proxy.proxyID && proxy.regexp && proxy.multiHost) {
m = proxy.regexp.exec(url);
if(m) break;
@@ -304,7 +304,7 @@ Zotero.Proxies = new function() {
// if there is a proxy ID (i.e., if this is a persisting, transparent proxy), add to host
// list to do reverse mapping
if(proxy.proxyID) {
- for each(var host in proxy.hosts) {
+ for (let host of proxy.hosts) {
Zotero.Proxies.hosts[host] = proxy;
}
}
@@ -336,7 +336,7 @@ Zotero.Proxies = new function() {
* @type String
*/
this.proxyToProper = function(url, onlyReturnIfProxied) {
- for each(var proxy in Zotero.Proxies.proxies) {
+ for (let proxy of Zotero.Proxies.proxies) {
if(proxy.regexp) {
var m = proxy.regexp.exec(url);
if(m) {
@@ -456,9 +456,9 @@ Zotero.Proxies = new function() {
/^muse\.jhu\.edu$/
]
- for each(var blackPattern in hostBlacklist) {
+ for (let blackPattern of hostBlacklist) {
if(blackPattern.test(host)) {
- for each(var whitePattern in hostWhitelist) {
+ for (let whitePattern of hostWhitelist) {
if(whitePattern.test(host)) {
return false;
}
@@ -702,7 +702,7 @@ Zotero.Proxy.prototype.validate = function() {
return ["scheme.invalid"];
}
- for each(var host in this.hosts) {
+ for (let host of this.hosts) {
var oldHost = Zotero.Proxies.hosts[host];
if(oldHost && oldHost.proxyID && oldHost != this) {
return ["host.proxyExists", host];
@@ -903,7 +903,7 @@ Zotero.Proxies.Detectors.EZProxy = function(channel) {
if(fromProxy && toProxy && fromProxy.host == toProxy.host && fromProxy.port != toProxy.port
&& [80, 443, -1].indexOf(toProxy.port) == -1) {
var proxy;
- for each(proxy in Zotero.Proxies.proxies) {
+ for (proxy of Zotero.Proxies.proxies) {
if(proxy.regexp) {
var m = proxy.regexp.exec(fromProxy.spec);
if(m) break;
diff --git a/chrome/content/zotero/xpcom/quickCopy.js b/chrome/content/zotero/xpcom/quickCopy.js
index 7a1905742..5526a2b7f 100644
--- a/chrome/content/zotero/xpcom/quickCopy.js
+++ b/chrome/content/zotero/xpcom/quickCopy.js
@@ -71,7 +71,12 @@ Zotero.QuickCopy = new function() {
+ "WHERE setting='quickCopySite'";
var rows = yield Zotero.DB.queryAsync(sql);
// Unproxify storage row
- _siteSettings = [for (row of rows) { domainPath: row.domainPath, format: row.format }];
+ _siteSettings = rows.map(row => {
+ return {
+ domainPath: row.domainPath,
+ format: row.format
+ };
+ });
});
@@ -464,7 +469,7 @@ Zotero.QuickCopy = new function() {
// add styles to list
_formattedNames = {};
var styles = Zotero.Styles.getVisible();
- for each(var style in styles) {
+ for (let style of styles) {
_formattedNames['bibliography=' + style.styleID] = style.title;
}
diff --git a/chrome/content/zotero/xpcom/report.js b/chrome/content/zotero/xpcom/report.js
index c58e3953e..ba801de17 100644
--- a/chrome/content/zotero/xpcom/report.js
+++ b/chrome/content/zotero/xpcom/report.js
@@ -98,7 +98,7 @@ Zotero.Report.HTML = new function () {
content += '\t\t\t\t' + escapeXML(Zotero.getString('report.notes')) + '
\n';
}
content += '\t\t\t\t\n';
- for each(var note in obj.reportChildren.notes) {
+ for (let note of obj.reportChildren.notes) {
content += '\t\t\t\t\t- \n';
// If not valid XML, display notes with entities encoded
@@ -180,7 +180,7 @@ Zotero.Report.HTML = new function () {
table = true;
var displayText;
- for each(var creator in obj['creators']) {
+ for (let creator of obj['creators']) {
// One field
if (creator.name !== undefined) {
displayText = creator.name;
diff --git a/chrome/content/zotero/xpcom/storage.js b/chrome/content/zotero/xpcom/storage.js
index c838cf56f..aa0d01e61 100644
--- a/chrome/content/zotero/xpcom/storage.js
+++ b/chrome/content/zotero/xpcom/storage.js
@@ -27,8 +27,8 @@
Zotero.Sync.Storage = new function () {
// TEMP
- this.__defineGetter__("defaultError", function () Zotero.getString('sync.storage.error.default', Zotero.appName));
- this.__defineGetter__("defaultErrorRestart", function () Zotero.getString('sync.storage.error.defaultRestart', Zotero.appName));
+ this.__defineGetter__("defaultError", function () { return Zotero.getString('sync.storage.error.default', Zotero.appName); });
+ this.__defineGetter__("defaultErrorRestart", function () { return Zotero.getString('sync.storage.error.defaultRestart', Zotero.appName); });
var _itemDownloadPercentages = {};
diff --git a/chrome/content/zotero/xpcom/storage/storageLocal.js b/chrome/content/zotero/xpcom/storage/storageLocal.js
index 48b6d2032..2208b8852 100644
--- a/chrome/content/zotero/xpcom/storage/storageLocal.js
+++ b/chrome/content/zotero/xpcom/storage/storageLocal.js
@@ -655,7 +655,7 @@ Zotero.Sync.Storage.Local = {
+ " into attachment directory as '" + fileName + "'");
try {
var finalFileName = Zotero.File.createShortened(
- path, Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644
+ path, Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0o644
);
}
catch (e) {
@@ -822,7 +822,7 @@ Zotero.Sync.Storage.Local = {
let shortened;
try {
shortened = Zotero.File.createShortened(
- destPath, Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644
+ destPath, Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0o644
);
}
catch (e) {
diff --git a/chrome/content/zotero/xpcom/storage/storageRequest.js b/chrome/content/zotero/xpcom/storage/storageRequest.js
index abdbc1830..739ffbbb2 100644
--- a/chrome/content/zotero/xpcom/storage/storageRequest.js
+++ b/chrome/content/zotero/xpcom/storage/storageRequest.js
@@ -85,8 +85,8 @@ Zotero.Sync.Storage.Request.prototype.importCallbacks = function (request) {
}
// Otherwise add functions that don't already exist
var add = true;
- for each(var newFunc in request[name]) {
- for each(var currentFunc in this[name]) {
+ for (let newFunc of request[name]) {
+ for (let currentFunc of this[name]) {
if (newFunc.toString() === currentFunc.toString()) {
Zotero.debug("Callback already exists in request -- not importing");
add = false;
@@ -266,8 +266,8 @@ Zotero.Sync.Storage.Request.prototype.onProgress = function (progress, progressM
Zotero.Sync.Storage.setItemDownloadPercentage(this.name, this.percentage);
}
- if (this.onProgress) {
- for each(var f in this._onProgress) {
+ if (this.onProgress && this._onProgress) {
+ for (let f of this._onProgress) {
f(progress, progressMax);
}
}
diff --git a/chrome/content/zotero/xpcom/style.js b/chrome/content/zotero/xpcom/style.js
index 93b6069d0..9c63947f4 100644
--- a/chrome/content/zotero/xpcom/style.js
+++ b/chrome/content/zotero/xpcom/style.js
@@ -347,7 +347,7 @@ Zotero.Styles = new function() {
if(existingFile) {
// find associated style
- for each(var existingStyle in _styles) {
+ for (let existingStyle of _styles) {
if(destFile.equals(existingStyle.file)) {
existingTitle = existingStyle.title;
break;
diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js
index 08995bcf8..f50009dff 100644
--- a/chrome/content/zotero/xpcom/sync.js
+++ b/chrome/content/zotero/xpcom/sync.js
@@ -181,7 +181,7 @@ Zotero.Sync.Server = new function () {
if (ids) {
var items = Zotero.Items.get(ids);
var rolledBack = false;
- for each(var item in items) {
+ for (let item of items) {
var file = item.getFile();
if (!file) {
continue;
@@ -563,7 +563,7 @@ Zotero.Sync.Server.Data = new function() {
introMsg += Zotero.getString('sync.conflict.tag.addedToLocal');
}
var itemText = [];
- for each(var id in addedItemIDs) {
+ for (let id of addedItemIDs) {
var item = Zotero.Items.get(id);
var title = item.getField('title');
var text = " - " + title;
diff --git a/chrome/content/zotero/xpcom/translation/translate_firefox.js b/chrome/content/zotero/xpcom/translation/translate_firefox.js
index a310f1946..88a3b6ac4 100644
--- a/chrome/content/zotero/xpcom/translation/translate_firefox.js
+++ b/chrome/content/zotero/xpcom/translation/translate_firefox.js
@@ -786,7 +786,7 @@ Zotero.Translate.IO.Read.prototype = {
if(this._rawStream) this._rawStream.close();
this._rawStream = Components.classes["@mozilla.org/network/file-input-stream;1"]
.createInstance(Components.interfaces.nsIFileInputStream);
- this._rawStream.init(this.file, 0x01, 0664, 0);
+ this._rawStream.init(this.file, 0x01, 0o664, 0);
},
"_rewind":function() {
@@ -921,7 +921,7 @@ Zotero.Translate.IO.Write = function(file) {
Zotero.Translate.IO.maintainedInstances.push(this);
this._rawStream = Components.classes["@mozilla.org/network/file-output-stream;1"]
.createInstance(Components.interfaces.nsIFileOutputStream);
- this._rawStream.init(file, 0x02 | 0x08 | 0x20, 0664, 0); // write, create, truncate
+ this._rawStream.init(file, 0x02 | 0x08 | 0x20, 0o664, 0); // write, create, truncate
this._writtenToStream = false;
}
diff --git a/chrome/content/zotero/xpcom/translation/translate_item.js b/chrome/content/zotero/xpcom/translation/translate_item.js
index 03c2559c5..968c2333f 100644
--- a/chrome/content/zotero/xpcom/translation/translate_item.js
+++ b/chrome/content/zotero/xpcom/translation/translate_item.js
@@ -754,7 +754,7 @@ Zotero.Translate.ItemGetter.prototype = {
this._exportFileDirectory.append(name);
// create directory
- this._exportFileDirectory.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0700);
+ this._exportFileDirectory.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0o700);
// generate a new location for the exported file, with the appropriate
// extension
@@ -831,7 +831,7 @@ Zotero.Translate.ItemGetter.prototype = {
// Create intermediate directories if they don't exist
parent = targetFile;
while((parent = parent.parent) && !parent.exists()) {
- parent.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0700);
+ parent.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0o700);
}
// Delete any existing file if overwriteExisting is set, or throw an exception
diff --git a/chrome/content/zotero/xpcom/utilities_internal.js b/chrome/content/zotero/xpcom/utilities_internal.js
index 1c68b31d5..78cf28fd9 100644
--- a/chrome/content/zotero/xpcom/utilities_internal.js
+++ b/chrome/content/zotero/xpcom/utilities_internal.js
@@ -98,7 +98,7 @@ Zotero.Utilities.Internal = {
var istream = Components.classes["@mozilla.org/network/file-input-stream;1"]
.createInstance(Components.interfaces.nsIFileInputStream);
// open for reading
- istream.init(strOrFile, 0x01, 0444, 0);
+ istream.init(strOrFile, 0x01, 0o444, 0);
var ch = Components.classes["@mozilla.org/security/hash;1"]
.createInstance(Components.interfaces.nsICryptoHash);
// we want to use the MD5 algorithm
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 5aa85efd3..6ff63dfd0 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -72,7 +72,7 @@ Components.utils.import("resource://gre/modules/PluralForm.jsm");
* @property {Boolean} locked Whether all Zotero panes are locked
* with an overlay
*/
- this.__defineGetter__('locked', function () _locked);
+ this.__defineGetter__('locked', function () { return _locked; });
this.__defineSetter__('locked', function (lock) {
var wasLocked = _locked;
_locked = lock;
@@ -788,7 +788,7 @@ Components.utils.import("resource://gre/modules/PluralForm.jsm");
var e = {
name: 'NS_ERROR_FILE_ACCESS_DENIED',
message: msg,
- toString: function () this.message
+ toString: function () { return this.message; }
};
throw (e);
}
@@ -1075,7 +1075,7 @@ Components.utils.import("resource://gre/modules/PluralForm.jsm");
function getErrors(asStrings) {
var errors = [];
- for each(var msg in _startupErrors.concat(_recentErrors)) {
+ for (let msg of _startupErrors.concat(_recentErrors)) {
// Remove password in malformed XML messages
if (msg.category == 'malformed-xml') {
try {
@@ -1413,7 +1413,7 @@ Components.utils.import("resource://gre/modules/PluralForm.jsm");
function moveToUnique(file, newFile){
- newFile.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644);
+ newFile.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0o644);
var newName = newFile.leafName;
newFile.remove(null);
@@ -1676,7 +1676,7 @@ Components.utils.import("resource://gre/modules/PluralForm.jsm");
if (button.length) {
button = button[0];
var menupopup = button.firstChild;
- for each(var menuitem in menupopup.childNodes) {
+ for (let menuitem of menupopup.childNodes) {
if (menuitem.id.substr(prefixLen) == mode) {
menuitem.setAttribute('checked', true);
searchBox.placeholder = modes[mode].label;
@@ -2166,7 +2166,7 @@ Zotero.Keys = new function() {
var cmds = Zotero.Prefs.prefBranch.getChildList('keys', {}, {});
// Get the key=>command mappings from the prefs
- for each(var cmd in cmds) {
+ for (let cmd of cmds) {
cmd = cmd.substr(5); // strips 'keys.'
// Remove old pref
if (cmd == 'overrideGlobal') {
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index d57a1d8d2..1ada0bf5c 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -33,7 +33,7 @@ var ZoteroPane = new function()
this.itemsView = false;
this.progressWindow = false;
this._listeners = {};
- this.__defineGetter__('loaded', function () _loaded);
+ this.__defineGetter__('loaded', function () { return _loaded; });
var _lastSelectedItems = [];
//Privileged methods
diff --git a/components/zotero-autocomplete.js b/components/zotero-autocomplete.js
index b6ec52e54..d7ba672e4 100644
--- a/components/zotero-autocomplete.js
+++ b/components/zotero-autocomplete.js
@@ -231,10 +231,10 @@ ZoteroAutoComplete.prototype.startSearch = Zotero.Promise.coroutine(function* (s
if (resultsCallback) {
resultsCallback(results);
this.updateResults(
- [for (x of results) x.val],
- [for (x of results) x.comment],
+ Object.values(results).map(x => x.val),
+ Object.values(results).map(x => x.comment),
false
- )
+ );
}
resultCode = null;
Zotero.debug("Autocomplete query completed");
diff --git a/components/zotero-protocol-handler.js b/components/zotero-protocol-handler.js
index fe9e8f7d8..14e30a946 100644
--- a/components/zotero-protocol-handler.js
+++ b/components/zotero-protocol-handler.js
@@ -74,8 +74,10 @@ function ZoteroProtocolHandler() {
Zotero.API.Data.getGenerator(path)
);
}
- catch (e if e instanceof Zotero.Router.InvalidPathException) {
- return "URL could not be parsed";
+ catch (e) {
+ if (e instanceof Zotero.Router.InvalidPathException) {
+ return "URL could not be parsed";
+ }
}
});
}
@@ -596,7 +598,7 @@ function ZoteroProtocolHandler() {
var search = new Zotero.Search();
search.setScope(s);
var groups = Zotero.Groups.getAll();
- for each(var group in groups) {
+ for (let group of groups) {
search.addCondition('libraryID', 'isNot', group.libraryID);
}
break;
diff --git a/components/zotero-service.js b/components/zotero-service.js
index a11b4aeb9..2be849a88 100644
--- a/components/zotero-service.js
+++ b/components/zotero-service.js
@@ -327,7 +327,7 @@ function makeZoteroContext(isConnector) {
// add connector-related properties
zContext.Zotero.isConnector = isConnector;
zContext.Zotero.instanceID = instanceID;
- zContext.Zotero.__defineGetter__("isFirstLoadThisSession", function() isFirstLoadThisSession);
+ zContext.Zotero.__defineGetter__("isFirstLoadThisSession", function() { return isFirstLoadThisSession; });
};
/**