integrating the latest montage fixes for v0.6 into master

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/node_modules/montage/core/event/binding.js b/node_modules/montage/core/event/binding.js
index f061e89a..21b40609 100755
--- a/node_modules/montage/core/event/binding.js
+++ b/node_modules/montage/core/event/binding.js
@@ -19,7 +19,9 @@ var Montage = require("montage").Montage,
     Serializer = require("core/serializer").Serializer,
     Deserializer = require("core/deserializer").Deserializer,
     defaultEventManager = require("core/event/event-manager").defaultEventManager,
-    AT_TARGET = 2;
+    AT_TARGET = 2,
+    UNDERSCORE = "_";
+
 
 /**
     @member external:Array#dispatchChangeEvent
@@ -918,7 +920,7 @@ Object.defineProperty(Object.prototype, "addEventListener", {
                                     if ("value" in currentPropertyDescriptor) {
 
                                         //Create internal storage:
-                                        Object.defineProperty(currentObject, (internalStorageProperty = "_" + key), {
+                                        Object.defineProperty(currentObject, (internalStorageProperty = UNDERSCORE + key), {
                                             value: currentObject.getProperty(key),
                                             configurable: true,
                                             writable: true
@@ -1009,7 +1011,7 @@ Object.defineProperty(Object.prototype, "addEventListener", {
                                 //TODO this is all duplicated from above, clean it up
 
                                 //Create internal storage:
-                                Object.defineProperty(currentObject, (internalStorageProperty = "_" + key), {
+                                Object.defineProperty(currentObject, (internalStorageProperty = UNDERSCORE + key), {
                                     value: currentObject.getProperty(key),
                                     configurable: true,
                                     writable: true
diff --git a/node_modules/montage/core/event/event-manager.js b/node_modules/montage/core/event/event-manager.js
index b3e97dbe..bef8a67c 100755
--- a/node_modules/montage/core/event/event-manager.js
+++ b/node_modules/montage/core/event/event-manager.js
@@ -19,7 +19,6 @@
 
 var Montage = require("montage").Montage,
     MutableEvent = require("core/event/mutable-event").MutableEvent,
-    ActionEventListener = require("core/event/action-event-listener").ActionEventListener,
     Serializer = require("core/serializer").Serializer,
     Deserializer = require("core/deserializer").Deserializer,
     defaultEventManager;
@@ -28,9 +27,7 @@ var Montage = require("montage").Montage,
 if (typeof window !== "undefined") { // client-side
 
 /* This is to handle browsers that have TouchEvents but don't have the global constructor function Touch */
-//if(TouchEvent && typeof window.Touch === "undefined") {
-// HACK: The commented expression fails because Chrome on the desktop also has TouchEvent and in the code we're either registering touch events OR mouse events on most components.
-if (typeof window.Touch === "undefined" && /Xoom|TouchPad/.test(navigator.userAgent)) {
+if (typeof window.Touch === "undefined" && "ontouchstart" in window) {
     window.Touch = function() {
     };
     (function() {
diff --git a/node_modules/montage/core/event/mutable-event.js b/node_modules/montage/core/event/mutable-event.js
index f94ee0b9..6f6a0cfd 100755
--- a/node_modules/montage/core/event/mutable-event.js
+++ b/node_modules/montage/core/event/mutable-event.js
@@ -105,6 +105,7 @@ var MutableEvent = exports.MutableEvent = Montage.create(Montage,/** @lends modu
             var changeEvent = new _changeEventConstructor();
             changeEvent.type = "change@" + key;
             changeEvent.minus = minus;
+            changeEvent.plus = undefined;
             changeEvent.propertyChange = ChangeTypes.MODIFICATION;
             return changeEvent;
         }