aboutsummaryrefslogtreecommitdiff
path: root/node_modules
diff options
context:
space:
mode:
authorhwc4872012-05-10 16:53:53 -0700
committerhwc4872012-05-10 16:53:53 -0700
commitd1bcb47ba34f2f2b8db5fa310a9e9a9bd7973988 (patch)
treefe0e80aa7ca2a48b7e54873346c642221267f76a /node_modules
parentbabfa5f1ca4f702920d81d7e12a90b12ffbf42d8 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-d1bcb47ba34f2f2b8db5fa310a9e9a9bd7973988.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
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
22 files changed, 337 insertions, 302 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
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json
index 655d222d..e80fa510 100644
--- a/node_modules/components-data/map.json
+++ b/node_modules/components-data/map.json
@@ -1,7 +1,7 @@
1{ 1{
2 "component": "map", 2 "component": "map",
3 3
4 "module": "montage/ui/map.reel", 4 "module": "montage-google/map.reel",
5 5
6 "name": "Map", 6 "name": "Map",
7 7
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json
index 2eb601c7..b0711b12 100644
--- a/node_modules/components-data/picasa-carousel.json
+++ b/node_modules/components-data/picasa-carousel.json
@@ -1,7 +1,7 @@
1{ 1{
2 "component": "picasa-carousel", 2 "component": "picasa-carousel",
3 3
4 "module": "montage/ui/picasa-carousel.reel", 4 "module": "montage-google/picasa-carousel.reel",
5 5
6 "name": "PicasaCarousel", 6 "name": "PicasaCarousel",
7 7
diff --git a/node_modules/components-data/youtube-channel.json b/node_modules/components-data/youtube-channel.json
index c909fd1b..44180d72 100644
--- a/node_modules/components-data/youtube-channel.json
+++ b/node_modules/components-data/youtube-channel.json
@@ -1,7 +1,7 @@
1{ 1{
2 "component": "youtube-channel", 2 "component": "youtube-channel",
3 3
4 "module": "montage/ui/youtube-channel.reel", 4 "module": "montage-google/youtube-channel.reel",
5 5
6 "name": "YoutubeChannel", 6 "name": "YoutubeChannel",
7 7
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index e5606655..a2e96aa3 100644
--- a/node_modules/descriptor.json
+++ b/node_modules/descriptor.json
@@ -1,285 +1,307 @@
1{ 1{
2 "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.", 2 "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.",
3 "version": "0.0.0.0", 3 "version": "0.0.0.0",
4 "root": "/node_modules/montage/", 4 "root": "/node_modules/",
5 "directories": [{"name": "core", 5 "directories": [
6 "children": [{"name": "converter"}, {"name": "event"}, {"name": "geometry"}, {"name": "shim"}] 6 {"name": "montage",
7 }, 7 "children": [
8 8 {"name": "bin"},
9 {"name": "data", 9 {"name": "core",
10 "children": [{"name": "ldapaccess"}, {"name": "nosqlaccess"}, {"name": "restaccess"}, {"name": "sqlaccess"}] 10 "children": [{"name": "converter"}, {"name": "event"}, {"name": "geometry"}, {"name": "shim"}]
11 }, 11 },
12 12 {"name": "data",
13 {"name": "require"}, 13 "children": [{"name": "ldapaccess"}, {"name": "nosqlaccess"}, {"name": "restaccess"}, {"name": "sqlaccess"}]
14 14 },
15 {"name": "service"}, 15 {"name": "require"},
16 16 {"name": "service"},
17 {"name": "ui", 17 {"name": "ui",
18 "children": [ {"name": "anchor.reel"}, 18 "children": [
19 {"name": "bluemoon", 19 {"name": "anchor.reel"},
20 "children": [{"name": "button-group.reel"}, {"name": "button.reel"}, {"name": "checkbox.reel"}, {"name": "progress.reel"}, {"name": "slider.reel"}, {"name": "textarea.reel"}, {"name": "textfield.reel"}, {"name": "toggle.reel"}] 20 {"name": "autocomplete",
21 }, 21 "children": [{"name": "autocomplete.reel"}, {"name": "results-list.reel"}]},
22 {"name": "button.reel"}, 22 {"name": "bluemoon",
23 {"name": "checkbox.reel"}, 23 "children": [{"name": "button-group.reel"}, {"name": "button.reel"}, {"name": "checkbox.reel"}, {"name": "progress.reel"}, {"name": "slider.reel"}, {"name": "textarea.reel"}, {"name": "textfield.reel"}, {"name": "toggle.reel"}]},
24 {"name": "component-group.reel"}, 24 {"name": "button.reel"},
25 {"name": "component-placeholder.reel"}, 25 {"name": "checkbox.reel"},
26 {"name": "composer"}, 26 {"name": "component-group.reel"},
27 {"name": "condition.reel"}, 27 {"name": "component-placeholder.reel"},
28 {"name": "controller"}, 28 {"name": "composer"},
29 {"name": "date-input.reel"}, 29 {"name": "condition.reel"},
30 {"name": "dynamic-text.reel"}, 30 {"name": "controller"},
31 {"name": "flow.reel"}, 31 {"name": "date-input.reel"},
32 {"name": "image.reel"}, 32 {"name": "dynamic-element.reel"},
33 {"name": "list.reel"}, 33 {"name": "dynamic-text.reel"},
34 {"name": "loader.reel"}, 34 {"name": "flow.reel"},
35 {"name": "loading-panel.reel"}, 35 {"name": "image.reel"},
36 {"name": "loading.reel"}, 36 {"name": "list.reel"},
37 {"name": "number-input.reel"}, 37 {"name": "loader.reel"},
38 {"name": "popup", 38 {"name": "loading-panel.reel"},
39 "children": [{"name": "alert.reel"}, {"name": "confirm.reel"}, {"name": "notifier.reel"}, {"name": "popup.reel"}] 39 {"name": "loading.reel"},
40 }, 40 {"name": "number-input.reel"},
41 {"name": "progress.reel"}, 41 {"name": "popup",
42 {"name": "radio-button.reel"}, 42 "children": [{"name": "alert.reel"}, {"name": "confirm.reel"}, {"name": "notifier.reel"}, {"name": "popup.reel"}]
43 {"name": "range-input.reel"}, 43 },
44 {"name": "repetition.reel"}, 44 {"name": "progress.reel"},
45 {"name": "scroll-bars.reel"}, 45 {"name": "radio-button.reel"},
46 {"name": "scroller.reel"}, 46 {"name": "range-input.reel"},
47 {"name": "scrollview.reel"}, 47 {"name": "repetition.reel"},
48 {"name": "select-input.reel"}, 48 {"name": "scroll-bars.reel"},
49 {"name": "slot.reel"}, 49 {"name": "scroller.reel"},
50 {"name": "substitution.reel"}, 50 {"name": "scrollview.reel"},
51 {"name": "tabs.reel"}, 51 {"name": "select-input.reel"},
52 {"name": "textarea.reel"}, 52 {"name": "slot.reel"},
53 {"name": "textfield.reel"}, 53 {"name": "substitution.reel"},
54 {"name": "toggle-button.reel"}, 54 {"name": "tabs.reel"},
55 {"name": "toggle-switch.reel"}, 55 {"name": "textarea.reel"},
56 {"name": "video-player.reel", 56 {"name": "textfield.reel"},
57 "children": [{"name": "images"}] 57 {"name": "toggle-button.reel"},
58 } 58 {"name": "toggle-switch.reel"},
59 ] 59 {"name": "video-player.reel",
60 }], 60 "children": [{"name": "images"}]}
61 ]
62 }]
63 },
64
65 {"name": "montage-google",
66 "children": [
67 {"name": "feed-reader",
68 "children": [
69 {"name": "feed-entry.reel"},
70 {"name": "feed-reader.reel"}
71 ]
72 },
73 {"name": "map.reel"},
74 {"name": "picasa-carousel.reel",
75 "children": [
76 {"name": "image.reel"}
77 ]
78 },
79 {"name": "youtube-channel.reel"},
80 {"name": "youtube-player.reel"}
81 ]
82 }
83 ],
61 "files": [ 84 "files": [
62 "core/bitfield.js", 85 "montage/core/bitfield.js",