Merge branch 'refs/heads/ninja-internal' into AllFixes

18 files changed, 214 insertions, 203 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index a308f191..ddaeb061 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -32,9 +32,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     _iframeHolder: { value: null, enumerable: false },
     _textHolder: { value: null, enumerable: false },
     _codeMirrorCounter: {value: 1, enumerable: false},
-
-    canSave:{value: false},//for Save menu state update
-    canSaveAll:{value: false},//for Save All menu state update
     
     activeDocument: {
         get: function() {
@@ -50,12 +47,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                 if(!!this._activeDocument.editor){
                     this._activeDocument.editor.focus();
                 }
-
-                this.canSave = doc.needsSave;
-                this.canSaveAll = doc.needsSave;
-            }else{
-                this.canSave = false;
-                this.canSaveAll = false;
             }
         }
     },
@@ -80,7 +71,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     handleAddComponentFirstDraw: {
         value: function (e) {
                 //TODO: Add logic to reparse the document for dynamically added styles
-                console.log(e);
+                //console.log(e);
         }
     },
     
diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js
index 975f9f7a..4c177189 100644
--- a/js/controllers/presets-controller.js
+++ b/js/controllers/presets-controller.js
@@ -72,20 +72,19 @@ exports.PresetsController = Montage.create(Component, {
             selectorBase = stylesController.generateClassName(selectorBase);
 
             selection.forEach(function(element) {
-                var el = element._element,
-                    animationName;
+                var animationName;
 
                 if(useTransition) {
-                    this.addTransition(el);
+                    this.addTransition(element);
                 }
 
                 ///// TODO: remove when we find out what to do with competing animations
-                animationName = stylesController.getElementStyle(el, '-webkit-animation-name');
+                animationName = stylesController.getElementStyle(element, '-webkit-animation-name');
                 if(animationName) {
                     animationNames.push(animationName);
                 }
 
-                el.classList.add(selectorBase);
+                element.classList.add(selectorBase);
 
             }, this);
 
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 3333d209..a1fe2703 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -70,8 +70,12 @@ exports.MenuData = Montage.create( Montage, {
                             "enabled": {
                                 "value": false,
                                 "boundObj": "documentController",
-                                "boundProperty": "canSave",
-                                "oneway": true
+                                "boundProperty": "activeDocument",
+                                "oneway": true,
+                                "boundValueMutator": function(activeDocument){
+                                    if(activeDocument !== null){return true;}
+                                    else{return false;}
+                                }
                             },
                             "action": "executeSave"
                         },
@@ -96,10 +100,10 @@ exports.MenuData = Montage.create( Montage, {
                             "enabled": {
                                 "value": false,
                                 "boundObj": "documentController",
-                                "boundProperty": "canSaveAll",
+                                "boundProperty": "activeDocument",
                                 "oneway": true,
-                                "boundValueMutator": function(canSaveAll){
-                                    if(canSaveAll === true){return true;}
+                                "boundValueMutator": function(activeDocument){
+                                    if(activeDocument !== null){return true;}
                                     else{return false;}
                                 }
                             },
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 2422f5e7..7a2d817a 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -55,8 +55,8 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: true,
             collapsed: true,
             open: true,
-            modulePath: "js/panels/Components/ComponentsPanelBase.reel",
-            moduleName: "ComponentsPanelBase"
+            modulePath: "js/panels/components-panel.reel",
+            moduleName: "ComponentsPanel"
         },
 //        {
 //            name: "Project/Assets",
diff --git a/js/document/text-document.js b/js/document/text-document.js
index 54a53999..2574b67c 100755
--- a/js/document/text-document.js
+++ b/js/document/text-document.js
@@ -164,11 +164,7 @@ var TextDocument = exports.TextDocument = Montage.create(Component, {
     needsSave: {
         get: function() { return this._needsSave; },
         set: function(value) {
-            var i=0, canSaveAll=false;
             this._needsSave = value;
-
-            this.application.ninja.documentController.canSave = value;//for save menu state update
-            this.application.ninja.documentController.canSaveAll = value;//for save menu state update..currently save all is tried to the current document only
         }
     },
 
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index b0ffe2d8..a06f45c6 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -1085,14 +1085,14 @@ exports.CoreIoApi = Montage.create(Component, {
     isValidUri:{
         value: function(uri){
             var isWindowsUri=false, isUnixUri=false,status=false;
-            if(uri !== ""){
+            if((uri !== null) && (uri !== "")){
                 uri = uri.replace(/^\s+|\s+$/g,"");  // strip any leading or trailing spaces
 
                 //for local machine folder uri
                 isWindowsUri = /^([a-zA-Z]:)([\\/][^<>:"/\\|?*]+)*[\\/]?$/gi.test(uri);
                 isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix
                 status = isWindowsUri || isUnixUri;
-                if(isWindowsUri && isUnixUri){status = false;}
+                if((uri === "") || (isWindowsUri && isUnixUri)){status = false;}
             }
             return status;
         }
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 2fcaa075..00df1c11 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
@@ -10,13 +10,21 @@
     <link rel="stylesheet" type="text/css" href="file-input-field.css">
     <script type="text/montage-serialization">
     {
+
+        "newFileDirectory": {
+            "prototype": "montage/ui/textfield.reel",
+            "properties": {
+                "element": {"#": "newFileDirectory"}
+            }
+        },
+
         "owner":{
             "module": "js/io/ui/file-picker/file-input-field.reel",
             "name": "FileInputField",
             "properties": {
                 "element": {"#": "fileInputField"},
                 "findDirectory": {"#": "findDirectory"},
-                "newFileDirectory": {"#": "newFileDirectory"}
+                "newFileDirectory": {"@": "newFileDirectory"}