aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-27 14:21:35 -0700
committerValerio Virgillito2012-04-27 14:21:35 -0700
commitb08cc404d32dd1d4dbc2139ce8f06d7d88b681a8 (patch)
treeae45391131c7c5203ae8e0d3470d106d835c8c6b /js/components/ui
parent314709dd189807bfc762aa150bb1b29d2ccdf25b (diff)
parent6c1aa27b7753bc9007514859b42160fae265740d (diff)
downloadninja-b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8.tar.gz
Merge branch 'refs/heads/serialization'
Diffstat (limited to 'js/components/ui')
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.html5
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html5
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.html5
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html11
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html14
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html8
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.html11
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.html5
8 files changed, 24 insertions, 40 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..8f10092d 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"},
diff --git a/js/components/ui/file-input.reel/file-input.html b/js/components/ui/file-input.reel/file-input.html
index 2a8546a5..0c3c465e 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"},
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..f2406566 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"},
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..35260527 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"}]
diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html
index 0050b8cb..4cdb4e69 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 "element": {"#": "inputPair"}
26 }, 24 },
@@ -44,8 +42,7 @@
44 ] 42 ]
45 }, 43 },
46 "propList": { 44 "propList": {
47 "module": "montage/ui/repetition.reel", 45 "prototype": "montage/ui/repetition.reel",
48 "name": "Repetition",
49 "properties": { 46 "properties": {
50 "element": {"#": "inputList"} 47 "element": {"#": "inputList"}
51 }, 48 },
@@ -58,8 +55,7 @@
58 } 55 }
59 }, 56 },
60 "owner": { 57 "owner": {
61 "module": "js/components/ui/input-group.reel", 58 "prototype": "js/components/ui/input-group.reel",
62 "name": "InputGroup",
63 "properties": { 59 "properties": {
64 "element": {"#": "inputRow"}, 60 "element": {"#": "inputRow"},
65 "controlsList": {"@": "propList"} 61 "controlsList": {"@": "propList"}
diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html
index 43e8e67f..d85cb0e3 100755
--- a/js/components/ui/property-control.reel/property-control.html
+++ b/js/components/ui/property-control.reel/property-control.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,15 +11,13 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "substitution1": { 13 "substitution1": {
14 "module": "montage/ui/substitution.reel", 14 "prototype": "montage/ui/substitution.reel",
15 "name": "Substitution",
16 "properties": { 15 "properties": {
17 "element": {"#": "propController"} 16 "element": {"#": "propController"}
18 } 17 }
19 }, 18 },
20 "owner": { 19 "owner": {
21 "module": "js/components/ui/property-control.reel", 20 "prototype": "js/components/ui/property-control.reel",
22 "name": "PropertyControl",
23