aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-01 21:49:44 -0800
committerNivesh Rajbhandari2012-03-01 21:49:44 -0800
commit50058746779f714ed9b0287f49e56c9f0d35593e (patch)
tree8bfcb041824bfb492765ff814bf8576847a11436 /js
parent500426dea0ca95a6b45be8ea8d132cfdb4d2c940 (diff)
parentff0a956f33df034e9a009cfcb8999e469456a4b5 (diff)
downloadninja-50058746779f714ed9b0287f49e56c9f0d35593e.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js')
-rwxr-xr-xjs/controllers/elements/stage-controller.js2
-rw-r--r--js/data/panels-data.js141
-rwxr-xr-xjs/ninja.reel/ninja.html4
-rwxr-xr-xjs/panels/Color/colorpanel.js11
-rwxr-xr-xjs/panels/Color/colorpanelbase.reel/colorpanelbase.js13
-rwxr-xr-xjs/panels/Panel.reel/Panel.html116
-rwxr-xr-xjs/panels/Panel.reel/Panel.js279
-rwxr-xr-xjs/panels/PanelContainer/PanelContainer.reel/PanelContainer.html116
-rwxr-xr-xjs/panels/PanelContainer/PanelContainer.reel/PanelContainer.js432
-rwxr-xr-xjs/panels/Resizer.js10
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js2
-rw-r--r--js/panels/drag-drop-composer.js136
-rwxr-xr-xjs/panels/properties.reel/properties.css (renamed from js/panels/properties/content.reel/content.css)2
-rwxr-xr-xjs/panels/properties.reel/properties.html (renamed from js/panels/properties/content.reel/content.html)37
-rwxr-xr-xjs/panels/properties.reel/properties.js (renamed from js/panels/properties/content.reel/content.js)35
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.html (renamed from js/panels/properties/section.reel/section.html)2
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.js (renamed from js/panels/properties/section.reel/section.js)0
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html (renamed from js/panels/properties/sections/custom-rows/color-select.reel/color-select.html)2
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.js (renamed from js/panels/properties/sections/custom-rows/color-select.reel/color-select.js)0
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html (renamed from js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.html)2
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js (renamed from js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.js)0
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html (renamed from js/panels/properties/sections/custom-rows/single-row.reel/single-row.html)2
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js (renamed from js/panels/properties/sections/custom-rows/single-row.reel/single-row.js)0
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.html (renamed from js/panels/properties/sections/custom.reel/custom.html)2
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js (renamed from js/panels/properties/sections/custom.reel/custom.js)6
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.css (renamed from js/panels/properties/sections/position-and-size.reel/position-and-size.css)0
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.html (renamed from js/panels/properties/sections/position-and-size.reel/position-and-size.html)2
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.js (renamed from js/panels/properties/sections/position-and-size.reel/position-and-size.js)0
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html (renamed from js/panels/properties/sections/three-d-view.reel/three-d-view.html)2
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js (renamed from js/panels/properties/sections/three-d-view.reel/three-d-view.js)0
-rwxr-xr-xjs/panels/properties/properties-panel.js15
-rw-r--r--js/panels/resize-composer.js121
32 files changed, 915 insertions, 577 deletions
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index abad3736..34bb1fb5 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -104,9 +104,11 @@ exports.StageController = Montage.create(ElementController, {
104 el.elementModel.viewPort.style.setProperty(p, value); 104 el.elementModel.viewPort.style.setProperty(p, value);
105 break; 105 break;
106 case "width": 106 case "width":
107 this.application.ninja.currentDocument.iframe.width = parseInt(value) + 1400;
107 el.elementModel.stageDimension.style.setProperty(p, value); 108 el.elementModel.stageDimension.style.setProperty(p, value);
108 break; 109 break;
109 case "height": 110 case "height":
111 this.application.ninja.currentDocument.iframe.height = parseInt(value) + 400;
110 el.elementModel.stageDimension.style.setProperty(p, value); 112 el.elementModel.stageDimension.style.setProperty(p, value);
111 break; 113 break;
112 default: 114 default:
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
new file mode 100644
index 00000000..aa5057a2
--- /dev/null
+++ b/js/data/panels-data.js
@@ -0,0 +1,141 @@
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
9exports.PanelsData = Montage.create(Montage, {
10
11 panels: {
12 value: [
13 {
14 name: "Color",
15 height: 200,
16 minHeight: 200,
17 maxHeight: null,
18 flexible: false,
19 scrollable: false,
20 collapsed: false,
21 open: true,
22 contentComponent: null,
23 modulePath: "js/panels/Color/colorpanelbase.reel",
24 moduleName: "ColorPanelBase"
25 },
26 {
27 name: "Properties",
28 minHeight: 200,
29 height: 200,
30 maxHeight: null,
31 flexible: true,
32 scrollable: true,
33 collapsed: false,
34 open: true,
35 contentComponent: null,
36 modulePath: "js/panels/properties.reel",
37 moduleName: "Properties"
38 },
39 {
40 name: "Materials",
41 minHeight: 100,
42 height: 100,
43 maxHeight: null,
44 flexible: true,
45 collapsed: true,
46 scrollable: true,
47 open: true,
48 contentComponent: null,
49 modulePath: "js/panels/Materials/materials-library-panel.reel",
50 moduleName: "MaterialsLibraryPanel"
51 },
52 {
53 name: "Components",
54 minHeight: 100,
55 height: 200,
56 maxHeight: null,
57 flexible: true,
58 scrollable: true,
59 collapsed: true,
60 open: true,
61 contentComponent: null,
62 modulePath: "js/panels/Components/ComponentsPanelBase.reel",
63 moduleName: "ComponentsPanelBase"
64 },
65// {
66// name: "Project/Assets",
67// minHeight: 250,
68// height: 250,
69// maxHeight: null,
70// flexible: true,
71// scrollable: true,
72// collapsed: false,
73// open: true,
74// content: null,
75// modulePath: "js/panels/Project/projectpanelbase.reel",
76// moduleName: "ProjectPanelBase"
77// },
78 {
79 name: "CSS",
80 minHeight: 195,
81 height: 195,
82 maxHeight: null,
83 flexible: true,
84 scrollable: true,
85 collapsed: true,
86 open: true,
87 contentComponent: null,
88 modulePath: "js/panels/CSSPanel/CSSPanelBase.reel",
89 moduleName: "CSSPanelBase"
90 },
91 {
92 name: "Presets",
93 minHeight: 100,
94 height: 100,
95 maxHeight: null,
96 flexible: true,
97 collapsed: true,
98 scrollable: true,
99 open: true,
100 contentComponent: null,
101 modulePath: "js/panels/presets/content.reel",
102 moduleName: "content"
103 }
104 ]
105 }
106
107
108 /*
109 _panelOrder: {
110 value: ["Properties","Color","Components","Project/Assets", "CSS","Materials"]
111 },
112
113 panelOrder: {
114 get: function() {
115 return this._panelOrder;
116 },
117 set: function(val) {
118 this._panelOrder = val;
119 }
120 }
121
122
123 panels: {
124 get: function() {
125 var filtered = this._panels.filter(function(item) {
126 return item.open;
127 });
128
129 filtered.sort(function(a,b) {
130 a.name
131 });
132
133 return filtered;
134 },
135 set : function() {
136
137 }
138 }
139 */
140
141}); \ No newline at end of file
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index a20a6090..112f844e 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -389,8 +389,8 @@
389 389
390 <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section> 390 <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
391 391
392 <section id="rightPanelContainer" class="panelContainer"> 392 <section id="rightPanelContainer" class="rightPanelContainer panelContainer">
393 <section id="rightPanelContent"> 393 <section id="rightPanelContent" class="rightPanelContent">
394 </section> 394 </section>
395 </section> 395 </section>
396 </section> 396 </section>
diff --git a/js/panels/Color/colorpanel.js b/js/panels/Color/colorpanel.js
index 4858be68..3a603e98 100755
--- a/