diff options
author | Valerio Virgillito | 2012-03-26 15:55:38 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-26 15:55:38 -0700 |
commit | 6b9bfb63f6bc22ef1095dc11816826bb83a2c408 (patch) | |
tree | 0c5ff0912bc28dc3e06b9f223363413a641cf34d /js/panels | |
parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
download | ninja-6b9bfb63f6bc22ef1095dc11816826bb83a2c408.tar.gz |
Cleanup of the components panel
Renamed to naming convention. Deleted un-used file.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/Components/ComponentsPanel.js | 47 | ||||
-rwxr-xr-x | js/panels/components-panel.reel/components-panel.css (renamed from js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css) | 0 | ||||
-rwxr-xr-x | js/panels/components-panel.reel/components-panel.html (renamed from js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html) | 6 | ||||
-rwxr-xr-x | js/panels/components-panel.reel/components-panel.js (renamed from js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js) | 2 |
4 files changed, 4 insertions, 51 deletions
diff --git a/js/panels/Components/ComponentsPanel.js b/js/panels/Components/ComponentsPanel.js deleted file mode 100755 index df1d74bb..00000000 --- a/js/panels/Components/ComponentsPanel.js +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | var Montage = require("montage/core/core").Montage; | ||
8 | |||
9 | var PanelBase = require("js/panels/PanelBase").PanelBase; | ||
10 | var ComponentsPanelBase = require("js/panels/Components/ComponentsPanelBase.reel").ComponentsPanelBase; | ||
11 | |||
12 | exports.ComponentsPanel = Montage.create(PanelBase, { | ||
13 | id : {value : "componentsPanel", writable:true, enumerable:true, configurable:true}, | ||
14 | panelName : {value : "Components", writable:true, enumerable:true, configurable:true}, | ||
15 | panelHeaderID : {value : "componentsPanelHeader", writable:true, enumerable:true, configurable:true}, | ||
16 | disclosureIconID : {value : "componentsPanelDisclosureIcon", writable:true, enumerable:true, configurable:true}, | ||
17 | closeButtonID : {value : "componentsPanelCloseButton", writable:true, enumerable:true, configurable:true}, | ||
18 | panelContentID : {value : "componentsPanelContent", writable:true, enumerable:true, configurable:true}, | ||
19 | |||
20 | init : { | ||
21 | value : function() | ||
22 | { | ||
23 | this.contentHeight = 200; | ||
24 | this.minHeight = 100; | ||
25 | this.defaultHeight = 200; | ||
26 | |||
27 | /* OLD WAY -- Removing the temporary div | ||
28 | // TODO: Remove this comment once this is tested. | ||
29 | var panelContainer = document.createElement("div"); | ||
30 | this._componentsPanelBase = ComponentsPanelBase.create(); | ||
31 | this._componentsPanelBase.element = panelContainer; | ||
32 | |||
33 | this.content = this._componentsPanelBase; | ||
34 | this._componentsPanelBase.needsDraw = true; | ||
35 | */ | ||
36 | |||
37 | this.content = ComponentsPanelBase.create(); | ||
38 | } | ||
39 | }, | ||
40 | |||
41 | _componentsPanelBase:{ | ||
42 | enumerable: true, | ||
43 | value: null, | ||
44 | writable:true | ||
45 | } | ||
46 | |||
47 | }); \ No newline at end of file | ||
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css b/js/panels/components-panel.reel/components-panel.css index ac250c83..ac250c83 100755 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css +++ b/js/panels/components-panel.reel/components-panel.css | |||
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html b/js/panels/components-panel.reel/components-panel.html index 6d7c8a2c..f598a1ee 100755 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html +++ b/js/panels/components-panel.reel/components-panel.html | |||
@@ -7,13 +7,13 @@ | |||
7 | <html lang="en"> | 7 | <html lang="en"> |
8 | <head> | 8 | <head> |
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
10 | <link rel="stylesheet" type="text/css" href="ComponentsPanelBase.css"> | 10 | <link rel="stylesheet" type="text/css" href="components-panel.css"> |
11 | 11 | ||
12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
13 | { | 13 | { |
14 | "owner": { | 14 | "owner": { |
15 | "module": "js/panels/Components/ComponentsPanelBase.reel", | 15 | "module": "js/panels/components-panel.reel", |
16 | "name": "ComponentsPanelBase", | 16 | "name": "ComponentsPanel", |
17 | "properties": { | 17 | "properties": { |
18 | "element": {"#": "components_panel"}, | 18 | "element": {"#": "components_panel"}, |
19 | "controller": {"@": "componentsTree"} | 19 | "controller": {"@": "componentsTree"} |
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/components-panel.reel/components-panel.js index 3505393c..9252b7b8 100755 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js +++ b/js/panels/components-panel.reel/components-panel.js | |||
@@ -16,7 +16,7 @@ String.prototype.capitalizeFirstChar = function() { | |||
16 | }; | 16 | }; |
17 | 17 | ||
18 | 18 | ||
19 | var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component, { | 19 | exports.ComponentsPanel = Montage.create(Component, { |
20 | 20 | ||
21 | components: { | 21 | components: { |
22 | value: { | 22 | value: { |