diff options
author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
tree | 762d98ba8852b858c03760f4b9bef294fae6486c /node_modules/montage/core/event/event-manager.js | |
parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz |
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>
Diffstat (limited to 'node_modules/montage/core/event/event-manager.js')
-rwxr-xr-x | node_modules/montage/core/event/event-manager.js | 5 |
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 @@ | |||
19 | 19 | ||
20 | var Montage = require("montage").Montage, | 20 | var Montage = require("montage").Montage, |
21 | MutableEvent = require("core/event/mutable-event").MutableEvent, | 21 | MutableEvent = require("core/event/mutable-event").MutableEvent, |
22 | ActionEventListener = require("core/event/action-event-listener").ActionEventListener, | ||
23 | Serializer = require("core/serializer").Serializer, | 22 | Serializer = require("core/serializer").Serializer, |
24 | Deserializer = require("core/deserializer").Deserializer, | 23 | Deserializer = require("core/deserializer").Deserializer, |
25 | defaultEventManager; | 24 | defaultEventManager; |
@@ -28,9 +27,7 @@ var Montage = require("montage").Montage, | |||
28 | if (typeof window !== "undefined") { // client-side | 27 | if (typeof window !== "undefined") { // client-side |
29 | 28 | ||
30 | /* This is to handle browsers that have TouchEvents but don't have the global constructor function Touch */ | 29 | /* This is to handle browsers that have TouchEvents but don't have the global constructor function Touch */ |
31 | //if(TouchEvent && typeof window.Touch === "undefined") { | 30 | if (typeof window.Touch === "undefined" && "ontouchstart" in window) { |
32 | // 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. | ||
33 | if (typeof window.Touch === "undefined" && /Xoom|TouchPad/.test(navigator.userAgent)) { | ||
34 | window.Touch = function() { | 31 | window.Touch = function() { |
35 | }; | 32 | }; |
36 | (function() { | 33 | (function() { |