diff options
| author | Eric Guzman | 2012-04-30 13:48:43 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-30 13:48:43 -0700 |
| commit | 23d8efd4ed9e8fd43f516595009679fb44c8096d (patch) | |
| tree | 7d5be06e6417102702a49ece24fca82528aced7a /js/panels/CSSPanel | |
| parent | ae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/CSSPanel')
| -rwxr-xr-x | js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | 11 | ||||
| -rwxr-xr-x | js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | 5 |
2 files changed, 6 insertions, 10 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"} |
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html index c30d2fb4..53c243a8 100755 --- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html +++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.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/> |
| @@ -12,8 +12,7 @@ | |||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | "owner": { | 14 | "owner": { |
| 15 | "module": "js/panels/CSSPanel/ComputedStyleSubPanel.reel", | 15 | "prototype": "js/panels/CSSPanel/ComputedStyleSubPanel.reel", |
| 16 | "name": "ComputedStyleSubPanel", | ||
| 17 | "properties": { | 16 | "properties": { |
| 18 | "element": {"#": "nj-css-panel-computed"}, | 17 | "element": {"#": "nj-css-panel-computed"}, |
| 19 | "groupDropDown": {"#": "nj-css-group-select"}, | 18 | "groupDropDown": {"#": "nj-css-group-select"}, |