execute script

Author: Siedlerchr

external-scripts/background.js

@@ -38,160 +38,143 @@ Zotero.Connector_Types = new function() {
 	 */
 	this.init = function() {
 		const schemaTypes = ["itemTypes", "creatorTypes", "fields"];
-
+		
 		// attach IDs and make referenceable by either ID or name
-		for (var i = 0; i < schemaTypes.length; i++) {
+		for(var i=0; i<schemaTypes.length; i++) {
 			var schemaType = schemaTypes[i];
 			this[schemaType] = Zotero.Utilities.deepCopy(TypeSchema[schemaType]);
-			for (var id in TypeSchema[schemaType]) {
+			for(var id in TypeSchema[schemaType]) {
 				var entry = this[schemaType][id];
 				entry.unshift(parseInt(id, 10));
-				this[schemaType][entry[1] /* name */ ] = entry;
+				this[schemaType][entry[1]/* name */] = entry;
 			}
 		}
-
+			
 		var itemTypes = Zotero.Connector_Types["itemTypes"];
 		var creatorTypes = Zotero.Connector_Types["creatorTypes"];
 		var fields = Zotero.Connector_Types["fields"];
 
 		Zotero.CachedTypes = function() {
 			var thisType = Zotero.Connector_Types[this.schemaType];
-
+			
 			this.getID = function(idOrName) {
 				var type = thisType[idOrName];
-				return (type ? type[0] /* id */ : false);
+				return (type ? type[0]/* id */ : false);
 			};
-
+			
 			this.getName = function(idOrName) {
 				var type = thisType[idOrName];
-				return (type ? type[1] /* name */ : false);
+				return (type ? type[1]/* name */ : false);
 			};
-
+			
 			this.getLocalizedString = function(idOrName) {
 				var type = thisType[idOrName];
-				return (type ? type[2] /* localizedString */ : false);
+				return (type ? type[2]/* localizedString */ : false);
 			};
 		}
-
+		
 		Zotero.ItemTypes = new function() {
 			this.schemaType = "itemTypes";
 			Zotero.CachedTypes.call(this);
-
+			
 			this.getImageSrc = function(idOrName) {
 				var itemType = Zotero.Connector_Types["itemTypes"][idOrName];
-				var icon = itemType ? itemType[6] /* icon */ : "treeitem-" + idOrName + ".png";
-
-				if (Zotero.isBookmarklet) {
-					return ZOTERO_CONFIG.BOOKMARKLET_URL + "images/" + icon;
-				} else if (Zotero.isBrowserExt) {
-					return browser.runtime.getURL("images/" + icon);
-				} else if (Zotero.isSafari) {
-					if (typeof safari == "undefined") {
-						return "images/" + icon;
-					} else {
-						return `${safari.extension.baseURI}safari/` + "images/" + icon;
-					}
-				}
+				var icon = itemType ? itemType[6]/* icon */ : "treeitem-"+idOrName+".png";
+				
+				return Zotero.getExtensionURL("images/" + icon);
 			};
 		}
-
+		
 		Zotero.CreatorTypes = new function() {
 			this.schemaType = "creatorTypes";
 			Zotero.CachedTypes.call(this);
-
+			
 			this.getTypesForItemType = function(idOrName) {
 				var itemType = itemTypes[idOrName];
-				if (!itemType) return false;
-
+				if(!itemType) return false;
+				
 				var itemCreatorTypes = itemType[3]; // creatorTypes
 				if (!itemCreatorTypes
-					// TEMP: 'note' and 'attachment' have an array containing false
-					||
-					(itemCreatorTypes.length == 1 && !itemCreatorTypes[0])) {
+						// TEMP: 'note' and 'attachment' have an array containing false
+						|| (itemCreatorTypes.length == 1 && !itemCreatorTypes[0])) {
 					return [];
 				}
 				var n = itemCreatorTypes.length;
 				var outputTypes = new Array(n);
-
-				for (var i = 0; i < n; i++) {
+				
+				for(var i=0; i<n; i++) {
 					var creatorType = creatorTypes[itemCreatorTypes[i]];
-					outputTypes[i] = {
-						"id": creatorType[0] /* id */ ,
-						"name": creatorType[1] /* name */
-					};
+					outputTypes[i] = {"id":creatorType[0]/* id */,
+						"name":creatorType[1]/* name */};
 				}
 				return outputTypes;
 			};
-
+			
 			this.getPrimaryIDForType = function(idOrName) {
 				var itemType = itemTypes[idOrName];
-				if (!itemType) return false;
-				return itemType[3] /* creatorTypes */ [0];
+				if(!itemType) return false;
+				return itemType[3]/* creatorTypes */[0];
 			};
-
+			
 			this.isValidForItemType = function(creatorTypeID, itemTypeID) {
 				let itemType = itemTypes[itemTypeID];
-				return itemType[3] /* creatorTypes */ .includes(creatorTypeID);
+				return itemType[3]/* creatorTypes */.includes(creatorTypeID);
 			};
 		};
-
+		
 		Zotero.ItemFields = new function() {
 			this.schemaType = "fields";
 			Zotero.CachedTypes.call(this);
-
+			
 			this.isValidForType = function(fieldIdOrName, typeIdOrName) {
-				var field = fields[fieldIdOrName],
-					itemType = itemTypes[typeIdOrName];
-
+				var field = fields[fieldIdOrName], itemType = itemTypes[typeIdOrName];
+				
 				// mimics itemFields.js
-				if (!field || !itemType) return false;
-
-				/* fields */
-				/* id */
+				if(!field || !itemType) return false;
+				
+				       /* fields */        /* id */
 				return itemType[4].indexOf(field[0]) !== -1;
 			};
-
+			
 			this.isBaseField = function(fieldID) {
 				return fields[fieldID][2];
 			};
-
+			
 			this.getFieldIDFromTypeAndBase = function(typeIdOrName, fieldIdOrName) {
-				var baseField = fields[fieldIdOrName],
-					itemType = itemTypes[typeIdOrName];
-
-				if (!baseField || !itemType) return false;
-
+				var baseField = fields[fieldIdOrName], itemType = itemTypes[typeIdOrName];
+				
+				if(!baseField || !itemType) return false;
+				
 				// get as ID
-				baseField = baseField[0] /* id */ ;
-
+				baseField = baseField[0]/* id */;
+				
 				// loop through base fields for item type
 				var baseFields = itemType[5];
-				for (var i in baseFields) {
-					if (baseFields[i] === baseField) {
+				for(var i in baseFields) {
+					if(baseFields[i] === baseField) {
 						return i;
 					}
 				}
-
+				
 				return false;
 			};
-
+			
 			this.getBaseIDFromTypeAndField = function(typeIdOrName, fieldIdOrName) {
-				var field = fields[fieldIdOrName],
-					itemType = itemTypes[typeIdOrName];
-				if (!field || !itemType) {
+				var field = fields[fieldIdOrName], itemType = itemTypes[typeIdOrName];
+				if(!field || !itemType) {
 					throw new Error("Invalid field or type ID");
 				}
-
-				var baseField = itemType[5] /* baseFields */ [field[0] /* id */ ];
+				
+				var baseField = itemType[5]/* baseFields */[field[0]/* id */];
 				return baseField ? baseField : false;
 			};
-
+			
 			this.getItemTypeFields = function(typeIdOrName) {
-				return itemTypes[typeIdOrName][4] /* fields */ .slice();
+				return itemTypes[typeIdOrName][4]/* fields */.slice();
 			};
 		}
 	};
-
+	
 	/**
 	 * Passes schema to a callback
 	 */