Merge pull request #109 from ewanharris/TIMOB-25790

[TIMOB-25790] Do not override global L function to prevent error on iOS
tidev · Mar 31, 2018 · a5ee644 · a5ee644
2 parents a8f142e + 6398171
commit a5ee644
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/build/liveview.js b/build/liveview.js
@@ -356,6 +356,10 @@
 		this.loaded = false;
 	}
 
+	function L(name, filler) {
+		return (Module._globalCtx.localeStrings[Ti.Locale.currentLanguage] || {})[name] || filler || name;
+	}
+
 	// global namespace
 	global = Module._global = Module.global = {};
 
@@ -418,15 +422,6 @@
 		}
 
 		globalCtx.localeStrings = Module.require('localeStrings');
-		/**
-   * [description]
-   * @param  {string} name   [description]
-   * @param  {string} filler [description]
-   * @return {string}        [description]
-   */
-		globalCtx.L = function (name, filler) {
-			return (globalCtx.localeStrings[Ti.Locale.currentLanguage] || {})[name] || filler || name;
-		};
 		Module.connectServer();
 	};
 
@@ -730,8 +725,8 @@
 		Module._compileList.push(this.id);
 		this.source = Module._wrap(src);
 		try {
-			var fn = new Function('exports, require, module, __filename, __dirname, lvGlobal', this.source); // eslint-disable-line no-new-func
-			fn(this.exports, Module.require, this, this.filename, this.__dirname, global);
+			var fn = new Function('exports, require, module, __filename, __dirname, lvGlobal, L', this.source); // eslint-disable-line no-new-func
+			fn(this.exports, Module.require, this, this.filename, this.__dirname, global, L);
 		} catch (err) {
 			process.emit('uncaughtException', { module: this.id, error: err, source: ('' + this.source).split('\n') });
 		}

diff --git a/lib/platform/require.js b/lib/platform/require.js
@@ -21,6 +21,10 @@ function Module(id) {
 	this.loaded = false;
 }
 
+function L(name, filler) {
+	return (Module._globalCtx.localeStrings[Ti.Locale.currentLanguage] || {})[name] || filler || name;
+}
+
 // global namespace
 global = Module._global = Module.global = {};
 
@@ -85,15 +89,6 @@ Module.patch = function (globalCtx, url, port) {
 	}
 
 	globalCtx.localeStrings = Module.require('localeStrings');
-	/**
-	 * [description]
-	 * @param  {string} name   [description]
-	 * @param  {string} filler [description]
-	 * @return {string}        [description]
-	 */
-	globalCtx.L = function (name, filler) {
-		return (globalCtx.localeStrings[Ti.Locale.currentLanguage] || {})[name] || filler || name;
-	};
 	Module.connectServer();
 };
 
@@ -409,8 +404,8 @@ Module.prototype._compile = function () {
 	Module._compileList.push(this.id);
 	this.source = Module._wrap(src);
 	try {
-		const fn = new Function('exports, require, module, __filename, __dirname, lvGlobal', this.source); // eslint-disable-line no-new-func
-		fn(this.exports, Module.require, this, this.filename, this.__dirname, global);
+		const fn = new Function('exports, require, module, __filename, __dirname, lvGlobal, L', this.source); // eslint-disable-line no-new-func
+		fn(this.exports, Module.require, this, this.filename, this.__dirname, global, L);
 	} catch (err) {
 		process.emit('uncaughtException', { module: this.id, error: err, source: ('' + this.source).split('\n') });
 	}