aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui
diff options
context:
space:
mode:
authorJonathan Duran2012-03-06 17:08:55 -0800
committerJonathan Duran2012-03-06 17:08:55 -0800
commitbb6a1d82b2884b410f5859cc0c2cafd380acbe6a (patch)
tree6ec3e960a0c38ce8fd88c9bc17f5227d072ebe76 /js/io/ui
parent2815adfd7c19b3dff89dc3e1bda9af8d30dca8d6 (diff)
parent2e3943a8f751ec572066f168b58464c24b9f29e5 (diff)
downloadninja-bb6a1d82b2884b410f5859cc0c2cafd380acbe6a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/io/ui')
-rw-r--r--js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js6
1 files changed, 3 insertions, 3 deletions
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 428e7bab..3d99ae4d 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
@@ -861,12 +861,12 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
861 var dataStore = window.sessionStorage; 861 var dataStore = window.sessionStorage;
862 try { 862 try {
863 if(this.pickerModel.pickerMode === "write"){ 863 if(this.pickerModel.pickerMode === "write"){
864 dataStore.setItem('lastSavedFolderURI',escape(""+this.currentURI)); 864 dataStore.setItem('lastSavedFolderURI', encodeURI(""+this.currentURI));
865 } 865 }
866 else if(this.pickerModel.inFileMode === true){ 866 else if(this.pickerModel.inFileMode === true){
867 dataStore.setItem('lastOpenedFolderURI_fileSelection',escape(""+this.currentURI)); 867 dataStore.setItem('lastOpenedFolderURI_fileSelection',encodeURI(""+this.currentURI));
868 }else if(this.pickerModel.inFileMode === false){ 868 }else if(this.pickerModel.inFileMode === false){
869 dataStore.setItem('lastOpenedFolderURI_folderSelection',escape(""+this.currentURI)); 869 dataStore.setItem('lastOpenedFolderURI_folderSelection',encodeURI(""+this.currentURI));
870 } 870 }
871 } 871 }
872 catch(e){ 872 catch(e){