Fixed an issue with node and nw.js support

terikon · May 29, 2015 · a49816a · a49816a
1 parent 63a5962
commit a49816a
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 12 deletions.
diff --git a/MarkerWithGhost.js b/MarkerWithGhost.js
@@ -1,4 +1,4 @@
-/* global define,module,require,google */
+/* global define,module,require */
 
 (function (root, factory) {
     'use strict';
@@ -7,7 +7,7 @@
         define(['jquery', 'SlidingMarker'], factory.bind(null, root));
     } else if (typeof module !== "undefined" && module !== null && module.exports != null) { // jshint ignore:line
         // Node module.
-        module.exports.MarkerWithGhost = factory(root, require('jquery'), require('SlidingMarker'));
+        module.exports = factory(window, require('jquery'), require('SlidingMarker'));
     } else {
         // Browser globals
         root.MarkerWithGhost = factory(root, root.jQuery, root.SlidingMarker);
@@ -16,6 +16,8 @@
     function (root, $, SlidingMarker) {
         'use strict';
 
+        var google = root.google;
+
         //Let jQuery be soft dependency
         $ = $ || {};
         $.extend = $.extend || function extend(obj) {

diff --git a/SlidingMarker.js b/SlidingMarker.js
@@ -1,4 +1,4 @@
-/* global define,module,require,google */
+/* global define,module,require */
 
 (function (root, factory) {
     'use strict';
@@ -7,7 +7,7 @@
         define(['jquery', 'markerAnimate'], factory.bind(null, root));
     } else if (typeof module !== "undefined" && module !== null && module.exports != null) { // jshint ignore:line
         // Node module.
-        module.exports.SlidingMarker = factory(root, require('jquery'));
+        module.exports = factory(window, require('jquery'));
     } else {
         // Browser globals
         root.SlidingMarker = factory(root, root.jQuery);
@@ -16,6 +16,8 @@
     function (root, $) {
         'use strict';
 
+        var google = root.google;
+
         //Let jQuery be soft dependency
         $ = $ || {};
         $.extend = $.extend || function extend(obj) {

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "marker-animate-unobtrusive",
   "main": "SlidingMarker.js",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Unobtrusive Google Maps animated marker",
 
   "homepage": "https://github.com/terikon/marker-animate-unobtrusive",

diff --git a/dist/MarkerWithGhost.min.js b/dist/MarkerWithGhost.min.js
diff --git a/dist/MarkerWithGhost.min.js.map b/dist/MarkerWithGhost.min.js.map
diff --git a/dist/SlidingMarker.min.js b/dist/SlidingMarker.min.js