diff options
author | Jose Antonio Marquez Russo | 2012-03-08 16:22:31 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-08 16:22:31 -0800 |
commit | b752f7fced5dfb5d16b6f32fadb48bc7e7fdbc28 (patch) | |
tree | 8a25f983cf5fc9eb8aab34a11fe8c90e8604bed3 /js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js | |
parent | 4bdb951f2dab6d132ed28ab17888cc819ed811ee (diff) | |
parent | 50e5491f44e577c66dfefb5d22815ef20ea5c1b1 (diff) | |
download | ninja-b752f7fced5dfb5d16b6f32fadb48bc7e7fdbc28.tar.gz |
Merge pull request #30 from ananyasen/FileIO-ananya
FileIO branch pull request
Diffstat (limited to 'js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js')
-rw-r--r-- | js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js | 7 |
1 files changed, 6 insertions, 1 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 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, { | |||
346 | var arr = []; | 346 | var arr = []; |
347 | var temp = new String(uri); | 347 | var temp = new String(uri); |
348 | while(temp.indexOf("/") != -1){ | 348 | while(temp.indexOf("/") != -1){ |
349 | |||
350 | if(""+temp === this.pickerModel.currentLogicalDrive){//stop at the logical drive | ||
351 | break; | ||
352 | } | ||
353 | |||
349 | temp = temp.substring(0, temp.lastIndexOf("/")); | 354 | temp = temp.substring(0, temp.lastIndexOf("/")); |
350 | 355 | ||
351 | //populate dropdown irrespective of validity | 356 | //populate dropdown irrespective of validity |
@@ -560,7 +565,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, { | |||
560 | enumerable: true, | 565 | enumerable: true, |
561 | writable: false, | 566 | writable: false, |
562 | value : function(evt, dirObj){ | 567 | value : function(evt, dirObj){ |
563 | this.currentURI = dirObj.uri; | 568 | this.currentURI = this.pickerModel.currentLogicalDrive = dirObj.uri; |
564 | 569 | ||
565 | var status = this.pickerViews()[this.selectedPickerView].call(this, dirObj.uri);//dynamically calls the update function of the current picker view | 570 | var status = this.pickerViews()[this.selectedPickerView].call(this, dirObj.uri);//dynamically calls the update function of the current picker view |
566 | 571 | ||