diff options
author | Valerio Virgillito | 2012-03-13 11:15:34 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-13 11:15:34 -0700 |
commit | f6b958360d82854bdaf51848e7fd715d1f633179 (patch) | |
tree | 80f6c08bb730089bdd3f26310df8d2363f9ba863 /js/io/ui/file-picker/picker-navigator.reel | |
parent | c24f58c10231c30d3a8a4c9fb9a4f395dd746180 (diff) | |
parent | 4d7b86f55c504ee4e8c2460cf6b60cb9a2cf18f0 (diff) | |
download | ninja-f6b958360d82854bdaf51848e7fd715d1f633179.tar.gz |
Merge pull request #105 from joseeight/FileIO-Build-Candidate
File I/O adding webGL/canvas data functionality
Diffstat (limited to 'js/io/ui/file-picker/picker-navigator.reel')
-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 | ||