From a8f5dcd8e85af6600f2e2b6a4536f05fd0c9916d Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 21 Feb 2012 22:37:36 -0800
Subject: Adding the default folder by default when opening a new file dialog.

Adding the default folder name in the new file dialog input field. Also some more cleanup.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 .../new-file-location.reel/new-file-location.js    | 57 +++++++++++++---------
 1 file changed, 33 insertions(+), 24 deletions(-)

(limited to 'js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js')

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..ee2847ca 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,55 @@ 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() {}
-       },
+    prepareForDraw: {
+        value: function() {
+            // Populate the file input field by using the session storage or the default user folder
+            var defaultSaveDirectory;
+
+            if(window.sessionStorage) {
+                var storedFolder = window.sessionStorage.getItem("lastOpenedFolderURI_folderSelection");
+                if(storedFolder)  defaultSaveDirectory = decodeURI(window.sessionStorage.getItem("lastOpenedFolderURI_folderSelection"));
+            }
+
+            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 = "";
+                }
+            }
 
-    draw: {
-       	enumerable: false,
-       	value: function() {}
+            this.fileInputField.newFileDirectory.value = defaultSaveDirectory;
+        }
     },
 
     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
-- 
cgit v1.2.3


From 69983b800d0179fcccd5b61b64ed22c02e22b93a Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 21 Feb 2012 22:43:45 -0800
Subject: Adding some comments.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js')

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 ee2847ca..849c665c 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
@@ -18,16 +18,18 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
         value:"25 px"
     },
 
+    // Populating the directory input field with the default save location or the last stored location.
     prepareForDraw: {
         value: function() {
-            // Populate the file input field by using the session storage or the default user folder
             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){
@@ -39,6 +41,7 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
                 }
             }
 
+            // Set the input field to the correct directory
             this.fileInputField.newFileDirectory.value = defaultSaveDirectory;
         }
     },
-- 
cgit v1.2.3