aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorAnanya Sen2012-02-23 13:52:32 -0800
committerAnanya Sen2012-02-23 13:52:32 -0800
commitec3d07c2fea4e79c68606234074f43d694982e5b (patch)
treedc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js/io
parent7283884c39df537694b21419a3ea9e3ca7793b4b (diff)
parent287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff)
downloadninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/io')
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js28
-rw-r--r--js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js36
2 files changed, 29 insertions, 35 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 849c665c..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
@@ -18,34 +18,6 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
18 value:"25 px" 18 value:"25 px"
19 }, 19 },
20 20
21 // Populating the directory input field with the default save location or the last stored location.
22 prepareForDraw: {
23 value: function() {
24 var defaultSaveDirectory;
25
26 // Using session storage location
27 if(window.sessionStorage) {
28 var storedFolder = window.sessionStorage.getItem("lastOpenedFolderURI_folderSelection");
29 if(storedFolder) defaultSaveDirectory = decodeURI(window.sessionStorage.getItem("lastOpenedFolderURI_folderSelection"));
30 }
31
32 // Use default if none found in session storage
33 if(!defaultSaveDirectory) {
34 var driveData = this.application.ninja.coreIoApi.getDirectoryContents({uri:"", recursive:false, returnType:"all"});
35 if(driveData.success){
36 var topLevelDirectories = (JSON.parse(driveData.content)).children;
37 defaultSaveDirectory = topLevelDirectories[0].uri;
38 } else {
39 console.log("** Error ** Cannot get directory listing");
40 defaultSaveDirectory = "";
41 }
42 }
43
44 // Set the input field to the correct directory
45 this.fileInputField.newFileDirectory.value = defaultSaveDirectory;
46 }
47 },
48
49 didDraw: { 21 didDraw: {
50 value: function() { 22 value: function() {
51 this.fileInputField.selectDirectory = true; 23 this.fileInputField.selectDirectory = true;
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
47 enumerable:false, 47 enumerable:false,
48 value:"0 px" 48 value:"0 px"
49 }, 49 },
50 willDraw: { 50
51 enumerable: false, 51 // Populating the directory input field with the default save location or the last stored location.
52 value: function() {} 52 prepareForDraw: {
53 }, 53 value: function() {
54 draw: { 54 var defaultSaveDirectory;
55 enumerable: false, 55
56 value: function() {} 56 // Using session storage location
57 if(window.sessionStorage) {
58 var storedFolder = window.sessionStorage.getItem("lastOpenedFolderURI_folderSelection");
59 if(storedFolder) defaultSaveDirectory = decodeURI(window.sessionStorage.getItem("lastOpenedFolderURI_folderSelection"));
60 }
61
62 // Use default if none found in session storage
63 if(!defaultSaveDirectory) {
64 var driveData = this.application.ninja.coreIoApi.getDirectoryContents({uri:"", recursive:false, returnType:"all"});
65 if(driveData.success){
66 var topLevelDirectories = (JSON.parse(driveData.content)).children;
67 defaultSaveDirectory = topLevelDirectories[0].uri;
68 } else {
69 console.log("** Error ** Cannot get directory listing");
70 defaultSaveDirectory = "";
71 }
72 }
73
74 // Set the input field to the correct directory
75 this.newFileLocation.fileInputField.newFileDirectory.value = defaultSaveDirectory;
76 this.newFileDirectory = defaultSaveDirectory;
77 }
57 }, 78 },
79
58 didDraw: { 80 didDraw: {
59 enumerable: false, 81 enumerable: false,
60 value: function() { 82 value: function() {