Fixed bug with ghostAnimationPosition declaration.

MarkerWithLabel now works with Spiderfier. Updated version to 0.1.4. Improved min files banner.
terikon · Mar 27, 2015 · 641d85e · 641d85e
1 parent 7eb4a36
commit 641d85e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -11,7 +11,7 @@ module.exports = function(grunt) {
 		uglify: {
 			options: {
 				sourceMap: true,
-				banner: '/*! <%= pkg.title %> v<%= pkg.version %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
+				banner: '/*! <%= grunt.task.current.target %> v<%= pkg.version %> <%= grunt.template.today("dd-mm-yyyy") %> (C) 2015 Terikon Software */\n'
 			},
 			SlidingMarker: {
 				src: 'SlidingMarker.js',

diff --git a/MarkerWithGhost.js b/MarkerWithGhost.js
@@ -31,7 +31,7 @@
         var MarkerWithGhost = function (opt_options) {
 
             this.ghostPosition = null;
-            this.animationGhostPosition = null;
+            this.ghostAnimationPosition = null;
 
             // Call the parent constructor.
             SlidingMarker.call(this, opt_options);

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
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "marker-animate-unobtrusive",
   "title": "SlidingMarker",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Unobtrusive Google Maps animated marker",
   "main": "SlidingMarker.js",
 

diff --git a/vendor/markerwithlabel.terikon.js b/vendor/markerwithlabel.terikon.js
@@ -146,7 +146,9 @@ MarkerLabel_.prototype.onAdd = function () {
     MarkerLabel_.getSharedCross.processed = true;
   }
 
-  var position_changed = this.marker_.animationPosition !== undefined ? "animationposition_changed" : "position_changed";
+  var position_changed = this.marker_.ghostAnimationPosition !== undefined ? "ghostanimationposition_changed"
+      : this.marker_.animationPosition !== undefined ? "animationPosition"
+      : "position_changed";
 
   this.listeners_ = [
     google.maps.event.addDomListener(this.eventDiv_, "mouseover", function (e) {
@@ -435,7 +437,7 @@ MarkerLabel_.prototype.setAnchor = function () {
  * @private
  */
 MarkerLabel_.prototype.setPosition = function (yOffset) {
-  var getPosition = this.marker_.getAnimationPosition || this.marker_.getPosition;
+  var getPosition = this.marker_.getGhostAnimationPosition || this.marker_.getAnimationPosition || this.marker_.getPosition;
   var position = this.getProjection().fromLatLngToDivPixel(getPosition.call(this.marker_));
   if (typeof yOffset === "undefined") {
     yOffset = 0;