diff options
author | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
commit | b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8 (patch) | |
tree | ae45391131c7c5203ae8e0d3470d106d835c8c6b /js/components/layout/tools-properties.reel | |
parent | 314709dd189807bfc762aa150bb1b29d2ccdf25b (diff) | |
parent | 6c1aa27b7753bc9007514859b42160fae265740d (diff) | |
download | ninja-b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8.tar.gz |
Merge branch 'refs/heads/serialization'
Diffstat (limited to 'js/components/layout/tools-properties.reel')
-rwxr-xr-x | js/components/layout/tools-properties.reel/tools-properties.html | 56 |
1 files changed, 19 insertions, 37 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index 3c7a92fa..8dd0f713 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.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/> |
@@ -13,50 +13,43 @@ | |||
13 | { | 13 | { |
14 | 14 | ||
15 | "selectionProperties1": { | 15 | "selectionProperties1": { |
16 | "module": "js/components/tools-properties/selection-properties.reel", | 16 | "prototype": "js/components/tools-properties/selection-properties.reel", |
17 | "name": "SelectionProperties", | ||
18 | "properties": { | 17 | "properties": { |
19 | "element": {"#": "selectionProperties"} | 18 | "element": {"#": "selectionProperties"} |
20 | } | 19 | } |
21 | }, | 20 | }, |
22 | "subSelectionProperties1": { | 21 | "subSelectionProperties1": { |
23 | "module": "js/components/tools-properties/subselection-properties.reel", | 22 | "prototype": "js/components/tools-properties/subselection-properties.reel[SubSelectionProperties]", |
24 | "name": "SubSelectionProperties", | ||
25 | "properties": { | 23 | "properties": { |
26 | "element": {"#": "subSelectionProperties"} | 24 | "element": {"#": "subSelectionProperties"} |
27 | } | 25 | } |
28 | }, | 26 | }, |
29 | "object3DProperties1": { | 27 | "object3DProperties1": { |
30 | "module": "js/components/tools-properties/object3d-properties.reel", | 28 | "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]", |
31 | "name": "Object3DProperties", | ||
32 | "properties": { | 29 | "properties": { |
33 | "element": {"#": "object3DProperties"} | 30 | "element": {"#": "object3DProperties"} |
34 | } | 31 | } |
35 | }, | 32 | }, |
36 | "tagProperties1": { | 33 | "tagProperties1": { |
37 | "module": "js/components/tools-properties/tag-properties.reel", | 34 | "prototype": "js/components/tools-properties/tag-properties.reel", |
38 | "name": "TagProperties", | ||
39 | "properties": { | 35 | "properties": { |
40 | "element": {"#": "tagProperties"} | 36 | "element": {"#": "tagProperties"} |
41 | } | 37 | } |
42 | }, | 38 | }, |
43 | "penProperties1": { | 39 | "penProperties1": { |
44 | "module": "js/components/tools-properties/pen-properties.reel", | 40 | "prototype": "js/components/tools-properties/pen-properties.reel", |
45 | "name": "PenProperties", | ||
46 | "properties": { | 41 | "properties": { |
47 | "element": {"#": "penProperties"} | 42 | "element": {"#": "penProperties"} |
48 | } | 43 | } |
49 | }, | 44 | }, |
50 | "textProperties1": { | 45 | "textProperties1": { |
51 | "module": "js/components/tools-properties/text-properties.reel", | 46 | "prototype": "js/components/tools-properties/text-properties.reel", |
52 | "name": "TextProperties", | ||
53 | "properties": { | 47 | "properties": { |
54 | "element": {"#": "textProperties"} | 48 | "element": {"#": "textProperties"} |
55 | } | 49 | } |
56 | }, | 50 | }, |
57 | "shapeProperties1": { | 51 | "shapeProperties1": { |
58 | "module": "js/components/tools-properties/shape-properties.reel", | 52 | "prototype": "js/components/tools-properties/shape-properties.reel", |
59 | "name": "ShapeProperties", | ||
60 | "properties": { | 53 | "properties": { |
61 | "element": {"#": "shapeProperties"} | 54 | "element": {"#": "shapeProperties"} |
62 | }, | 55 | }, |
@@ -74,72 +67,62 @@ | |||
74 | } | 67 | } |
75 | }, | 68 | }, |
76 | "pencilProperties1": { | 69 | "pencilProperties1": { |
77 | "module": "js/components/tools-properties/pencil-properties.reel", | 70 | "prototype": "js/components/tools-properties/pencil-properties.reel", |
78 | "name": "PencilProperties", | ||
79 | "properties": { | 71 | "properties": { |
80 | "element": {"#": "pencilProperties"} | 72 | "element": {"#": "pencilProperties"} |
81 | } | 73 | } |
82 | }, | 74 | }, |
83 | "brushProperties1": { | 75 | "brushProperties1": { |
84 | "module": "js/components/tools-properties/brush-properties.reel", | 76 | "prototype": "js/components/tools-properties/brush-properties.reel", |
85 | "name": "BrushProperties", | ||
86 | "properties": { | 77 | "properties": { |
87 | "element": {"#": "brushProperties"} | 78 | "element": {"#": "brushProperties"} |
88 | } | 79 | } |
89 | }, | 80 | }, |
90 | "fillProperties1": { | 81 | "fillProperties1": { |
91 | "module": "js/components/tools-properties/fill-properties.reel", | 82 | "prototype": "js/components/tools-properties/fill-properties.reel", |
92 | "name": "FillProperties", | ||
93 | "properties": { | 83 | "properties": { |
94 | "element": {"#": "fillProperties"} | 84 | "element": {"#": "fillProperties"} |
95 | } | 85 | } |
96 | }, | 86 | }, |
97 | "inkbottleProperties1": { | 87 | "inkbottleProperties1": { |
98 | "module": "js/components/tools-properties/ink-bottle-properties.reel", | 88 | "prototype": "js/components/tools-properties/ink-bottle-properties.reel", |
99 | "name": "InkBottleProperties", | ||
100 | "properties": { | 89 | "properties": { |
101 | "element": {"#": "inkbottleProperties"} | 90 | "element": {"#": "inkbottleProperties"} |
102 | } | 91 | } |
103 | }, | 92 | }, |
104 | "eyedropperProperties1": { | 93 | "eyedropperProperties1": { |
105 | "module": "js/components/tools-properties/eyedropper-properties.reel", | 94 | "prototype": "js/components/tools-properties/eyedropper-properties.reel", |
106 | "name": "EyedropperProperties", | ||
107 | "properties": { | 95 | "properties": { |
108 | "element": {"#": "eyedropperProperties"} | 96 | "element": {"#": "eyedropperProperties"} |
109 | } | 97 | } |
110 | }, | 98 | }, |
111 | "eraserProperties1": { | 99 | "eraserProperties1": { |
112 | "module": "js/components/tools-properties/eraser-properties.reel", | 100 | "prototype": "js/components/tools-properties/eraser-properties.reel", |
113 | "name": "EraserProperties", | ||
114 | "properties": { | 101 | "properties": { |
115 | "element": {"#": "eraserProperties"} | 102 | "element": {"#": "eraserProperties"} |
116 | } | 103 | } |
117 | }, | 104 | }, |
118 | "rotateStageProperties1": { | 105 | "rotateStageProperties1": { |
119 | "module": "js/components/tools-properties/rotate-stage-properties.reel", | 106 | "prototype": "js/components/tools-properties/rotate-stage-properties.reel", |
120 | "name": "RotateStageProperties", | ||
121 | "properties": { | 107 | "properties": { |
122 | "element": {"#": "rotateStageProperties"} | 108 | "element": {"#": "rotateStageProperties"} |
123 | } | 109 | } |
124 | }, | 110 | }, |
125 | "panProperties1": { | 111 | "panProperties1": { |
126 | "module": "js/components/tools-properties/pan-properties.reel", | 112 | "prototype": "js/components/tools-properties/pan-properties.reel", |
127 | "name": "PanProperties", | ||
128 | "properties": { | 113 | "properties": { |
129 | "element": {"#": "panProperties"} | 114 | "element": {"#": "panProperties"} |
130 | } | 115 | } |
131 | }, | 116 | }, |
132 | "zoomProperties1": { | 117 | "zoomProperties1": { |
133 | "module": "js/components/tools-properties/zoom-properties.reel", | 118 | "prototype": "js/components/tools-properties/zoom-properties.reel", |
134 | "name": "ZoomProperties", | ||
135 | "properties": { | 119 | "properties": { |
136 | "element": {"#": "zoomProperties"} | 120 | "element": {"#": "zoomProperties"} |
137 | } | 121 | } |
138 | }, | 122 | }, |
139 | 123 | ||
140 | "disable": { | 124 | "disable": { |
141 | "module": "montage/ui/condition.reel", | 125 | "prototype": "montage/ui/condition.reel", |
142 | "name": "Condition", | ||
143 | "properties": { | 126 | "properties": { |
144 | "element": {"#": "disabledCondition"} | 127 | "element": {"#": "disabledCondition"} |
145 | }, | 128 | }, |
@@ -153,8 +136,7 @@ | |||
153 | }, | 136 | }, |
154 | 137 | ||
155 | "owner": { | 138 | "owner": { |
156 | "module": "js/components/layout/tools-properties.reel", |