diff options
author | Valerio Virgillito | 2012-05-09 11:46:14 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-09 11:46:14 -0700 |
commit | 4d9832acbd78f82a63fba59187bd82a5afad8240 (patch) | |
tree | 1aa2e2a955b155279d0cd9391baf18760f4c1a94 | |
parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
download | ninja-4d9832acbd78f82a63fba59187bd82a5afad8240.tar.gz |
Squashed commit of google-components into master
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
-rwxr-xr-x | js/document/templates/montage-html/package.json | 3 | ||||
-rw-r--r-- | js/io/system/ninjalibrary.js | 28 | ||||
-rw-r--r-- | js/io/system/ninjalibrary.json | 2 | ||||
-rw-r--r-- | node_modules/components-data/feed-reader.json | 2 | ||||
-rw-r--r-- | node_modules/components-data/map.json | 2 | ||||
-rw-r--r-- | node_modules/components-data/picasa-carousel.json | 2 | ||||
-rw-r--r-- | node_modules/components-data/youtube-channel.json | 2 | ||||
-rw-r--r-- | node_modules/descriptor.json | 580 | ||||
-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-x | node_modules/montage-google/package.json | 14 | ||||
-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-x | node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css (renamed from node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css) | 0 | ||||
-rwxr-xr-x | node_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 |
25 files changed, 352 insertions, 320 deletions
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json index c8bc02fb..d1e839dc 100755 --- a/js/document/templates/montage-html/package.json +++ b/js/document/templates/montage-html/package.json | |||
@@ -3,6 +3,7 @@ | |||
3 | "lib": "" | 3 | "lib": "" |
4 | }, | 4 | }, |
5 | "mappings": { | 5 | "mappings": { |
6 | "montage": "../../../../node_modules/montage/" | 6 | "montage": "../../../../node_modules/montage/", |
7 | "montage-google": "../../../../node_modules/montage-google/" | ||
7 | } | 8 | } |
8 | } \ No newline at end of file | 9 | } \ No newline at end of file |
diff --git a/js/io/system/ninjalibrary.js b/js/io/system/ninjalibrary.js index 201598fc..f4915a91 100644 --- a/js/io/system/ninjalibrary.js +++ b/js/io/system/ninjalibrary.js | |||
@@ -152,7 +152,8 @@ exports.NinjaLibrary = Montage.create(Object.prototype, { | |||
152 | // | 152 | // |
153 | this.chromeApi = chrome; | 153 | this.chromeApi = chrome; |
154 | // | 154 | // |
155 | var i, l, libs, libjson, xhr = new XMLHttpRequest(), tocopylibs = [], copied; | 155 | // debugger; |
156 | var i, l, libs, libjson, xhr = new XMLHttpRequest(), tocopylibs = []; | ||
156 | //Getting known json list of libraries to copy to chrome | 157 | //Getting known json list of libraries to copy to chrome |
157 | xhr.open("GET", '/js/io/system/ninjalibrary.json', false); | 158 | xhr.open("GET", '/js/io/system/ninjalibrary.json', false); |
158 | xhr.send(); | 159 | xhr.send(); |
@@ -166,23 +167,18 @@ exports.NinjaLibrary = Montage.create(Object.prototype, { | |||
166 | if (chromeLibs.length > 0) { | 167 | if (chromeLibs.length > 0) { |
167 | // | 168 | // |
168 | for (i=0; chromeLibs[i]; i++) { | 169 | for (i=0; chromeLibs[i]; i++) { |
169 | copied = false; | ||
170 | for (var j in libs.libraries) { | 170 | for (var j in libs.libraries) { |
171 | if (String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase() === chromeLibs[i]) { | 171 | if (String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase() === chromeLibs[i]) { |
172 | copied = true; | 172 | //TODO: Remove, currently manually removing copied libraries |
173 | } | 173 | // //this.chromeApi.directoryDelete(chromeLibs[i]); |
174 | } | 174 | } else { |
175 | // | 175 | if (libs.libraries[j].file) { |
176 | if (!copied) { | 176 | tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path, file: libs.libraries[j].file}); |
177 | if (libs.libraries[j].file) { | 177 | } else { |
178 | tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path, file: libs.libraries[j].file}); | 178 | tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path}); |
179 | } else { | 179 | } |
180 | tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path}); | 180 | } |
181 | } | 181 | } |
182 | } else { | ||
183 | //TODO: Remove, currently manually removing copied libraries | ||
184 | //this.chromeApi.directoryDelete(chromeLibs[i]); | ||
185 | } | ||
186 | } | 182 | } |
187 | 183 | ||
188 | } else { | 184 | } else { |
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json index e236f2e0..f7b87a91 100644 --- a/js/io/system/ninjalibrary.json +++ b/js/io/system/ninjalibrary.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "libraries": [ | 2 | "libraries": [ |
3 | {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.7.0.0"}, | 3 | {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.8.0.0"}, |
4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.5.0"} | 4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.5.0"} |
5 | ] | 5 | ] |
6 | } \ No newline at end of file | 6 | } \ No newline at end of file |
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"}, |