aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/icon-list-basic/iconsList.reel
diff options
context:
space:
mode:
authorJon Reid2012-06-15 10:10:41 -0700
committerJon Reid2012-06-15 10:10:41 -0700
commit526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch)
tree65939e59615aaa10a7db77211e71616ad531bd0e /js/components/ui/icon-list-basic/iconsList.reel
parentb5b760ee82e5cc4da176914983a6002cbf86c11a (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/ui/icon-list-basic/iconsList.reel')
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html22
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.js4
2 files changed, 8 insertions, 18 deletions
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 05d3ea7d..9d4e0103 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -16,16 +16,8 @@
16 "element": {"#": "icon"} 16 "element": {"#": "icon"}
17 }, 17 },
18 "bindings": { 18 "bindings": {
19 "icondata": { 19 "icondata": {"<-": "@repetition1.objectAtCurrentIteration"},
20 "boundObject": {"@": "repetition1"}, 20 "selectedUri": {"<-": "@owner.selected"}
21 "boundObjectPropertyPath": "objectAtCurrentIteration",
22 "oneway": true
23 },
24 "selectedUri": {
25 "boundObject": {"@": "owner"},
26 "boundObjectPropertyPath": "selected",
27 "oneway": true
28 }
29 } 21 }
30 }, 22 },
31 23
@@ -35,20 +27,14 @@
35 "element": {"#": "iconsView"} 27 "element": {"#": "iconsView"}
36 }, 28 },
37 "bindings": { 29 "bindings": {
38 "objects": { 30 "objects": {"<-": "@owner.iconsViewDataObject"}
39 "boundObject": {"@": "owner"},
40 "boundObjectPropertyPath": "iconsViewDataObject",
41 "oneway": true
42 }
43 } 31 }
44
45 }, 32 },
46 33
47 "owner" : { 34 "owner" : {
48 "prototype" : "js/components/ui/icon-list-basic/iconsList.reel", 35 "prototype" : "js/components/ui/icon-list-basic/iconsList.reel",
49 "properties" : { 36 "properties" : {
50 "element" : {"#": "list"}, 37 "element" : {"#": "list"}
51 "components": [{"@": "repetition1"}]
52 } 38 }
53 } 39 }
54 } 40 }
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 d36aa40f..230c7f64 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
@@ -9,6 +9,10 @@ var Component = require("montage/ui/component").Component;
9 9
10var IconsList = exports.IconsList = Montage.create(Component, { 10var IconsList = exports.IconsList = Montage.create(Component, {
11 11
12 components: {
13 value: null
14 },
15
12 anItemData:{ 16 anItemData:{
13 enumerable:true, 17 enumerable:true,
14 value: null 18 value: null