aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/FilePicker
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-16 11:18:21 -0800
committerJose Antonio Marquez2012-02-16 11:18:21 -0800
commit729e32ee70b0dd30a3b498ed7d1636b1b5b56a43 (patch)
treef5a5a19ee9df4fee691484fa1762dc202adea9ad /js/components/ui/FilePicker
parent075252ad893452df446566f01d0b26eeab08be3d (diff)
downloadninja-729e32ee70b0dd30a3b498ed7d1636b1b5b56a43.tar.gz
Squashed commit of the following:
commit 302ae3c1812086d976eb67c9cf693c43205f3904 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Thu Feb 16 11:13:05 2012 -0800 hide the rulers when no document is open Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 2e766c9eaa98fa20f311b3eb2f892a1a240e90cf Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Thu Feb 16 06:43:33 2012 -0800 file picker: Enable ok if user double clicks folder and enter it. Validate path if user enter it manually in addressbar. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 4937b39fb0cf542f57cdadc7d1e2ed9798f7ef87 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 16:09:14 2012 -0800 fixes to document tabbing Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 56d2a8d11a73cd04c7f1bc20d1ded52b9c1242f2 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:54:38 2012 -0800 Revert "Revert "Creating NinjaTemplate to HTML function"" This reverts commit 2e308be9bec5e06d81b2905b65005a232f0a190d. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit e2b97c951a9a5a0c4ff831d44fdd82177cbd82ad Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:54:14 2012 -0800 Revert "Revert "Reverting text/html document classes and setting up MVC folder structure"" This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit aead95ce4b2571356701229567bfde73d54bed93 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:53:55 2012 -0800 Revert "Revert "Cleaning up"" This reverts commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit a8d1a2e1f4f4ab7b9298bfbd1b49731785c79c3a Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:52:56 2012 -0800 Revert "Revert "Merging TextDocument into BaseDocument"" This reverts commit b8782f2e3dd106accbb0160a98e6b498f26752ea. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit e864dc319805e259b7ae39a9d4d96fac552a1f87 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:52:38 2012 -0800 Revert "merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build" This reverts commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:06:42 2012 -0800 merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit b8782f2e3dd106accbb0160a98e6b498f26752ea Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:01:59 2012 -0800 Revert "Merging TextDocument into BaseDocument" This reverts commit 93c8f327d662a7693d1d6ca050a0efd15ebc18ed. Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 09:58:37 2012 -0800 Revert "Cleaning up" This reverts commit a7952c5a16e2cae3fd1a459b03b9f16bba1004da. Conflicts: js/controllers/document-controller.js js/io/document/text-document.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 9048cd50bf5e0a418d1d95498bb593961f72db36 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 09:51:12 2012 -0800 Revert "Reverting text/html document classes and setting up MVC folder structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 2e308be9bec5e06d81b2905b65005a232f0a190d Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 09:50:20 2012 -0800 Revert "Creating NinjaTemplate to HTML function" This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/ui/FilePicker')
-rw-r--r--js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js32
1 files changed, 31 insertions, 1 deletions
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
index 6b0d92f7..411386f9 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
@@ -203,6 +203,13 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
203 this.pickerModel.storeHistory(this.pickerModel.currentRoot);//populate history 203 this.pickerModel.storeHistory(this.pickerModel.currentRoot);//populate history
204 204
205 this.updateMetadata(this.currentURI); 205 this.updateMetadata(this.currentURI);
206
207 //for directory selection, selected url is the folder entered
208 if(!this.pickerModel.inFileMode ){
209 this.okButton.removeAttribute("disabled");
210 //put into selectedItems..currently single selection is supported
211 this.selectedItems = [this.pickerModel.currentRoot];
212 }
206 } 213 }
207 214
208 this.element.addEventListener("openFolder", function(evt){that.handlePickerNavOpenFolder(evt);}, false);//add icon double click event listener to reload iconList with new set of data 215 this.element.addEventListener("openFolder", function(evt){that.handlePickerNavOpenFolder(evt);}, false);//add icon double click event listener to reload iconList with new set of data
@@ -211,6 +218,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
211 this.element.addEventListener("updateMetadata", function(evt){that.handlePickerNavUpdateMetadata(evt);}, false);//show metadata on click of icon 218 this.element.addEventListener("updateMetadata", function(evt){that.handlePickerNavUpdateMetadata(evt);}, false);//show metadata on click of icon
212 //this.addressGo.addEventListener("click", this, false); 219 //this.addressGo.addEventListener("click", this, false);
213 this.addressBarUri.addEventListener("keydown", this, false); 220 this.addressBarUri.addEventListener("keydown", this, false);
221 this.addressBarUri.addEventListener("keyup", this, false);
214 this.refreshButton.addEventListener("click", this, false);//refresh - gets from file system directly 222 this.refreshButton.addEventListener("click", this, false);//refresh - gets from file system directly
215 this.backArrow.addEventListener("click", this, false); 223 this.backArrow.addEventListener("click", this, false);
216 this.forwardArrow.addEventListener("click", this, false); 224 this.forwardArrow.addEventListener("click", this, false);
@@ -608,6 +616,13 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
608 this.backArrow.classList.remove("disable"); 616 this.backArrow.classList.remove("disable");
609 } 617 }
610 618
619 //for directory selection, selected url is the folder entered
620 if(!this.pickerModel.inFileMode ){
621 this.okButton.removeAttribute("disabled");
622 //put into selectedItems..currently single selection is supported
623 this.selectedItems = [evt.folderUri];
624 }
625
611 } 626 }
612 }, 627 },
613 628
@@ -720,6 +735,21 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
720 } 735 }
721 }, 736 },
722 737
738 handleAddressBarUriKeyup:{
739 value: function(evt){
740 //disable ok if user enters an invalid uri
741 if(!this.application.ninja.coreIoApi.isValidUri(this.addressBarUri.value)){
742 //disable OK
743 if(!this.okButton.hasAttribute("disabled")){
744 this.okButton.setAttribute("disabled", "true");
745 }
746 }else{
747 this.okButton.removeAttribute("disabled");
748 this.selectedItems = [this.addressBarUri.value];
749 }
750 }
751 },
752
723 handleRefreshButtonClick:{ 753 handleRefreshButtonClick:{
724 value:function(evt){ 754 value:function(evt){
725 var uri = this.addressBarUri.value; 755 var uri = this.addressBarUri.value;
@@ -794,7 +824,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
794 824
795 handleOkButtonAction : { 825 handleOkButtonAction : {
796 value: function(evt){ 826 value: function(evt){
797 console.log("$$$ File Picker : selected "+ this.selectedItems.toString()); 827 //console.log("$$$ File Picker : selected "+ this.selectedItems.toString());
798 var success = true; 828 var success = true;
799 if(!!this.pickerModel.callback && (this.selectedItems.length > 0)){//call the callback if it is available 829 if(!!this.pickerModel.callback && (this.selectedItems.length > 0)){//call the callback if it is available
800 try{ 830 try{