Merge pull request hpneo#413 from LightmakerCanada/amd

Updated AMD config to enable async loading with `googlemaps-amd` plugin
gwpreston · May 19, 2015 · e6cb4f3 · e6cb4f3
2 parents 2c24b34 + 03b2b6e
commit e6cb4f3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -77,9 +77,11 @@ module.exports = function(grunt) {
       all : {
         src : 'gmaps.js',
         objectToExport : 'GMaps',
-        amdModuleId : 'GMaps',
         globalAlias : 'GMaps',
-        template : 'umd.hbs'
+        template : 'umd.hbs',
+        deps: {
+          amd: ['jquery', 'googlemaps!']
+        }
       }
     }
 

diff --git a/gmaps.js b/gmaps.js
@@ -4,10 +4,12 @@
     module.exports = factory();
   }
   else if(typeof define === 'function' && define.amd) {
-    define('GMaps', [], factory);
+    define(['jquery', 'googlemaps!'], factory);
+  }
+  else {
+    root.GMaps = factory();
   }
 
-  root.GMaps = factory();
 
 }(this, function() {
 
@@ -2199,6 +2201,6 @@ if (!Array.prototype.indexOf) {
       return -1;
   }
 }
-  
+
 return GMaps;
 }));
diff --git a/gmaps.min.js b/gmaps.min.js
diff --git a/gmaps.min.js.map b/gmaps.min.js.map
diff --git a/umd.hbs b/umd.hbs
@@ -6,12 +6,14 @@
   else if(typeof define === 'function' && define.amd) {
     define({{#if amdModuleId}}'{{amdModuleId}}', {{/if}}[{{{amdDependencies}}}], factory);
   }
+  else {
+    root.{{globalAlias}} = factory({{{globalDependencies}}});
+  }
 
-  root.{{globalAlias}} = factory({{{globalDependencies}}});
 
 }(this, function({{dependencies}}) {
 
 {{{code}}}
-  
+
 return {{objectToExport}};
 }));