aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-13 21:21:11 -0800
committerJose Antonio Marquez2012-02-13 21:21:11 -0800
commit64f54ffcebf09c570972b91ea5fdb7fe7654e622 (patch)
treeda23792067fa2b1e08dea90996f69a1a695b1bcc /js/components/ui
parentf3865671aa75277f6eb35c417408dee9e665589a (diff)
parent50a40c4e21b9a4d53d6d1fb739d838c0319ab09b (diff)
downloadninja-64f54ffcebf09c570972b91ea5fdb7fe7654e622.tar.gz
Merge branch 'refs/heads/AnanyaFileIO' into FileIO
Diffstat (limited to 'js/components/ui')
-rw-r--r--js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js13
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.js14
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html5
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.js8
4 files changed, 39 insertions, 1 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
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js
index d934e7f1..b0279207 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -22,6 +22,13 @@ var Icon = exports.Icon = Montage.create(Component, {
22 this.needsDraw = true; 22 this.needsDraw = true;
23 } 23 }
24 }, 24 },
25
26 selectedUri:{
27 writable:true,
28 enumerable:true,
29 value:null
30 },
31
25 metadata:{ 32 metadata:{
26 enumerable:true, 33 enumerable:true,
27 writable:true, 34 writable:true,
@@ -83,6 +90,13 @@ var Icon = exports.Icon = Montage.create(Component, {
83 if(this.icondata.creationDate){this.metadata = this.metadata + "<br />" + "Creation date: "+ this.formatTimestamp(this.icondata.creationDate);} 90 if(this.icondata.creationDate){this.metadata = this.metadata + "<br />" + "Creation date: "+ this.formatTimestamp(this.icondata.creationDate);}
84 if(this.icondata.modifiedDate){this.metadata = this.metadata + "<br />" + "Modified date: "+ this.formatTimestamp(this.icondata.modifiedDate);} 91 if(this.icondata.modifiedDate){this.metadata = this.metadata + "<br />" + "Modified date: "+ this.formatTimestamp(this.icondata.modifiedDate);}
85 92
93 //show default selection
94 if(this.icondata.uri === this.selectedUri){
95 var selectedItemEvent = document.createEvent("Events");
96 selectedItemEvent.initEvent("selectedItem", false, false);
97 selectedItemEvent.uri = this.icondata.uri;
98 this.element.dispatchEvent(selectedItemEvent);
99 }
86 } 100 }
87 }, 101 },
88 102
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
index 50a1d61d..0bb79873 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -21,6 +21,11 @@
21 "boundObject": {"@": "repetition1"}, 21 "boundObject": {"@": "repetition1"},
22 "boundObjectPropertyPath": "objectAtCurrentIteration", 22 "boundObjectPropertyPath": "objectAtCurrentIteration",
23 "oneway": true 23 "oneway": true
24 },
25 "selectedUri": {
26 "boundObject": {"@": "owner"},
27 "boundObjectPropertyPath": "selected",
28 "oneway": true
24 } 29 }
25 } 30 }
26 }, 31 },
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
index 56eb57c3..d36aa40f 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
@@ -15,11 +15,17 @@ var IconsList = exports.IconsList = Montage.create(Component, {
15 }, 15 },
16 16
17 iconsViewDataObject:{ 17 iconsViewDataObject:{
18 writable:true, 18 writable:true,
19 enumerable:true, 19 enumerable:true,
20 value:[] 20 value:[]
21 }, 21 },
22 22
23 selected:{
24 writable:true,
25 enumerable:true,
26 value:null
27 },
28
23 willDraw: { 29 willDraw: {
24 enumerable: false, 30 enumerable: false,
25 value: function() { 31 value: function() {