aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/icon-list-basic
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-15 17:04:39 -0800
committerValerio Virgillito2012-02-15 17:04:39 -0800
commitfe71cb9aa1700199c0089166ad54fc56eb760644 (patch)
treeb0c7c24b1f45a079e1c09312ca716e3d35aecad4 /js/components/ui/icon-list-basic
parent747616980cad14f0b65fbcc7f497ed9680a39d29 (diff)
parentd366c0bd1af6471511217ed574083e15059519b5 (diff)
downloadninja-fe71cb9aa1700199c0089166ad54fc56eb760644.tar.gz
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/components/ui/icon-list-basic')
-rw-r--r--js/components/ui/icon-list-basic/icon.reel/icon.css9
-rwxr-xr-x[-rw-r--r--]js/components/ui/icon-list-basic/icon.reel/icon.html0
-rwxr-xr-x[-rw-r--r--]js/components/ui/icon-list-basic/icon.reel/icon.js14
-rwxr-xr-x[-rw-r--r--]js/components/ui/icon-list-basic/iconsList.reel/iconsList.css0
-rwxr-xr-x[-rw-r--r--]js/components/ui/icon-list-basic/iconsList.reel/iconsList.html5
-rwxr-xr-x[-rw-r--r--]js/components/ui/icon-list-basic/iconsList.reel/iconsList.js8
6 files changed, 32 insertions, 4 deletions
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css
index ca591aff..4d71f6b8 100644
--- a/js/components/ui/icon-list-basic/icon.reel/icon.css
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.css
@@ -17,15 +17,18 @@
17} 17}
18 18
19.icon .selected{ 19.icon .selected{
20 /*background-color: #d1d1d1;*/
21 background-color: #919191; 20 background-color: #919191;
22} 21}
23 22
23/*highlight on hover*/
24.icon:hover{
25 background-color: #919191;
26}
27/*end- test*/
28
24.icon .iconImg{ 29.icon .iconImg{
25 width:35px; 30 width:35px;
26 height:35px; 31 height:35px;
27 /*border: 1px solid #000000;
28 box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.8);*/
29 margin-left: 20px; 32 margin-left: 20px;
30 margin-top: 10px; 33 margin-top: 10px;
31} 34}
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.html b/js/components/ui/icon-list-basic/icon.reel/icon.html
index fc197e8c..fc197e8c 100644..100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.html
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.html
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 100644..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.css b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css
index b4d4cffd..b4d4cffd 100644..100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css
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 100644..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 100644..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() {