Merge branch 'refs/heads/master' into AddAnimationsLibrary

Conflicts:
	js/panels/presets/default-transition-presets.js

5 files changed, 15 insertions, 15 deletions

diff --git a/js/io/ui/file-picker/file-picker-controller.js b/js/io/ui/file-picker/file-picker-controller.js
index 3b19de83..105dc223 100755
--- a/js/io/ui/file-picker/file-picker-controller.js
+++ b/js/io/ui/file-picker/file-picker-controller.js
@@ -104,7 +104,7 @@ var FilePickerController = exports.FilePickerController = Montage.create(require
             aModel.topLevelDirectories = topLevelDirectories;
 
             if(!!topLevelDirectories && !!topLevelDirectories[0]){
-                aModel.currentRoot = topLevelDirectories[0].uri;
+                aModel.currentRoot = aModel.currentLogicalDrive = topLevelDirectories[0].uri;
             }
 
             //populate the last opened folder first, if none then populate default root
diff --git a/js/io/ui/file-picker/file-picker-model.js b/js/io/ui/file-picker/file-picker-model.js
index 09c3ae9c..c92ec586 100755
--- a/js/io/ui/file-picker/file-picker-model.js
+++ b/js/io/ui/file-picker/file-picker-model.js
@@ -73,6 +73,12 @@ exports.FilePickerModel = (require("montage/core/core").Montage).create(require(
             value:""
         },
 
+        currentLogicalDrive:{
+            writable:true,
+            enumerable:true,
+            value:""
+        },
+
         callback:{
             writable:true,
             enumerable:true,
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
index 3d99ae4d..7a9d90b4 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
@@ -346,6 +346,11 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             var arr = [];
             var temp = new String(uri);
             while(temp.indexOf("/") != -1){
+
+                if(""+temp === this.pickerModel.currentLogicalDrive){//stop at the logical drive
+                    break;
+                }
+
                 temp = temp.substring(0, temp.lastIndexOf("/"));
 
                 //populate dropdown irrespective of validity
@@ -560,7 +565,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
         enumerable: true,
         writable: false,
         value : function(evt, dirObj){
-                    this.currentURI = dirObj.uri;
+                    this.currentURI = this.pickerModel.currentLogicalDrive = dirObj.uri;
 
                     var status = this.pickerViews()[this.selectedPickerView].call(this, dirObj.uri);//dynamically calls the update function of the current picker view
 
diff --git a/js/io/ui/new-file-dialog/new-file-workflow-controller.js b/js/io/ui/new-file-dialog/new-file-workflow-controller.js
index 901b61c7..d065ca35 100755
--- a/js/io/ui/new-file-dialog/new-file-workflow-controller.js
+++ b/js/io/ui/new-file-dialog/new-file-workflow-controller.js
@@ -70,21 +70,10 @@ var NewFileWorkflowController =  exports.NewFileWorkflowController = Montage.cre
             var fileName = data.fileName || "filename.txt";
             var folderUri = data.folderUri || "/Documents";
 
-            //render modal dialog
-            var saveAsDialogContainer = document.createElement("div");
-            saveAsDialogContainer.id = "saveAsDialog";
-
-            //elements needs to be on DOM to be drawn
-            document.getElementById('modalContainer').appendChild(saveAsDialogContainer);
-
             var saveAsDialog = saveAsModule.SaveAsDialog.create();
             saveAsDialog.fileName = fileName;
             saveAsDialog.folderUri = folderUri;
             saveAsDialog.callback = data.callback;
-            saveAsDialog.element = saveAsDialogContainer;
-
-            //remove after rendering and add in modal dialog
-            document.getElementById('modalContainer').removeChild(saveAsDialogContainer);
 
             var popup = Popup.create();
             popup.content = saveAsDialog;
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.js b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
index 0a322b99..c60a92f9 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.js
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
@@ -111,7 +111,7 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
     handleOkButtonAction:{
         value: function(evt){
             var filename = this.fileName,
-                newFileDirectory = this.newFileDirectory,
+                newFileDirectory = this.folderUri,
                 success = true;
             if(this.isValidFileName(this.fileName) && this.isValidUri(this.folderUri) && !this.checkFileExists(this.fileName, this.folderUri)){
                 try{
@@ -128,7 +128,7 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
                     }
                 }catch(e){
                         success = false;
-                        console.log("[ERROR] Failed to save:  "+ this.fileName + " at "+ this.newFileDirectory);
+                        console.log("[ERROR] Failed to save:  "+ this.fileName + " at "+ newFileDirectory);
                         console.log(e.stack);
                 }