diff options
author | Jonathan Duran | 2012-04-19 07:30:06 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-19 07:30:06 -0700 |
commit | fa7761eb547372f846a304d775e717a7ef1cbf35 (patch) | |
tree | c60e59702d66cf9b74d5b65ca64918d6e655a2eb | |
parent | 260bc6db6273258f9a05c21d178273e1c302affb (diff) | |
parent | 9284c19f076dec3b47ece7dc7bcd22d74e4246c3 (diff) | |
download | ninja-fa7761eb547372f846a304d775e717a7ef1cbf35.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
73 files changed, 6998 insertions, 2748 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js index a5428ea3..ec8eea0f 100755 --- a/js/helper-classes/3D/draw-utils.js +++ b/js/helper-classes/3D/draw-utils.js | |||
@@ -111,6 +111,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, { | |||
111 | this.eventManager.addEventListener("elementAdded", this, false); | 111 | this.eventManager.addEventListener("elementAdded", this, false); |
112 | this.eventManager.addEventListener("elementsRemoved", this, false); | 112 | this.eventManager.addEventListener("elementsRemoved", this, false); |
113 | this.eventManager.addEventListener("elementChange", this, false); | 113 | this.eventManager.addEventListener("elementChange", this, false); |
114 | this.eventManager.addEventListener("elementChanging", this, false); | ||
114 | this.eventManager.addEventListener("closeDocument", this, false); | 115 | this.eventManager.addEventListener("closeDocument", this, false); |
115 | this.eventManager.addEventListener("elementReplaced", this, false); | 116 | this.eventManager.addEventListener("elementReplaced", this, false); |
116 | } | 117 | } |
@@ -227,20 +228,26 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, { | |||
227 | // TODO - Check why handleElementChange is being fired before handleAddElement | 228 | // TODO - Check why handleElementChange is being fired before handleAddElement |
228 | handleElementChange: { | 229 | handleElementChange: { |
229 | value: function(event) { | 230 | value: function(event) { |
230 | if(!event.detail || !event.detail.data) | 231 | this._elementChangeHelper(event); |
231 | { | 232 | } |
233 | }, | ||
234 | |||
235 | handleElementChanging: { | ||
236 | value: function(event) { | ||
237 | this._elementChangeHelper(event); | ||
238 | } | ||
239 | }, | ||
240 | |||
241 | _elementChangeHelper: { | ||
242 | value: function(event) { | ||
243 | if(!event.detail || !event.detail.data) { | ||
232 | return; | 244 | return; |
233 | } | 245 | } |
234 | var els = event.detail.data.els; | 246 | var els = event.detail.data.els; |
235 | if(els && this._shouldUpdatePlanes(event.detail.data.prop)) | 247 | if(els && this._shouldUpdatePlanes(event.detail.data.prop)) { |
236 | { | 248 | var len = els.length; |
237 | var len = els.length, | 249 | for(var i=0; i < len; i++) { |
238 | i = 0, | 250 | if(els[i].elementModel.props3D.elementPlane) { |
239 | item; | ||
240 | |||
241 | for(i=0; i < len; i++) { | ||
242 | if(els[i].elementModel.props3D.elementPlane) | ||
243 | { | ||
244 | els[i].elementModel.props3D.elementPlane.init(); | 251 | els[i].elementModel.props3D.elementPlane.init(); |
245 | } | 252 | } |
246 | } | 253 | } |
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js index cfacd461..5d3c0a73 100755 --- a/js/panels/components-panel.reel/components-panel.js +++ b/js/panels/components-panel.reel/components-panel.js | |||
@@ -367,7 +367,7 @@ exports.ComponentsPanel = Montage.create(Component, { | |||
367 | break; | 367 | break; |
368 | case "textarea": | 368 | case "textarea": |
369 | el = NJUtils.makeNJElement("textarea", "TextArea", "component"); | 369 | el = NJUtils.makeNJElement("textarea", "TextArea", "component"); |
370 | el.elementModel.pi = "TextAreaPi"; | 370 | el.elementModel.pi = "TextareaPi"; |
371 | break; | 371 | break; |
372 | case "toggleButton": | 372 | case "toggleButton": |
373 | el = NJUtils.makeNJElement("button", "Toggle Button", "component"); | 373 | el = NJUtils.makeNJElement("button", "Toggle Button", "component"); |
diff --git a/node_modules/components-data/textarea.json b/node_modules/components-data/textarea.json index 8e780954..0dd7714e 100644 --- a/node_modules/components-data/textarea.json +++ b/node_modules/components-data/textarea.json | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | "module": "montage/ui/textarea.reel", | 4 | "module": "montage/ui/textarea.reel", |
5 | 5 | ||
6 | "name": "TextArea", | 6 | "name": "Textarea", |
7 | 7 | ||
8 | "properties": [ | 8 | "properties": [ |
9 | 9 | ||
diff --git a/node_modules/montage/core/deserializer.js b/node_modules/montage/core/deserializer.js index 7e812235..b8ed5618 100755 --- a/node_modules/montage/core/deserializer.js +++ b/node_modules/montage/core/deserializer.js | |||
@@ -98,6 +98,26 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri | |||
98 | }}, | 98 | }}, |
99 | 99 | ||
100 | /** | 100 | /** |
101 | Initializes the deserializer with a string | ||
102 | @param {String|Object} serialization A string or JSON-style object | ||
103 | describing the serialized objects. | ||
104 | @param {Function} require The module loader for the containing package. | ||
105 | @param {String} origin Usually a file name. | ||
106 | */ | ||
107 | init: { | ||
108 | value: function (serialization, require, origin) { | ||
109 |