try commit for #200

wise9 · May 7, 2013 · d0ad51f · d0ad51f
1 parent 160378e
commit d0ad51f
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 52 deletions.
diff --git a/dev/enchant.js b/dev/enchant.js
@@ -488,6 +488,7 @@ enchant.ENV = {
         div.setAttribute('ontouchstart', 'return');
         return typeof div.ontouchstart === 'function';
     }()),
+    MOUSE_ENABLED: true,
     /**
      * Determines if the current browser is an iPhone with a retina display.
      * @return {Boolean} True, if this display is a retina display
@@ -1887,33 +1888,36 @@ enchant.EventTarget = enchant.Class.create({
                         }
                     }, false);
                 }
-                stage.addEventListener('mousedown', function(e) {
-                    var core = enchant.Core.instance;
-                    var evt = new enchant.Event(enchant.Event.TOUCH_START);
-                    evt._initPosition(e.pageX, e.pageY);
-                    var target = core.currentScene._determineEventTarget(evt);
-                    core._touchEventTarget[core._mousedownID] = target;
-                    target.dispatchEvent(evt);
-                }, false);
-                stage.addEventListener('mousemove', function(e) {
-                    var core = enchant.Core.instance;
-                    var evt = new enchant.Event(enchant.Event.TOUCH_MOVE);
-                    evt._initPosition(e.pageX, e.pageY);
-                    var target = core._touchEventTarget[core._mousedownID];
-                    if (target) {
-                        target.dispatchEvent(evt);
-                    }
-                }, false);
-                stage.addEventListener('mouseup', function(e) {
-                    var core = enchant.Core.instance;
-                    var evt = new enchant.Event(enchant.Event.TOUCH_END);
-                    evt._initPosition(e.pageX, e.pageY);
-                    var target = core._touchEventTarget[core._mousedownID];
-                    if (target) {
+
+                if (enchant.ENV.MOUSE_ENABLED){
+                    stage.addEventListener('mousedown', function(e) {
+                        var core = enchant.Core.instance;
+                        var evt = new enchant.Event(enchant.Event.TOUCH_START);
+                        evt._initPosition(e.pageX, e.pageY);
+                        var target = core.currentScene._determineEventTarget(evt);
+                        core._touchEventTarget[core._mousedownID] = target;
                         target.dispatchEvent(evt);
-                    }
-                    delete core._touchEventTarget[core._mousedownID];
-                }, false);
+                    }, false);
+                    stage.addEventListener('mousemove', function(e) {
+                        var core = enchant.Core.instance;
+                        var evt = new enchant.Event(enchant.Event.TOUCH_MOVE);
+                        evt._initPosition(e.pageX, e.pageY);
+                        var target = core._touchEventTarget[core._mousedownID];
+                        if (target) {
+                            target.dispatchEvent(evt);
+                        }
+                    }, false);
+                    stage.addEventListener('mouseup', function(e) {
+                        var core = enchant.Core.instance;
+                        var evt = new enchant.Event(enchant.Event.TOUCH_END);
+                        evt._initPosition(e.pageX, e.pageY);
+                        var target = core._touchEventTarget[core._mousedownID];
+                        if (target) {
+                            target.dispatchEvent(evt);
+                        }
+                        delete core._touchEventTarget[core._mousedownID];
+                    }, false);
+                }
             }
         },
         /**

diff --git a/dev/src/Core.js b/dev/src/Core.js
@@ -408,33 +408,36 @@
                         }
                     }, false);
                 }
-                stage.addEventListener('mousedown', function(e) {
-                    var core = enchant.Core.instance;
-                    var evt = new enchant.Event(enchant.Event.TOUCH_START);
-                    evt._initPosition(e.pageX, e.pageY);
-                    var target = core.currentScene._determineEventTarget(evt);
-                    core._touchEventTarget[core._mousedownID] = target;
-                    target.dispatchEvent(evt);
-                }, false);
-                stage.addEventListener('mousemove', function(e) {
-                    var core = enchant.Core.instance;
-                    var evt = new enchant.Event(enchant.Event.TOUCH_MOVE);
-                    evt._initPosition(e.pageX, e.pageY);
-                    var target = core._touchEventTarget[core._mousedownID];
-                    if (target) {
-                        target.dispatchEvent(evt);
-                    }
-                }, false);
-                stage.addEventListener('mouseup', function(e) {
-                    var core = enchant.Core.instance;
-                    var evt = new enchant.Event(enchant.Event.TOUCH_END);
-                    evt._initPosition(e.pageX, e.pageY);
-                    var target = core._touchEventTarget[core._mousedownID];
-                    if (target) {
+
+                if (enchant.ENV.MOUSE_ENABLED){
+                    stage.addEventListener('mousedown', function(e) {
+                        var core = enchant.Core.instance;
+                        var evt = new enchant.Event(enchant.Event.TOUCH_START);
+                        evt._initPosition(e.pageX, e.pageY);
+                        var target = core.currentScene._determineEventTarget(evt);
+                        core._touchEventTarget[core._mousedownID] = target;
                         target.dispatchEvent(evt);
-                    }
-                    delete core._touchEventTarget[core._mousedownID];
-                }, false);
+                    }, false);
+                    stage.addEventListener('mousemove', function(e) {
+                        var core = enchant.Core.instance;
+                        var evt = new enchant.Event(enchant.Event.TOUCH_MOVE);
+                        evt._initPosition(e.pageX, e.pageY);
+                        var target = core._touchEventTarget[core._mousedownID];
+                        if (target) {
+                            target.dispatchEvent(evt);
+                        }
+                    }, false);
+                    stage.addEventListener('mouseup', function(e) {
+                        var core = enchant.Core.instance;
+                        var evt = new enchant.Event(enchant.Event.TOUCH_END);
+                        evt._initPosition(e.pageX, e.pageY);
+                        var target = core._touchEventTarget[core._mousedownID];
+                        if (target) {
+                            target.dispatchEvent(evt);
+                        }
+                        delete core._touchEventTarget[core._mousedownID];
+                    }, false);
+                }
             }
         },
         /**

diff --git a/dev/src/Env.js b/dev/src/Env.js
@@ -45,6 +45,7 @@ enchant.ENV = {
         div.setAttribute('ontouchstart', 'return');
         return typeof div.ontouchstart === 'function';
     }()),
+    MOUSE_ENABLED: true,
     /**
      * Determines if the current browser is an iPhone with a retina display.
      * @return {Boolean} True, if this display is a retina display