Fx60 compatibility: Fix issues with JS code modules

- The Mozilla CommonJS loader is no longer available, so bundle the
  Fx52 version of it
- Strict mode is enforced
- `this` is only defined as a global object in .jsm files, not .js files
- `this` can't be converted to a string for BackstagePass test, so check
  for presence of Components.utils.import instead
- The return value from import() is no longer available

chrome/content/zotero/include.js

@@ -7,4 +7,4 @@ var Zotero = Components.classes['@zotero.org/Zotero;1']
 				.getService(Components.interfaces.nsISupports)
 				.wrappedJSObject;
 
-Components.utils.import('resource://zotero/require.js');
+Components.utils.import('resource://zotero/require.jsm');

chrome/content/zotero/xpcom/router.js

@@ -1,4 +1,4 @@
-Components.utils.import("resource://zotero/pathparser.js", Zotero);
+Components.utils.import("resource://zotero/pathparser.jsm", Zotero);
 Zotero.Router = Zotero.PathParser;
 delete Zotero.PathParser;
 

components/zotero-service.js

@@ -154,9 +154,9 @@ var isFirstLoadThisSession = true;
 var zContext = null;
 var initCallbacks = [];
 var zInitOptions = {};
-Components.utils.import('resource://zotero/require.js');
+Components.utils.import('resource://zotero/require.jsm');
 
-ZoteroContext = function() {}
+var ZoteroContext = function() {}
 ZoteroContext.prototype = {
 	require,
 	

resource/concurrentCaller.js

@@ -23,8 +23,8 @@
     ***** END LICENSE BLOCK *****
 */
 
-EXPORTED_SYMBOLS = ["ConcurrentCaller"];
-Components.utils.import('resource://zotero/require.js');
+var EXPORTED_SYMBOLS = ["ConcurrentCaller"];
+Components.utils.import('resource://zotero/require.jsm');
 
 var Promise = require('resource://zotero/bluebird.js');
 
@@ -58,7 +58,7 @@ var Promise = require('resource://zotero/bluebird.js');
  *     beginning of another, in milliseconds
  * @param {Function} [options.logger]
  */
-ConcurrentCaller = function (options = {}) {
+var ConcurrentCaller = function (options = {}) {
 	if (typeof options == 'number') {
 		this._log("ConcurrentCaller now takes an object rather than a number");
 		options = {

resource/config.js

@@ -1,3 +1,5 @@
+var EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"];
+
 var ZOTERO_CONFIG = {
 	GUID: 'zotero@chnm.gmu.edu',
 	ID: 'zotero', // used for db filename, etc.
@@ -25,5 +27,3 @@ var ZOTERO_CONFIG = {
 	FEEDBACK_URL: "https://forums.zotero.org/",
 	CONNECTORS_URL: "https://www.zotero.org/download/connectors"
 };
-
-EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"];

resource/pathparser.jsm

@@ -5,7 +5,7 @@
  * License: MIT
  * https://github.com/dstillman/pathparser.js
  */
-(function (factory) {
+(function (root, factory) {
 	// AMD/RequireJS
 	if (typeof define === 'function' && define.amd) {
 		define(factory);
@@ -13,14 +13,16 @@
 	} else if (typeof exports === 'object') {
 		module.exports = factory();
 	// Mozilla JSM
-    } else if (~String(this).indexOf('BackstagePass')) {
-    	EXPORTED_SYMBOLS = ["PathParser"];
-    	PathParser = factory();
+	} else if (typeof Components != 'undefined'
+			&& typeof Components.utils != 'undefined'
+			&& typeof Components.utils.import == 'function') {
+		root.EXPORTED_SYMBOLS = ["PathParser"];
+		root.PathParser = factory();
 	// Browser global
 	} else {
-		PathParser = factory();
+		root.PathParser = factory();
 	}
-}(function () {
+}(this, function () {
 	"use strict";
 	
 	var PathParser = function (params) {

resource/require.jsm

@@ -3,7 +3,7 @@
 var EXPORTED_SYMBOLS = ['require'];
 
 var require = (function() {
-	var { Loader, Require, Module } = Components.utils.import('resource://gre/modules/commonjs/toolkit/loader.js');
+	Components.utils.import('resource://zotero/loader.jsm');
 	var requirer = Module('/', '/');
 	var _runningTimers = {};
 	var window = {};

resource/word-processor-plugin-installer.js

@@ -27,7 +27,7 @@
  * installable and available in the cite preferences pane.
  */
 
-EXPORTED_SYMBOLS = ["ZoteroPluginInstaller"];
+var EXPORTED_SYMBOLS = ["ZoteroPluginInstaller"];
 
 var Zotero = Components.classes["@zotero.org/Zotero;1"]
 				// Currently uses only nsISupports