Remove touchscreen device special case - see Issue #148

jamietre · Jun 19, 2013 · 128ae41 · 128ae41
1 parent bb755aa
commit 128ae41
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,6 +5,11 @@ Features:
 * Return promises from asynchronous events rather than requiring callbacks like "onConfigured"
 * Return a non-jQuery object exposing the imagemapster API to simplify coding against it
 
+####Version 1.2.14 (unreleased)
+
+* Enable mouseover events when touchscreen found (to account for proliferation of machines with mouse pointer + touchscreen)
+* TODO - detect input device actively to determine when highlight effect should be enabled
+
 ####Version 1.2.13
 
 * Fix problem with mouseoutdelay=01

diff --git a/src/core.js b/src/core.js
@@ -19,7 +19,7 @@
     };
 
     $.mapster = {
-        version: "1.2.13",
+        version: "1.2.14-beta1",
         render_defaults: {
             isSelectable: true,
             isDeselectable: true,

diff --git a/src/license.js b/src/license.js
@@ -1,5 +1,5 @@
 /* ImageMapster
-   Version: 1.2.13 (6/6/2013)
+   Version: 1.2.14-beta1 (6/18/2013)
 
 Copyright 2011-2012 James Treworgy
 

diff --git a/src/mapdata.js b/src/mapdata.js
@@ -103,9 +103,7 @@
             window.clearTimeout(me.activeAreaEvent);
             me.activeAreaEvent=0;
         }
-        if (delay<0) {
-            deferred.resolve();
-        } else {
+        if (delay>=0) {
             if (area.owner.currentAction || delay) {
                 me.activeAreaEvent = window.setTimeout((function() {
                         return function() {
@@ -844,14 +842,12 @@
                 }
 
                 if (!mapArea.nohref) {
-                    $area.bind('click.mapster', me.click);
-
-                    if (!m.isTouch) {
-                        $area.bind('mouseover.mapster', me.mouseover)
-                            .bind('mouseout.mapster', me.mouseout)
-                            .bind('mousedown.mapster', me.mousedown);
+                    $area.bind('click.mapster', me.click)
+                        .bind('mouseover.mapster', me.mouseover)
+                        .bind('mouseout.mapster', me.mouseout)
+                        .bind('mousedown.mapster', me.mousedown);
 
-                    }
+
 
                 }