Merge branch 'pentool' into brushtool

3 files changed, 40 insertions, 53 deletions

diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
index fae8f9c7..0e1e09a4 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
@@ -11,46 +11,30 @@ var newFileWorkflowControllerModule = require("js/io/ui/new-file-dialog/new-file
 var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
 
     templateHeight:{
-        enumerable: true,
         value:"25 px"
     },
 
     templateWidth:{
-        enumerable: true,
         value:"25 px"
     },
 
-    willDraw: {
-        enumerable: false,
-        value: function() {}
-       },
-
-    draw: {
-        enumerable: false,
-        value: function() {}
-    },
-
     didDraw: {
-        enumerable: false,
         value: function() {
-            var that=this;
-
             this.fileInputField.selectDirectory = true;
 
-            this.newFileName.addEventListener("keyup", function(evt){that.handleNewFileNameOnkeyup(evt);}, false);
-    }
-
+            this.newFileName.addEventListener("keyup", this, false);
+        }
     },
 
-    handleNewFileNameOnkeyup:{
-          value:function(evt){
-              if(this.newFileName.value !== ""){
-                  var newFileNameSetEvent = document.createEvent("Events");
-                  newFileNameSetEvent.initEvent("newFileNameSet", false, false);
-                  newFileNameSetEvent.newFileName = this.newFileName.value;
-                  this.eventManager.dispatchEvent(newFileNameSetEvent);
-              }
-          }
+    handleKeyup:{
+        value:function(evt){
+            if(this.newFileName.value !== "") {
+                var newFileNameSetEvent = document.createEvent("Events");
+                newFileNameSetEvent.initEvent("newFileNameSet", false, false);
+                newFileNameSetEvent.newFileName = this.newFileName.value;
+                this.eventManager.dispatchEvent(newFileNameSetEvent);
+            }
+        }
     }
 
 });
\ No newline at end of file
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index 11b322fe..aaf39005 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -47,14 +47,36 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
         enumerable:false,
         value:"0 px"
     },
-    willDraw: {
-        enumerable: false,
-        value: function() {}
-    },
-    draw: {
-        enumerable: false,
-        value: function() {}
+
+    // Populating the directory input field with the default save location or the last stored location.
+    prepareForDraw: {
+        value: function() {
+            var defaultSaveDirectory;
+
+            // Using session storage location
+            if(window.sessionStorage) {
+                var storedFolder = window.sessionStorage.getItem("lastOpenedFolderURI_folderSelection");
+                if(storedFolder)  defaultSaveDirectory = decodeURI(window.sessionStorage.getItem("lastOpenedFolderURI_folderSelection"));
+            }
+
+            // Use default if none found in session storage
+            if(!defaultSaveDirectory) {
+                var driveData = this.application.ninja.coreIoApi.getDirectoryContents({uri:"", recursive:false, returnType:"all"});
+                if(driveData.success){
+                    var topLevelDirectories = (JSON.parse(driveData.content)).children;
+                    defaultSaveDirectory = topLevelDirectories[0].uri;
+                } else {
+                    console.log("** Error ** Cannot get directory listing");
+                    defaultSaveDirectory = "";
+                }
+            }
+
+            // Set the input field to the correct directory
+            this.newFileLocation.fileInputField.newFileDirectory.value = defaultSaveDirectory;
+            this.newFileDirectory = defaultSaveDirectory;
+        }
     },
+
     didDraw: {
         enumerable: false,
         value: function() {
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 7b7f4572..901b61c7 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
@@ -19,17 +19,10 @@ var NewFileWorkflowController =  exports.NewFileWorkflowController = Montage.cre
         writable:false,
         enumerable:true,
         value:function(){
-            var that = this;
-
-            this.eventManager.addEventListener("saveAs", function(evt){
-                var data = evt._event.data || {};//data will contain the current file name, directory location and callback
-                that.showSaveAsDialog(data);
-            }, false);
         }
     },
 
     model:{
-        writable: true,
         enumerable:true,
         value: null
     },
@@ -56,19 +49,8 @@ var NewFileWorkflowController =  exports.NewFileWorkflowController = Montage.cre
                 this.model.defaultProjectType = lastSelectedProjectType;
             }
 
-            //render modal dialog
-            var newFileNavContent = document.createElement("div");
-            newFileNavContent.id = "newFileDialog";
-
-            //elements needs to be on DOM to be drawn
-            document.getElementById('modalContainer').appendChild(newFileNavContent);
-
             var newFileOptionsNav = newFileOptionsNavigatorModule.NewFileOptionsNavigator.create();
             newFileOptionsNav.newFileModel = this.model;
-            newFileOptionsNav.element = newFileNavContent;
-
-            //remove after rendering and add in modal dialog
-            document.getElementById('modalContainer').removeChild(newFileNavContent);
 
             var popup = Popup.create();
             popup.content = newFileOptionsNav;
@@ -99,7 +81,6 @@ var NewFileWorkflowController =  exports.NewFileWorkflowController = Montage.cre
             saveAsDialog.fileName = fileName;
             saveAsDialog.folderUri = folderUri;
             saveAsDialog.callback = data.callback;
-            saveAsDialog.callbackScope = data.callbackScope;
             saveAsDialog.element = saveAsDialogContainer;
 
             //remove after rendering and add in modal dialog