Merge pull request #53 from marklonquist/master

Case #99310: fixed an issue with map not trying to load on pageload. …
Novicell · Sep 9, 2016 · ef1b58c · ef1b58c
2 parents abdc14c + 076756f
commit ef1b58c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 15 deletions.
diff --git a/gulp/tasks/icons.js b/gulp/tasks/icons.js
@@ -13,16 +13,26 @@ const mergeStream = require('merge-stream');
 const fs = require('fs');
 const rsp = require('remove-svg-properties').stream;
 var plugins = require('gulp-load-plugins')();
+var mkdirp = require('mkdirp');
 
 function writeFile(path, fileName, content) {
     try {
         if (!fs.existsSync(path)) {
-            fs.mkdirSync(path)
+            mkdirp(path, function (err) {
+                if (err) { console.error(err) }
+                else {
+                    doWrite(path, fileName, content);
+                }
+            });
+        } else {
+            doWrite(path, fileName, content);
         }
 
-        fs.writeFileSync(path + fileName, content);
-        console.log("icons.json is being generated.");
-        return path + fileName;
+        function doWrite(path, fileName, content) {
+            fs.writeFileSync(path + fileName, content);
+            console.log("icons.json is being generated.");
+            return path + fileName;
+        }
     } catch (e) {
         console.log(e);
         return null;

diff --git a/package.json b/package.json
@@ -75,6 +75,7 @@
     "jshint-stylish": "^2.2.0",
     "jshint-stylish-cool": "^2.0.2",
     "merge-stream": "~1.0.0",
+    "mkdirp": "^0.5.1",
     "node-notifier": "^4.6.0",
     "remove-svg-properties": "^0.3.2",
     "tslint": "^3.13.0",

diff --git a/scripts/components/novicell.map.js b/scripts/components/novicell.map.js
@@ -16,17 +16,25 @@ novicell.map = novicell.map || function () {
 	var isLoaded = false;
 
 	function init() {
-		document.onscroll = function () {
-			var element = document.getElementById('map-canvas');
-			if (!isLoaded && element && isScrolledIntoView(element)) {
-				isLoaded = true;
-				// Async load the GMaps API and run "initialize"
-				var script = document.createElement('script');
-				script.type = 'text/javascript';
-				script.src = 'https://maps.googleapis.com/maps/api/js?v=3.exp&callback=initialize';
-				document.body.appendChild(script);
-			}
-		};
+		var element = document.getElementById('map-canvas');
+		if (!isLoaded && element && isScrolledIntoView(element)) {
+			load();
+		} else {
+			document.onscroll = function () {
+				if (!isLoaded && element && isScrolledIntoView(element)) {
+					load();
+				}
+			};
+		}
+	}
+
+	function load() {
+		isLoaded = true;
+		// Async load the GMaps API and run "initialize"
+		var script = document.createElement('script');
+		script.type = 'text/javascript';
+		script.src = 'https://maps.googleapis.com/maps/api/js?v=3.exp&callback=initialize';
+		document.body.appendChild(script);
 	}
 
 	return {