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 @@
            "lib": ""
        },
        "mappings": {
-           "montage": "../../../../node_modules/montage/"
+           "montage": "../../../../node_modules/montage/",
+           "montage-google": "../../../../node_modules/montage-google/"
        }
 }
\ 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, {
                 //
                 this.chromeApi = chrome;
                 //
-                var i, l, libs, libjson, xhr = new XMLHttpRequest(), tocopylibs = [], copied;
+//            debugger;
+                var i, l, libs, libjson, xhr = new XMLHttpRequest(), tocopylibs = [];
             //Getting known json list of libraries to copy to chrome
                 xhr.open("GET", '/js/io/system/ninjalibrary.json', false);
             xhr.send();
@@ -166,23 +167,18 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
                 if (chromeLibs.length > 0) {
                         //
                         for (i=0; chromeLibs[i]; i++) {
-                                copied = false;
                                 for (var j in libs.libraries) {
                                         if (String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase() === chromeLibs[i]) {
-                                                copied = true;
-                                        }
-                                }
-                                //
-                                if (!copied) {
-                                        if (libs.libraries[j].file) {
-                                                tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path, file: libs.libraries[j].file});
-                                        } else {
-                                                tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path});
-                                        }
-                                } else {
-                                        //TODO: Remove, currently manually removing copied libraries
-                                        //this.chromeApi.directoryDelete(chromeLibs[i]);
-                                }
+                                //TODO: Remove, currently manually removing copied libraries
+                                // //this.chromeApi.directoryDelete(chromeLibs[i]);
+                                        } else {
+                                if (libs.libraries[j].file) {
+                                    tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path, file: libs.libraries[j].file});
+                                } else {
+                                    tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path});
+                                }
+                            }
+                        }
                         }
                         
                 } 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 @@
 {
         "libraries": [
-                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.7.0.0"},
+                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.8.0.0"},
                 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.5.0"}
         ]
 }
\ 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 @@
 {
     "component": "feedreader",
 
-    "module": "montage/ui/feed-reader/feed-reader.reel",
+    "module": "montage-google/feed-reader/feed-reader.reel",
 
     "name": "FeedReader",
 
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 @@
 {
     "component": "map",
 
-    "module": "montage/ui/map.reel",
+    "module": "montage-google/map.reel",
 
     "name": "Map",
 
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 @@
 {
     "component": "picasa-carousel",
 
-    "module": "montage/ui/picasa-carousel.reel",
+    "module": "montage-google/picasa-carousel.reel",
 
     "name": "PicasaCarousel",
 
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 @@
 {
     "component": "youtube-channel",
 
-    "module": "montage/ui/youtube-channel.reel",
+    "module": "montage-google/youtube-channel.reel",
 
     "name": "YoutubeChannel",
 
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 @@
 {
         "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.",
         "version": "0.0.0.0",
-        "root": "/node_modules/montage/",
-        "directories": [{"name": "core",
-                        "children": [{"name": "converter"}, {"name": "event"}, {"name": "geometry"}, {"name": "shim"}]
-        },
-        
-        {"name": "data",
-                        "children": [{"name": "ldapaccess"}, {"name": "nosqlaccess"}, {"name": "restaccess"}, {"name": "sqlaccess"}]
-        },
-        
-        {"name": "require"},
-        
-        {"name": "service"},
-        
-        {"name": "ui",
-                "children": [   {"name": "anchor.reel"},
-                                                {"name": "bluemoon",
-                                                                        "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"}]
-                                                },
-                                                {"name": "button.reel"},
-                                                {"name": "checkbox.reel"},
-                                                {"name": "component-group.reel"},
-                                                {"name": "component-placeholder.reel"},
-                                                {"name": "composer"},
-                                                {"name": "condition.reel"},
-                                                {"name": "controller"},
-                                                {"name": "date-input.reel"},
-                                                {"name": "dynamic-text.reel"},
-                                                {"name": "flow.reel"},
+        "root": "/node_modules/",
+        "directories": [
+        {"name": "montage",
+            "children": [
+                {"name": "bin"},
+                {"name": "core",
+                    "children": [{"name": "converter"}, {"name": "event"}, {"name": "geometry"}, {"name": "shim"}]
+                },
+                {"name": "data",
+                    "children": [{"name": "ldapaccess"}, {"name": "nosqlaccess"}, {"name": "restaccess"}, {"name": "sqlaccess"}]
+                },
+                {"name": "require"},
+                {"name": "service"},
+                {"name": "ui",
+                    "children": [
+                        {"name": "anchor.reel"},
+                        {"name": "autocomplete",
+                            "children": [{"name": "autocomplete.reel"}, {"name": "results-list.reel"}]},
+                        {"name": "bluemoon",
+                            "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"}]},
+                        {"name": "button.reel"},
+                        {"name": "checkbox.reel"},
+                        {"name": "component-group.reel"},
+                        {"name": "component-placeholder.reel"},
+                        {"name": "composer"},
+                        {"name": "condition.reel"},
+                        {"name": "controller"},
+                        {"name": "date-input.reel"},