aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-09 13:36:41 -0800
committerJose Antonio Marquez2012-03-09 13:36:41 -0800
commit9a03f869ff4520431da3ac8c64b748b5fbb60339 (patch)
treedad948f012cbc7d65e0dccde273667a389ff1c6d /js/panels
parentb0b4a1ee6792d98f06cbd8ecf5291e66db8a4eef (diff)
parentb4eb2f6cc1208fe5c18aa1f02a85adda25075d81 (diff)
downloadninja-9a03f869ff4520431da3ac8c64b748b5fbb60339.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Color/colorpanel.js11
-rwxr-xr-xjs/panels/Color/colorpanelbase.reel/colorpanelbase.js13
-rwxr-xr-xjs/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js2
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js3
-rwxr-xr-xjs/panels/Panel.reel/Panel.html136
-rwxr-xr-xjs/panels/Panel.reel/Panel.js283
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html110
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.js236
-rwxr-xr-xjs/panels/PanelContainer/PanelContainer.reel/PanelContainer.html62
-rwxr-xr-xjs/panels/PanelContainer/PanelContainer.reel/PanelContainer.js390
-rwxr-xr-xjs/panels/Resizer.js10
-rw-r--r--js/panels/Timeline/Collapser.js65
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html131
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js192
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css73
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss2
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html19
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js722
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html136
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js192
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js10
-rw-r--r--js/panels/drag-drop-composer.js136
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.js4
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html1
-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
44 files changed, 1814 insertions, 1355 deletions
diff --git a/js/panels/Color/colorpanel.js b/js/panels/Color/colorpanel.js
index 4858be68..3a603e98 100755
--- a/js/panels/Color/colorpanel.js
+++ b/js/panels/Color/colorpanel.js
@@ -38,7 +38,7 @@ exports.ColorPanel = Montage.create(PanelBase, {
38 //////////////////////////////////////////////////////////// 38 ////////////////////////////////////////////////////////////
39 //////////////////////////////////////////////////////////// 39 ////////////////////////////////////////////////////////////
40 //TODO: Remove and add via toolbar draw loop 40 //TODO: Remove and add via toolbar draw loop
41 this.application.ninja.colorController.createToolbar(); 41
42 //////////////////////////////////////////////////////////// 42 ////////////////////////////////////////////////////////////
43 //////////////////////////////////////////////////////////// 43 ////////////////////////////////////////////////////////////
44 44
@@ -47,14 +47,7 @@ exports.ColorPanel = Montage.create(PanelBase, {
47 }, 47 },
48 //////////////////////////////////////////////////////////////////// 48 ////////////////////////////////////////////////////////////////////
49 //Applying default colors only on first draw 49 //Applying default colors only on first draw
50 handleFirstDraw: { 50
51 enumerable: true,
52 value: function (e) {
53 //
54 this.content.applyDefaultColors();
55 this.content.removeEventListener('firstDraw', this, false);
56 }
57 }
58 //////////////////////////////////////////////////////////////////// 51 ////////////////////////////////////////////////////////////////////
59 //////////////////////////////////////////////////////////////////// 52 ////////////////////////////////////////////////////////////////////
60}); \ No newline at end of file 53}); \ No newline at end of file
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
index ff738bbe..af62dd07 100755
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
@@ -117,10 +117,23 @@ exports.ColorPanelBase = Montage.create(Component, {
117 enumerable: false, 117 enumerable: false,
118 value: function() { 118 value: function() {
119 //TODO: Remove temporary hack, color history should be initilized 119 //TODO: Remove temporary hack, color history should be initilized
120 this.addEventListener('firstDraw', this, false);
121 this.application.ninja.colorController.colorView = this;
120 this.colorManager.colorHistory.fill = [{m: 'nocolor', c: {}, a: 1}]; 122 this.colorManager.colorHistory.fill = [{m: 'nocolor', c: {}, a: 1}];
121 this.colorManager.colorHistory.stroke = [{m: 'nocolor', c: {}, a: 1}]; 123 this.colorManager.colorHistory.stroke = [{m: 'nocolor', c: {}, a: 1}];
122 } 124 }
123 }, 125 },
126
127 handleFirstDraw: {
128 enumerable: true,
129 value: function (e) {
130 //
131 this.application.ninja.colorController.createToolbar();
132 this.applyDefaultColors();
133 this.removeEventListener('firstDraw', this, false);
134 }
135 },
136
124 //////////////////////////////////////////////////////////////////// 137 ////////////////////////////////////////////////////////////////////
125 //Assigning values and binding 138 //Assigning values and binding
126 willDraw: { 139 willDraw: {
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index b4eec771..b6bee37d 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -118,7 +118,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
118 didCreate: { 118 didCreate: {
119 value: function() { 119 value: function() {
120 // Setup the drop delegate 120 // Setup the drop delegate
121 this.application.ninja.dragDropMediator.dropDelegate = this; 121// this.application.ninja.dragDropMediator.dropDelegate = this;
122 // Loop through the component and load the JSON data for them 122 // Loop through the component and load the JSON data for them
123 this._loadComponents(); 123 this._loadComponents();
124 } 124 }
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index 508b8130..c57bb2d7 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -7,6 +7,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
7var Montage = require("montage/core/core").Montage, 7var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component;
9var Button = require("js/components/button.reel").Button; 9var Button = require("js/components/button.reel").Button;
10var MaterialsModel = require("js/models/materials-model").MaterialsModel;
10 11
11//////////////////////////////////////////////////////////////////////// 12////////////////////////////////////////////////////////////////////////
12//Exporting as MaterialsPopup 13//Exporting as MaterialsPopup
@@ -223,7 +224,7 @@ exports.MaterialsPopup = Montage.create(Component, {
223 (materialID === "RadialGradientMaterial") 224 (materialID === "RadialGradientMaterial")
224 ) 225 )
225 { 226 {
226 var material = MaterialsLibrary.getMaterial( materialID ); 227 var material = MaterialsModel.getMaterial( materialID );
227 if (material) 228 if (material)
228 { 229 {
229 this._material = material; 230 this._material = material;
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index 7556952c..43b87940 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -8,22 +8,86 @@
8<head> 8<head>
9 <script type="text/montage-serialization"> 9 <script type="text/montage-serialization">
10 { 10 {
11 "resizer1": { 11 "Resizer": {
12 "module": "js/panels/Resizer", 12 "module": "js/panels/resize-composer",
13 "name": "Resizer", 13 "name": "ResizeComposer",
14 "properties": { 14 "properties": {
15 "element": {"#": "resizeBar"}, 15 "element": {"#": "resizeBar"},
16 "panel": {"#": "panel"}, 16 "component": {"@": "owner"}
17 "isVertical": true,
18 "willSave": false
19 }, 17 },
20 "bindings": { 18 "listeners": [
21 "ownerId": { 19 {
22 "boundObject": {"@": "owner"}, 20 "type": "resizeStart",
23 "boundObjectPropertyPath": "panelBase.panelName", 21 "listener": {"@": "owner"}
24 "oneway": true 22 },
23 {
24 "type": "resizeMove",
25 "listener": {"@": "owner"}
26 },
27 {