From 932974d7445f62d6717081b0ac8742135551313c Mon Sep 17 00:00:00 2001 From: Lee Grey Date: Tue, 24 Mar 2015 23:09:44 +1300 Subject: [PATCH] Undid changes to suppress Errors, since grunt test did not like it that way either. (Bad style.) --- src/js/utils/Environment.js | 3 +-- src/js/utils/FileUtilsDesktop.js | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/js/utils/Environment.js b/src/js/utils/Environment.js index 861bfe83..58b973a2 100644 --- a/src/js/utils/Environment.js +++ b/src/js/utils/Environment.js @@ -9,10 +9,9 @@ ns.Environment = { detectNodeWebkit : function () { - var isNode = (typeof window["process"] !== "undefined" && typeof window["require"] !== "undefined"); + var isNode = (typeof process !== "undefined" && typeof require !== "undefined"); var isNodeWebkit = false; if (isNode) { - var require = window["require"]; try { isNodeWebkit = (typeof require('nw.gui') !== "undefined"); } catch (e) { diff --git a/src/js/utils/FileUtilsDesktop.js b/src/js/utils/FileUtilsDesktop.js index dc08529d..2f596e74 100644 --- a/src/js/utils/FileUtilsDesktop.js +++ b/src/js/utils/FileUtilsDesktop.js @@ -59,7 +59,6 @@ * @callback callback */ saveToFile : function(content, filename, callback) { - var require = window["require"]; // suppress build error var fs = require('fs'); fs.writeFile(filename, content, function(err){ if (err) { @@ -71,7 +70,6 @@ }, readFile : function(filename, callback) { - var require = window["require"]; // suppress build error var fs = require('fs'); // NOTE: currently loading everything as utf8, which may not be desirable in future fs.readFile(filename, 'utf8', function(err, data){