Merge branch 'timeline-local' into timeline-multiselect

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	resolved using theirs. (selectLayers)

10 files changed, 79 insertions, 86 deletions

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..feced079 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": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.5.0"}
+                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.8.0.0"},
+                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.6.0"}
         ]
 }
\ No newline at end of file
diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json
index acc03979..21c4b58c 100644
--- a/js/io/templates/descriptor.json
+++ b/js/io/templates/descriptor.json
@@ -6,7 +6,7 @@
                 "name":"Blank File",
                 "uri":"/",
                 "type":"directory",
-        "children":["js/io/templates/files/html.txt", "js/io/templates/files/js.txt", "js/io/templates/files/css.txt", "js/io/templates/files/json.txt", "js/io/templates/files/php.txt", "js/io/templates/files/pl.txt", "js/io/templates/files/py.txt", "js/io/templates/files/rb.txt"]
+        "children":["js/io/templates/files/html.txt", "js/io/templates/files/js.txt", "js/io/templates/files/css.txt", "js/io/templates/files/json.txt", "js/io/templates/files/php.txt", "js/io/templates/files/pl.txt", "js/io/templates/files/py.txt", "js/io/templates/files/rb.txt", "js/io/templates/files/xml.txt"]
         },
         "js/io/templates/files/html.txt":{
                 "name":"HTML",
@@ -64,6 +64,13 @@
         "fileExtension":".rb",
         "children":["defaultTemplate"]
         },
+    "js/io/templates/files/xml.txt":{
+        "name":"XML",
+        "uri":"js/io/templates/files/xml.txt",
+        "type":"file",
+        "fileExtension":".xml",
+        "children":["defaultTemplate"]
+    },
     "defaultTemplate":{
         "name": "Basic",
         "uri": "defaultTemplate",
diff --git a/js/io/templates/files/xml.txt b/js/io/templates/files/xml.txt
new file mode 100644
index 00000000..8906a78b
--- /dev/null
+++ b/js/io/templates/files/xml.txt
@@ -0,0 +1 @@
+<!-- Created with Motorola Mobility Ninja -->
\ No newline at end of file
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index e58041ec..753597e7 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
@@ -16,8 +16,7 @@
                 <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/io/ui/cloudpopup.reel",
-                "name": "cloudpopup",
+                "prototype": "js/io/ui/cloudpopup.reel[cloudpopup]",
                 "properties": {
                     "element": {"#": "cloud_popup"}
                 }
@@ -29,7 +28,7 @@
         
         <body>
     
-        <div id="cloud_popup" class="cloud_popup">
+        <div data-montage-id="cloud_popup" class="cloud_popup">
                 <div class="content">
                         
                         <h3>Cloud Service Dialog</h3>
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
index 00df1c11..c3209654 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -19,8 +19,7 @@
         },
 
         "owner":{
-            "module": "js/io/ui/file-picker/file-input-field.reel",
-            "name": "FileInputField",
+            "prototype": "js/io/ui/file-picker/file-input-field.reel",
             "properties": {
                 "element": {"#": "fileInputField"},
                 "findDirectory": {"#": "findDirectory"},
@@ -31,9 +30,9 @@
     </script>
 </head>
 <body>
-<div id="fileInputField" class="fileInputField">
-    <input type="search" id="newFileDirectory" class="nj-skinned newFileDirectory" />
-    <span id="findDirectory" class="findDirectory"></span>
+<div data-montage-id="fileInputField" class="fileInputField">
+    <input type="search" data-montage-id="newFileDirectory" class="nj-skinned newFileDirectory" />
+    <span data-montage-id="findDirectory" class="findDirectory"></span>
 </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
index f46068ec..34d6b53a 100755
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
     <script type="text/montage-serialization">
         {
             "owner":{
-                "module": "js/io/ui/file-picker/picker-navigator.reel",
-                "name":"PickerNavigator",
+                "prototype": "js/io/ui/file-picker/picker-navigator.reel",
                 "properties":{
                     "element": {"#": "picker"},
                     "filterVal" : {"#": "filterVal"},
@@ -39,41 +38,41 @@
 
 </head>
 <body>
-<div id="picker" class="picker" style="visibility:hidden;">
-    <div><span id="error" class="error"></span></div>
+<div data-montage-id="picker" class="picker" style="visibility:hidden;">
+    <div><span data-montage-id="error" class="error"></span></div>
     <div class="pickerHeader">
         <div class="historyArrows">
-            <span id="backArrow" class="backArrow disable">&#9664</span>
+