diff options
author | Valerio Virgillito | 2012-04-26 17:09:12 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-26 17:09:12 -0700 |
commit | 7968f3a9cf56392c914d6bd44cc90145b6d807a3 (patch) | |
tree | b632e72735c9a071078121be07cf8cba2ebf29cc /js/panels/CSSPanel/CSSPanelBase.reel | |
parent | b03c3b087297f471840ab8595d5aa8bd0249a742 (diff) | |
parent | bcfb200482c26b2bfc0d6577b1eb0de7a19a6762 (diff) | |
download | ninja-7968f3a9cf56392c914d6bd44cc90145b6d807a3.tar.gz |
Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into serialization
Diffstat (limited to 'js/panels/CSSPanel/CSSPanelBase.reel')
-rwxr-xr-x | js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html index 98b2b61d..c62b2b23 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.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 | "resizer1": { | 13 | "resizer1": { |
14 | "module": "js/panels/Resizer", | 14 | "prototype": "js/panels/Resizer", |
15 | "name": "Resizer", | ||
16 | "properties": { | 15 | "properties": { |
17 | "element": {"#": "subPanelResizer"}, | 16 | "element": {"#": "subPanelResizer"}, |
18 | "panel": {"#": "nj-section-stylesheets"}, | 17 | "panel": {"#": "nj-section-stylesheets"}, |
@@ -21,16 +20,14 @@ | |||
21 | }, | 20 | }, |
22 | 21 | ||
23 | "ComputedStyleSubPanel1": { | 22 | "ComputedStyleSubPanel1": { |
24 | "module": "js/panels/CSSPanel/ComputedStyleSubPanel.reel", | 23 | "prototype": "js/panels/CSSPanel/ComputedStyleSubPanel.reel", |
25 | "name": "ComputedStyleSubPanel", | ||
26 | "properties": { | 24 | "properties": { |
27 | "element": {"#": "nj-computed-sub-panel"} | 25 | "element": {"#": "nj-computed-sub-panel"} |
28 | } | 26 | } |
29 | }, | 27 | }, |
30 | 28 | ||
31 | "owner": { | 29 | "owner": { |
32 | "module": "js/panels/CSSPanel/CSSPanelBase.reel", | 30 | "prototype": "js/panels/CSSPanel/CSSPanelBase.reel", |
33 | "name": "CSSPanelBase", | ||
34 | "properties": { | 31 | "properties": { |
35 | "element": {"#": "css_panel"}, | 32 | "element": {"#": "css_panel"}, |
36 | "computedStyleSubPanel": {"@": "ComputedStyleSubPanel1"} | 33 | "computedStyleSubPanel": {"@": "ComputedStyleSubPanel1"} |