From a3024011a91d3941f81481dd4d600e9684eb0fd4 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 2 Feb 2012 00:11:51 -0800 Subject: upgrading to Montage v0.6 Signed-off-by: Valerio Virgillito --- node_modules/montage/core/event/event-manager.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'node_modules/montage/core/event/event-manager.js') diff --git a/node_modules/montage/core/event/event-manager.js b/node_modules/montage/core/event/event-manager.js index abc441c8..4adc3926 100755 --- a/node_modules/montage/core/event/event-manager.js +++ b/node_modules/montage/core/event/event-manager.js @@ -24,6 +24,9 @@ var Montage = require("montage").Montage, Deserializer = require("core/deserializer").Deserializer, defaultEventManager; +// XXX Does not presently function server-side +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. @@ -91,12 +94,12 @@ var EventListenerDescriptor = Montage.create(Montage, { serializable: true, value: null }, - + listener: { serializable: "reference", value: null }, - + capture: { serializable: true, value: null @@ -111,19 +114,19 @@ Serializer.defineSerializationUnit("listeners", function(object) { descriptor, listenerDescriptor, listener; - + for (var type in eventManager.registeredEventListeners) { descriptors = eventManager.registeredEventListeners[type]; descriptor = descriptors && descriptors[uuid]; if (descriptor) { for (var listenerUuid in descriptor.listeners) { listener = descriptor.listeners[listenerUuid]; - + eventListenerDescriptor = EventListenerDescriptor.create(); eventListenerDescriptor.type = type; eventListenerDescriptor.listener = listener.listener; eventListenerDescriptor.capture = listener.capture; - + eventListenerDescriptors.push(eventListenerDescriptor); } } @@ -2073,3 +2076,5 @@ if (typeof window.ondragstart !== undefined) { }; } +} // client-side + -- cgit v1.2.3