Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 1 insertions, 4 deletions

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() {