aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-10 11:24:35 -0700
committerJose Antonio Marquez2012-04-10 11:24:35 -0700
commite663e336ee7e832b5059a82748061506b414cb04 (patch)
treea09d932319365067f437780e90aeab4ef19f74b4 /js/panels
parentc3022de5ba2e24737184dba7454233b165da0a20 (diff)
parentbd43ce383b050d03b0f92cc923c517febc66ca28 (diff)
downloadninja-e663e336ee7e832b5059a82748061506b414cb04.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Components/ComponentsPanel.js47
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css46
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html2
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js2
-rwxr-xr-xjs/panels/Splitter.js2
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.css (renamed from js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css)0
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.html (renamed from js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html)6
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js (renamed from js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js)18
-rwxr-xr-xjs/panels/properties.reel/properties.css5
-rwxr-xr-xjs/panels/properties.reel/properties.js24
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js29
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html28
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js14
13 files changed, 151 insertions, 72 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>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No 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
7var Montage = require("montage/core/core").Montage;
8
9var PanelBase = require("js/panels/PanelBase").PanelBase;
10var ComponentsPanelBase = require("js/panels/Components/ComponentsPanelBase.reel").ComponentsPanelBase;
11
12exports.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/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css
index 89233c64..2d339411 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.css
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.css
@@ -37,21 +37,53 @@
37.mp_property 37.mp_property
38{ 38{
39 height:40px; 39 height:40px;
40 position: relative;
40} 41}
41 42
42.mp_property > .prop-label 43.mp_property > .prop-label
43{ 44{
44 float: left; 45 position:relative;
45 /*width:86px;*/ 46 top:12px;
46 margin: 0px 8px 2px 5px; 47 float: left;
48 width: 100px;
47} 49}
48 50
49.mp_property > .prop-controller 51.mp_property > .prop-controller
50{ 52{
51 float: right; 53 position:relative;
52 clear: left; 54 top:12px;
53 width: auto; 55 left: 10px;
54 margin: 0px 0px 3px 0px; 56 float: left;
57}
58
59.mp_property .hottext,
60.mp_property .hottextInput
61{
62 width: 30px;
63}
64
65.mp_property .button
66{
67 width: 30px;
68 height: 20px;
69}
70
71.mp_property .inputRow
72{
73 top: 8px;
74 position: relative;
75}
76
77.mp_properties_list
78{
79 padding-bottom: 8px;
80}
81
82.mp_properties_list > .mp_property > .colortoolbar
83{
84 width: 27px !important;
85 height: 27px !important;
86 overflow:hidden !important;
55} 87}
56 88
57.mp_buttons { 89.mp_buttons {
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index 34f68554..ae0ee2c8 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -104,7 +104,7 @@
104 104
105 <hr /> 105 <hr />
106 106
107 <div id="mp_properties_list" class="mp_properties_list" style="-webkit-user-select: none;"> 107 <div id="mp_properties_list" class="mp_properties_list">
108 <div id="mp_property" class="mp_property"></div> 108 <div id="mp_property" class="mp_property"></div>
109 </div> 109 </div>
110 110
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index b44761bc..bbccf45d 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -237,7 +237,7 @@ exports.MaterialsPopup = Montage.create(Component, {
237 } 237 }
238 else 238 else
239 { 239 {
240 this.materialsData = this._dummyData1; 240 this.materialsData = this._dummyData1.slice(0);
241 } 241 }
242 242
243 this.needsDraw = true; 243 this.needsDraw = true;
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index ac45b4ba..98ebb36a 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -55,7 +55,7 @@ exports.Splitter = Montage.create(Component, {
55 }, 55 },
56 set: function(value) { 56 set: function(value) {
57 this._collapsed = value; 57 this._collapsed = value;
58 this.needsDraw = true; 58
59 this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value}); 59 this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value});
60 } 60 }
61 }, 61 },
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 e990551b..acbf702f 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
19var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component, { 19exports.ComponentsPanel = Montage.create(Component, {
20 20