diff options
author | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
commit | c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch) | |
tree | 74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/panels/Panel.reel/Panel.html | |
parent | 28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/Panel.reel/Panel.html')
-rwxr-xr-x | js/panels/Panel.reel/Panel.html | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html index 43b87940..a0e1bbe9 100755 --- a/js/panels/Panel.reel/Panel.html +++ b/js/panels/Panel.reel/Panel.html | |||
@@ -9,8 +9,7 @@ | |||
9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
10 | { | 10 | { |
11 | "Resizer": { | 11 | "Resizer": { |
12 | "module": "js/panels/resize-composer", | 12 | "prototype": "js/panels/resize-composer", |
13 | "name": "ResizeComposer", | ||
14 | "properties": { | 13 | "properties": { |
15 | "element": {"#": "resizeBar"}, | 14 | "element": {"#": "resizeBar"}, |
16 | "component": {"@": "owner"} | 15 | "component": {"@": "owner"} |
@@ -32,8 +31,7 @@ | |||
32 | }, | 31 | }, |
33 | 32 | ||
34 | "DragDrop": { | 33 | "DragDrop": { |
35 | "module": "js/panels/drag-drop-composer", | 34 | "prototype": "js/panels/drag-drop-composer", |
36 | "name": "DragDropComposer", | ||
37 | "properties": { | 35 | "properties": { |
38 | "element": {"@": "panelTitle"}, | 36 | "element": {"@": "panelTitle"}, |
39 | "component": {"@": "owner"} | 37 | "component": {"@": "owner"} |
@@ -59,8 +57,7 @@ | |||
59 | }, | 57 | }, |
60 | 58 | ||
61 | "btnCollapse": { | 59 | "btnCollapse": { |
62 | "module": "montage/ui/toggle-button.reel", | 60 | "prototype": "montage/ui/toggle-button.reel", |
63 | "name": "ToggleButton", | ||
64 | "properties": { | 61 | "properties": { |
65 | "element": {"#": "btnCollapse"}, | 62 | "element": {"#": "btnCollapse"}, |
66 | "pressedClass": "hide", | 63 | "pressedClass": "hide", |
@@ -75,8 +72,7 @@ | |||
75 | }, | 72 | }, |
76 | 73 | ||
77 | "btnClose": { | 74 | "btnClose": { |
78 | "module": "montage/ui/button.reel", | 75 | "prototype": "montage/ui/button.reel", |
79 | "name": "Button", | ||
80 | "properties": { | 76 | "properties": { |
81 | "element": {"#": "btnClose"}, | 77 | "element": {"#": "btnClose"}, |
82 | "pressedClass": "hide", | 78 | "pressedClass": "hide", |
@@ -91,16 +87,14 @@ | |||
91 | }, | 87 | }, |
92 | 88 | ||
93 | "slot1": { | 89 | "slot1": { |
94 | "module": "montage/ui/slot.reel", | 90 | "prototype": "montage/ui/slot.reel", |
95 | "name": "Slot", | ||
96 | "properties": { | 91 | "properties": { |
97 | "element": {"#": "panelObject"} | 92 | "element": {"#": "panelObject"} |
98 | } | 93 | } |
99 | }, | 94 | }, |
100 | 95 | ||
101 | "panelTitle": { | 96 | "panelTitle": { |
102 | "module": "montage/ui/dynamic-text.reel", | 97 | "prototype": "montage/ui/dynamic-text.reel", |
103 | "name": "DynamicText", | ||
104 | "properties": { | 98 | "properties": { |
105 | "element": {"#": "panelTitle"} | 99 | "element": {"#": "panelTitle"} |
106 | }, | 100 | }, |
@@ -114,8 +108,7 @@ | |||
114 | }, | 108 | }, |
115 | 109 | ||
116 | "disabledCondition": { | 110 | "disabledCondition": { |
117 | "module": "montage/ui/condition.reel", | 111 | "prototype": "montage/ui/condition.reel", |
118 | "name": "Condition", | ||
119 | "properties": { | 112 | "properties": { |
120 | "element": {"#": "disabledCondition"} | 113 | "element": {"#": "disabledCondition"} |
121 | }, | 114 | }, |
@@ -129,8 +122,7 @@ | |||
129 | }, | 122 | }, |
130 | 123 | ||
131 | "owner": { | 124 | "owner": { |
132 | "module": "js/panels/Panel.reel", | 125 | "prototype": "js/panels/Panel.reel", |
133 | "name": "Panel", | ||
134 | "properties": { | 126 | "properties": { |
135 | "element": {"#": "panel"}, | 127 | "element": {"#": "panel"}, |
136 | "resizer": {"@": "Resizer"}, | 128 | "resizer": {"@": "Resizer"}, |