aboutsummaryrefslogtreecommitdiff
path: root/node_modules
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-04 15:31:40 -0700
committerValerio Virgillito2012-05-04 15:31:40 -0700
commit3ebed34665fa73b0ce613b400f3029ebf4476439 (patch)
tree09a3c592035030bda7bb62d1f908ce263377d74c /node_modules
parent8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-3ebed34665fa73b0ce613b400f3029ebf4476439.tar.gz
Merge branch 'refs/heads/master' into dom-architecture
Diffstat (limited to 'node_modules')
-rwxr-xr-xnode_modules/montage/core/deserializer.js14
-rwxr-xr-xnode_modules/montage/core/event/event-manager.js28
-rwxr-xr-xnode_modules/montage/core/logger.js2
-rwxr-xr-xnode_modules/montage/core/serializer.js18
-rw-r--r--node_modules/montage/examples/feed-reader/images/07-map-marker.pngbin3131 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/10-medical.pngbin2915 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/100-coffee.pngbin2958 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/107-widescreen.pngbin2986 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/125-food.pngbin3038 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/142-wine-bottle.pngbin187 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/34-coffee.pngbin3052 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/35-shopping.pngbin2970 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/38-airplane.pngbin3004 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/41-picture-frame.pngbin2928 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/47-fuel.pngbin3091 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/48-fork-and-knife.pngbin2882 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/80-shopping-cart.pngbin2963 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/87-wine-glass.pngbin2983 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/88-beer-mug.pngbin3087 -> 0 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/index.html81
-rw-r--r--node_modules/montage/examples/feed-reader/main.reel/main.html274
-rw-r--r--node_modules/montage/examples/feed-reader/main.reel/main.js55
-rw-r--r--node_modules/montage/examples/feed-reader/map-example.reel/main.css2
-rw-r--r--node_modules/montage/examples/feed-reader/map-example.reel/main.html58
-rw-r--r--node_modules/montage/examples/feed-reader/map-example.reel/main.js24
-rw-r--r--node_modules/montage/examples/feed-reader/package.json10
-rwxr-xr-xnode_modules/montage/examples/youtube-channel-example/index.html45
-rwxr-xr-xnode_modules/montage/examples/youtube-channel-example/package.json7
-rwxr-xr-xnode_modules/montage/examples/youtube-channel-example/style.css47
-rwxr-xr-xnode_modules/montage/montage.js10
-rwxr-xr-xnode_modules/montage/package.json2
-rw-r--r--node_modules/montage/ui/anchor.reel/anchor.js78
-rwxr-xr-xnode_modules/montage/ui/application.js4
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.css (renamed from node_modules/montage/examples/youtube-channel-example/youtube-channel-example.js)10
-rw-r--r--node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.html10
-rw-r--r--node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js498
-rw-r--r--node_modules/montage/ui/autocomplete/autocomplete.reel/loading.gifbin0 -> 1456 bytes
-rw-r--r--node_modules/montage/ui/autocomplete/results-list.reel/results-list.css30
-rw-r--r--node_modules/montage/ui/autocomplete/results-list.reel/results-list.html62
-rw-r--r--node_modules/montage/ui/autocomplete/results-list.reel/results-list.js16
-rw-r--r--node_modules/montage/ui/bluemoon/button-group.reel/button-group.html3
-rw-r--r--node_modules/montage/ui/bluemoon/button.reel/button.html3
-rw-r--r--node_modules/montage/ui/bluemoon/progress.reel/progress.html7
-rw-r--r--node_modules/montage/ui/bluemoon/slider.reel/slider.html35
-rw-r--r--node_modules/montage/ui/button.reel/button.js214
-rw-r--r--node_modules/montage/ui/check-input.js23
-rw-r--r--node_modules/montage/ui/checkbox.reel/checkbox.js63
-rwxr-xr-xnode_modules/montage/ui/component.js201
-rw-r--r--node_modules/montage/ui/composer/composer.js45
-rw-r--r--node_modules/montage/ui/composer/press-composer.js28
-rw-r--r--node_modules/montage/ui/composer/translate-composer.js641
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/controller/array-controller.js1
-rw-r--r--node_modules/montage/ui/date-input.reel/date-input.js33
-rw-r--r--node_modules/montage/ui/dynamic-element.reel/dynamic-element.js143
-rwxr-xr-xnode_modules/montage/ui/dynamic-text.reel/dynamic-text.js45
-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
-rwxr-xr-xnode_modules/montage/ui/image.reel/image.js36
-rwxr-xr-xnode_modules/montage/ui/list.reel/list.html13
-rwxr-xr-xnode_modules/montage/ui/loader.reel/loader.js30
-rwxr-xr-xnode_modules/montage/ui/loading-panel.reel/loading-panel.html24
-rwxr-xr-xnode_modules/montage/ui/loading.reel/loading.html5
-rw-r--r--node_modules/montage/ui/native-control.js185
-rw-r--r--node_modules/montage/ui/number-input.reel/number-input.js32
-rwxr-xr-xnode_modules/montage/ui/popup/alert.reel/alert.html25
-rwxr-xr-xnode_modules/montage/ui/popup/confirm.reel/confirm.html24
-rwxr-xr-xnode_modules/montage/ui/popup/notifier.reel/notifier.html7
-rwxr-xr-xnode_modules/montage/ui/popup/popup.reel/popup.css20
-rwxr-xr-xnode_modules/montage/ui/popup/popup.reel/popup.html12
-rwxr-xr-xnode_modules/montage/ui/popup/popup.reel/popup.js16
-rwxr-xr-xnode_modules/montage/ui/progress.reel/progress.js34
-rwxr-xr-xnode_modules/montage/ui/radio-button.reel/radio-button.js65
-rw-r--r--node_modules/montage/ui/range-input.reel/range-input.js31
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html10
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.js1
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css32
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html26
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js10
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js34
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html10
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js223
-rw-r--r--node_modules/montage/ui/scroll-bars.reel/scroll-bars.html17
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.html26
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.js21
-rwxr-xr-xnode_modules/montage/ui/scrollview.reel/scrollview.js193
-rw-r--r--node_modules/montage/ui/select-input.reel/select-input.js86
-rwxr-xr-xnode_modules/montage/ui/tabs.reel/tabs.html12
-rw-r--r--node_modules/montage/ui/text-input.js148
-rw-r--r--node_modules/montage/ui/textarea.reel/textarea.js94
-rw-r--r--node_modules/montage/ui/textfield.reel/textfield.js14
-rw-r--r--node_modules/montage/ui/toggle-button.reel/toggle-button.js74
-rwxr-xr-xnode_modules/montage/ui/video-player.reel/video-player.html97
95 files changed, 3380 insertions, 1850 deletions
diff --git a/node_modules/montage/core/deserializer.js b/node_modules/montage/core/deserializer.js
index b8ed5618..c1c97b2b 100755
--- a/node_modules/montage/core/deserializer.js
+++ b/node_modules/montage/core/deserializer.js
@@ -332,11 +332,6 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
332 @param {Array} properties The property names to be deserialized. 332 @param {Array} properties The property names to be deserialized.
333 */ 333 */
334 deserializePropertiesForObject: {value: function(object, properties) { 334 deserializePropertiesForObject: {value: function(object, properties) {
335 // TODO: ensure backward compatibility
336 if (properties && "childComponents" in properties) {
337 properties.childComponents = [];
338 console.log('Warning: "childComponents" isn\'t supported on components within the current serializaation format, this property will be reset to [].');
339 }
340 for (var key in properties) { 335 for (var key in properties) {
341 object[key] = properties[key]; 336 object[key] = properties[key];
342 } 337 }
@@ -846,8 +841,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
846 if (id) { 841 if (id) {
847 return 'element.getElementById("' + id + '")'; 842 return 'element.getElementById("' + id + '")';
848 } else { 843 } else {
849 // TODO: getElemenyById only here for backwards compatibility 844 return 'element.querySelector(\'*[' + Deserializer._MONTAGE_ID_ATTRIBUTE + '="' + value + '"]\')';
850 return 'element.querySelector(\'*[' + Deserializer._MONTAGE_ID_ATTRIBUTE + '="' + value + '"]\') || element.getElementById("' + value + '")';
851 } 845 }
852 break; 846 break;
853 847
@@ -859,7 +853,8 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
859 break; 853 break;
860 854
861 case "reference": 855 case "reference":
862 var object; 856 var object,
857 originalValue = value;
863 858
864 if (value in exports) { 859 if (value in exports) {
865 object = exports[value]; 860 object = exports[value];
@@ -874,6 +869,9 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
874 if (parent) { 869 if (parent) {
875 parent[key] = object; 870 parent[key] = object;
876 } 871 }
872 if (typeof object === "undefined") {
873 logger.error("Missing object in serialization: '" + originalValue + "'" + (self._origin ? " in " + self._origin : ""));
874 }
877 return value; 875 return value;
878 break; 876 break;
879 877
diff --git a/node_modules/montage/core/event/event-manager.js b/node_modules/montage/core/event/event-manager.js
index 75272f85..d38b9755 100755
--- a/node_modules/montage/core/event/event-manager.js
+++ b/node_modules/montage/core/event/event-manager.js
@@ -332,29 +332,6 @@ var EventManager = exports.EventManager = Montage.create(Montage,/** @lends modu
332 this._application = application; 332 this._application = application;
333 } 333 }
334 }, 334 },
335/**