aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui
diff options
context:
space:
mode:
Diffstat (limited to 'js/components/ui')
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.html17
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html11
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.html11
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html17
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html20
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html16
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.html17
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.html13
8 files changed, 52 insertions, 70 deletions
diff --git a/js/components/ui/color-chip.reel/color-chip.html b/js/components/ui/color-chip.reel/color-chip.html
index a365d775..647f7e79 100755
--- a/js/components/ui/color-chip.reel/color-chip.html
+++ b/js/components/ui/color-chip.reel/color-chip.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 "owner": { 13 "owner": {
14 "module": "js/components/ui/color-chip.reel", 14 "prototype": "js/components/ui/color-chip.reel",
15 "name": "ColorChip",
16 "properties": { 15 "properties": {
17 "element": {"#": "colorChipContainer"}, 16 "element": {"#": "colorChipContainer"},
18 "icon": {"#": "chipIcon"}, 17 "icon": {"#": "chipIcon"},
@@ -24,13 +23,11 @@
24</head> 23</head>
25<body> 24<body>
26 <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class --> 25 <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class -->
27 <div id="colorChipContainer" class="colortoolbar"> 26 <div data-montage-id="colorChipContainer" class="colortoolbar">
28 27 <div data-montage-id="chipIcon"></div>
29 <div id="chipIcon"></div> 28 <div class="chipContainer">
30 29 <button data-montage-id="chipButton"></button>
31 <div class="chipContainer"><button id="chipButton"></button></div> 30 </div>
32
33 </div> 31 </div>
34
35</body> 32</body>
36</html> \ No newline at end of file 33</html> \ No newline at end of file
diff --git a/js/components/ui/file-input.reel/file-input.html b/js/components/ui/file-input.reel/file-input.html
index 2a8546a5..735f970c 100755
--- a/js/components/ui/file-input.reel/file-input.html
+++ b/js/components/ui/file-input.reel/file-input.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 "owner": { 13 "owner": {
14 "module": "js/components/ui/file-input.reel", 14 "prototype": "js/components/ui/file-input.reel",
15 "name": "FileInput",
16 "properties": { 15 "properties": {
17 "element": {"#": "fileInput"}, 16 "element": {"#": "fileInput"},
18 "inputField": {"#": "fileInputControl"}, 17 "inputField": {"#": "fileInputControl"},
@@ -23,9 +22,9 @@
23 </script> 22 </script>
24</head> 23</head>
25<body> 24<body>
26 <div id="fileInput" class="fileInput"> 25 <div data-montage-id="fileInput" class="fileInput">
27 <input id="fileInputTextField" class="file-path nj-skinned" type="text" /> 26 <input data-montage-id="fileInputTextField" class="file-path nj-skinned" type="text" />
28 <input id="fileInputControl" class="browse-button" type="file" /> 27 <input data-montage-id="fileInputControl" class="browse-button" type="file" />
29 </div> 28 </div>
30</body> 29</body>
31</html> \ No newline at end of file 30</html> \ No newline at end of file
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..2ad5885a 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.html
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.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 "owner":{ 13 "owner":{
14 "module": "js/components/ui/icon-list-basic/iconsList.reel", 14 "prototype": "js/components/ui/icon-list-basic/iconsList.reel[Icon]",
15 "name":"Icon",
16 "properties":{ 15 "properties":{
17 "element": {"#" : "icon"}, 16 "element": {"#" : "icon"},
18 "iconImg": {"#": "iconImg"}, 17 "iconImg": {"#": "iconImg"},
@@ -23,9 +22,9 @@
23 </script> 22 </script>
24</head> 23</head>
25<body> 24<body>
26<div id="icon" class="icon"> 25<div data-montage-id="icon" class="icon">
27 <div><img id="iconImg" class="iconImg" src="" /></div> 26 <div><img data-montage-id="iconImg" class="iconImg" src="" /></div>
28 <div id="iconLabel" class="iconLabel"></div> 27 <div data-montage-id="iconLabel" class="iconLabel"></div>
29</div> 28</div>
30</body> 29</body>
31</html> \ No newline at end of file 30</html> \ No newline at end of file
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>
diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html
index 0050b8cb..ba85c089 100755
--- a/js/components/ui/input-group.reel/input-group.html
+++ b/js/components/ui/input-group.reel/input-group.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,16 +11,14 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "eventDelegator": { 13 "eventDelegator": {
14 "module": "montage/core/event/action-event-listener", 14 "prototype": "montage/core/event/action-event-listener",
15 "name": "ActionEventListener",
16 "properties": { 15 "properties": {
17 "handler": {"@": "owner"}, 16 "handler": {"@": "owner"},
18 "action": "forwardEvent" 17 "action": "forwardEvent"
19 } 18 }
20 }, 19 },
21 "propControl1": { 20 "propControl1": {
22 "module": "js/components/ui/property-control.reel", 21 "prototype": "js/components/ui/property-control.reel",
23 "name": "PropertyControl",
24 "properties": { 22 "properties": {
25 "element": {"#": "inputPair"} 23