aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js29
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js2
-rw-r--r--node_modules/components-data/textarea.json2
-rwxr-xr-xnode_modules/montage/core/deserializer.js352
-rwxr-xr-xnode_modules/montage/core/event/action-event-listener.js4
-rwxr-xr-xnode_modules/montage/core/event/binding.js48
-rwxr-xr-xnode_modules/montage/core/event/event-manager.js14
-rwxr-xr-xnode_modules/montage/core/logger.js1
-rw-r--r--node_modules/montage/core/promise-connection.js285
-rw-r--r--node_modules/montage/core/promise-queue.js65
-rwxr-xr-xnode_modules/montage/core/promise.js48
-rwxr-xr-xnode_modules/montage/core/serializer.js328
-rw-r--r--node_modules/montage/core/undo-manager.js12
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html77
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css7
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html75
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.js35
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json10
-rwxr-xr-xnode_modules/montage/montage.js45
-rwxr-xr-xnode_modules/montage/package.json2
-rwxr-xr-xnode_modules/montage/require/require.js213
-rwxr-xr-xnode_modules/montage/test/ui/youtube-player-spec.js363
-rw-r--r--node_modules/montage/test/ui/youtube-player-test/youtube-player-test.html47
-rwxr-xr-xnode_modules/montage/test/ui/youtube-player-test/youtube-player-test.js9
-rw-r--r--node_modules/montage/ui/bluemoon/slider.reel/slider.js14
-rw-r--r--node_modules/montage/ui/button.reel/button.js95
-rw-r--r--node_modules/montage/ui/check-input.js4
-rwxr-xr-xnode_modules/montage/ui/component.js23
-rw-r--r--node_modules/montage/ui/composer/long-press-composer.js232
-rw-r--r--node_modules/montage/ui/composer/press-composer.js126
-rw-r--r--node_modules/montage/ui/composer/translate-composer.js133
-rwxr-xr-xnode_modules/montage/ui/condition.reel/condition.js2
-rwxr-xr-xnode_modules/montage/ui/flow-bezier-spline.js405
-rw-r--r--node_modules/montage/ui/flow-path-cubic.js115
-rw-r--r--node_modules/montage/ui/flow-path-lerp.js112
-rw-r--r--node_modules/montage/ui/flow-path-linear.js83
-rw-r--r--node_modules/montage/ui/flow-path-sigmoid.js148
-rw-r--r--node_modules/montage/ui/flow-path.js215
-rw-r--r--node_modules/montage/ui/flow.reel/flow.html48
-rw-r--r--node_modules/montage/ui/flow.reel/flow.js1002
-rwxr-xr-xnode_modules/montage/ui/list.reel/list.html38
-rwxr-xr-xnode_modules/montage/ui/loading-panel.reel/loading-panel.html32
-rw-r--r--node_modules/montage/ui/native-control.js14
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html3
-rwxr-xr-xnode_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css15
-rwxr-xr-xnode_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html242
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js210
-rwxr-xr-xnode_modules/montage/ui/popup/alert.reel/alert.html32
-rwxr-xr-xnode_modules/montage/ui/popup/confirm.reel/confirm.html32
-rwxr-xr-xnode_modules/montage/ui/popup/notifier.reel/notifier.js4
-rwxr-xr-xnode_modules/montage/ui/popup/popup.reel/popup.js135
-rw-r--r--node_modules/montage/ui/range-input.reel/range-input.js6
-rwxr-xr-xnode_modules/montage/ui/repetition.reel/repetition.js18
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.css31
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html37
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.js274
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css141
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html45
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js568
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js1706
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css30
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html41
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js614
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-sanitizer.js132
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.html56
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.js49
-rw-r--r--node_modules/montage/ui/select-input.reel/select-input.js7
-rw-r--r--node_modules/montage/ui/skeleton/range-input.reel/range-input.html19
-rwxr-xr-xnode_modules/montage/ui/tabs.reel/tabs.html20
-rwxr-xr-xnode_modules/montage/ui/template.js313
-rw-r--r--node_modules/montage/ui/text-input.js24
-rw-r--r--node_modules/montage/ui/textarea.reel/textarea.js4
-rwxr-xr-xnode_modules/montage/ui/video-player.reel/video-player.html24
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 if (typeof serialization !== "string") {
110 serialization = JSON.stringify(serialization);
111 }
112 this._reset();
113 this._serializationString = serialization;
114 this._require = require;
115<