diff options
author | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
commit | 2e04af953463643791f6362bd8ef4c6ba190abfa (patch) | |
tree | d07aaf646091ddf9dad5b030a7905055fd323490 /node_modules/montage/core/event/event-manager.js | |
parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
download | ninja-2e04af953463643791f6362bd8ef4c6ba190abfa.tar.gz |
Squashed commit of the following:
commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 18 13:48:21 2012 -0700
Merge branch 'refs/heads/master' into integration
commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:29:41 2012 -0700
updating the picasa carousel
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:03:50 2012 -0700
Merge branch 'refs/heads/master' into integration
commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 11 10:39:36 2012 -0700
integrating new picasa carousel component
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 10 14:33:00 2012 -0700
fixed the text area case issue
Text area was renamed from TextArea to Textarea
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date: Mon Apr 9 22:10:45 2012 -0700
integrating montage v0.8 into ninja.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/core/event/event-manager.js')
-rwxr-xr-x | node_modules/montage/core/event/event-manager.js | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/node_modules/montage/core/event/event-manager.js b/node_modules/montage/core/event/event-manager.js index bef8a67c..75272f85 100755 --- a/node_modules/montage/core/event/event-manager.js +++ b/node_modules/montage/core/event/event-manager.js | |||
@@ -103,13 +103,12 @@ var EventListenerDescriptor = Montage.create(Montage, { | |||
103 | } | 103 | } |
104 | }); | 104 | }); |
105 | 105 | ||
106 | Serializer.defineSerializationUnit("listeners", function(object) { | 106 | Serializer.defineSerializationUnit("listeners", function(object, serializer) { |
107 | var eventManager = defaultEventManager, | 107 | var eventManager = defaultEventManager, |
108 | uuid = object.uuid, | 108 | uuid = object.uuid, |
109 | eventListenerDescriptors = [], | 109 | eventListenerDescriptors = [], |
110 | descriptors, | 110 | descriptors, |
111 | descriptor, | 111 | descriptor, |
112 | listenerDescriptor, | ||
113 | listener; | 112 | listener; |
114 | 113 | ||
115 | for (var type in eventManager.registeredEventListeners) { | 114 | for (var type in eventManager.registeredEventListeners) { |
@@ -119,12 +118,11 @@ Serializer.defineSerializationUnit("listeners", function(object) { | |||
119 | for (var listenerUuid in descriptor.listeners) { | 118 | for (var listenerUuid in descriptor.listeners) { |
120 | listener = descriptor.listeners[listenerUuid]; | 119 | listener = descriptor.listeners[listenerUuid]; |
121 | 120 | ||
122 | eventListenerDescriptor = EventListenerDescriptor.create(); | 121 | eventListenerDescriptors.push({ |
123 | eventListenerDescriptor.type = type; | 122 | type: type, |
124 | eventListenerDescriptor.listener = listener.listener; | 123 | listener: serializer.addObjectReference(listener.listener), |
125 | eventListenerDescriptor.capture = listener.capture; | 124 | capture: listener.capture |
126 | 125 | }); | |
127 | eventListenerDescriptors.push(eventListenerDescriptor); | ||
128 | } | 126 | } |
129 | } | 127 | } |
130 | } | 128 | } |