aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/ui/icon-list-basic/iconsList.reel/iconsList.html')
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html17
1 files changed, 7 insertions, 10 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 0bb79873..05d3ea7d 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "pickerIcon": { 13 "pickerIcon": {
14 "module" : "js/components/ui/icon-list-basic/icon.reel", 14 "prototype" : "js/components/ui/icon-list-basic/icon.reel",
15 "name": "Icon",
16 "properties": { 15 "properties": {
17 "element": {"#": "icon"} 16 "element": {"#": "icon"}
18 }, 17 },
@@ -31,8 +30,7 @@
31 }, 30 },
32 31
33 "repetition1" : { 32 "repetition1" : {
34 "module": "montage/ui/repetition.reel", 33 "prototype": "montage/ui/repetition.reel",
35 "name": "Repetition",
36 "properties": { 34 "properties": {
37 "element": {"#": "iconsView"} 35 "element": {"#": "iconsView"}
38 }, 36 },
@@ -47,8 +45,7 @@
47 }, 45 },
48 46
49 "owner" : { 47 "owner" : {
50 "module" : "js/components/ui/icon-list-basic/iconsList.reel", 48 "prototype" : "js/components/ui/icon-list-basic/iconsList.reel",
51 "name" : "IconsList",
52 "properties" : { 49 "properties" : {
53 "element" : {"#": "list"}, 50 "element" : {"#": "list"},
54 "components": [{"@": "repetition1"}] 51 "components": [{"@": "repetition1"}]
@@ -58,9 +55,9 @@
58 </script> 55 </script>
59</head> 56</head>
60<body> 57<body>
61<div id="list" class="list"> 58<div data-montage-id="list" class="list">
62 <div id="iconsView"> 59 <div data-montage-id="iconsView">
63 <div id="icon"></div> 60 <div data-montage-id="icon"></div>
64 </div> 61 </div>
65</div> 62</div>
66</body> 63</body>