aboutsummaryrefslogtreecommitdiff
path: root/node_modules
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /node_modules
parentd21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
downloadninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
Diffstat (limited to 'node_modules')
-rw-r--r--node_modules/components-data/feed-reader.json2
-rw-r--r--node_modules/components-data/map.json2
-rw-r--r--node_modules/components-data/picasa-carousel.json2
-rw-r--r--node_modules/components-data/youtube-channel.json2
-rw-r--r--node_modules/descriptor.json580
-rw-r--r--node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html (renamed from node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html)2
-rw-r--r--node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.js (renamed from node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.js)2
-rw-r--r--node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html (renamed from node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html)4
-rw-r--r--node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js (renamed from node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.js)3
-rw-r--r--node_modules/montage-google/map.reel/map.css (renamed from node_modules/montage/ui/map.reel/map.css)0
-rw-r--r--node_modules/montage-google/map.reel/map.html (renamed from node_modules/montage/ui/map.reel/map.html)2
-rw-r--r--node_modules/montage-google/map.reel/map.js (renamed from node_modules/montage/ui/map.reel/map.js)2
-rwxr-xr-xnode_modules/montage-google/package.json14
-rw-r--r--node_modules/montage-google/picasa-carousel.reel/image.reel/image.html (renamed from node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html)2
-rw-r--r--node_modules/montage-google/picasa-carousel.reel/image.reel/image.js (renamed from node_modules/montage/ui/picasa-carousel.reel/image.reel/image.js)2
-rwxr-xr-xnode_modules/montage-google/picasa-carousel.reel/picasa-carousel.css (renamed from node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css)0
-rwxr-xr-xnode_modules/montage-google/picasa-carousel.reel/picasa-carousel.html (renamed from node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html)4
-rw-r--r--node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js (renamed from node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js)2
-rw-r--r--node_modules/montage-google/youtube-channel.reel/youtube-channel.html (renamed from node_modules/montage/ui/youtube-channel.reel/youtube-channel.html)4
-rw-r--r--node_modules/montage-google/youtube-channel.reel/youtube-channel.js (renamed from node_modules/montage/ui/youtube-channel.reel/youtube-channel.js)4
-rw-r--r--node_modules/montage-google/youtube-player.reel/youtube-player.html (renamed from node_modules/montage/ui/youtube-player.reel/youtube-player.html)2
-rw-r--r--node_modules/montage-google/youtube-player.reel/youtube-player.js (renamed from node_modules/montage/ui/youtube-player.reel/youtube-player.js)2
-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
117 files changed, 3717 insertions, 2152 deletions
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
index 39da73f3..5e8ca527 100644
--- a/node_modules/components-data/feed-reader.json
+++ b/node_modules/components-data/feed-reader.json
@@ -1,7 +1,7 @@
1{ 1{
2 "component": "feedreader", 2 "component": "feedreader",
3 3
4 "module": "montage/ui/feed-reader/feed-reader.reel", 4 "module": "montage-google/feed-reader/feed-reader.reel",
5 5
6 "name": "FeedReader", 6 "name": "FeedReader",
7 7</