diff options
author | Jose Antonio Marquez | 2012-02-13 21:21:11 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-13 21:21:11 -0800 |
commit | 64f54ffcebf09c570972b91ea5fdb7fe7654e622 (patch) | |
tree | da23792067fa2b1e08dea90996f69a1a695b1bcc /js/components/ui/FilePicker | |
parent | f3865671aa75277f6eb35c417408dee9e665589a (diff) | |
parent | 50a40c4e21b9a4d53d6d1fb739d838c0319ab09b (diff) | |
download | ninja-64f54ffcebf09c570972b91ea5fdb7fe7654e622.tar.gz |
Merge branch 'refs/heads/AnanyaFileIO' into FileIO
Diffstat (limited to 'js/components/ui/FilePicker')
-rw-r--r-- | js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js index ff9c7073..6b0d92f7 100644 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js +++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js | |||
@@ -149,6 +149,12 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, { | |||
149 | leftNav.appendChild(newDiv); | 149 | leftNav.appendChild(newDiv); |
150 | if(dirObj.uri === this.pickerModel.currentRoot){ | 150 | if(dirObj.uri === this.pickerModel.currentRoot){ |
151 | newDiv.classList.add("highlighted"); | 151 | newDiv.classList.add("highlighted"); |
152 | //enable ok for logical drive selections, when in directory selection mode | ||
153 | if(this.pickerModel.inFileMode === false){ | ||
154 | this.okButton.removeAttribute("disabled"); | ||
155 | //put into selectedItems..currently single selection is supported | ||
156 | this.selectedItems = [dirObj.uri]; | ||
157 | } | ||
152 | } | 158 | } |
153 | 159 | ||
154 | newDiv.addEventListener("click", function(evt){that.handleTopLevelDirectoryClicks(evt, dirObj);}, false); | 160 | newDiv.addEventListener("click", function(evt){that.handleTopLevelDirectoryClicks(evt, dirObj);}, false); |
@@ -571,6 +577,13 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, { | |||
571 | if(!evt.target.classList.contains("highlighted")){ | 577 | if(!evt.target.classList.contains("highlighted")){ |
572 | evt.target.classList.add("highlighted"); | 578 | evt.target.classList.add("highlighted"); |
573 | } | 579 | } |
580 | |||
581 | //enable ok for logical drive selections, when in directory selection mode | ||
582 | if(this.pickerModel.inFileMode === false){ | ||
583 | this.okButton.removeAttribute("disabled"); | ||
584 | //put into selectedItems..currently single selection is supported | ||
585 | this.selectedItems = [dirObj.uri]; | ||
586 | } | ||
574 | } | 587 | } |
575 | }, | 588 | }, |
576 | 589 | ||