aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Splitter.js11
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js2
-rwxr-xr-xjs/panels/properties.reel/properties.js29
3 files changed, 37 insertions, 5 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 3215e928..a396ea28 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -66,6 +66,7 @@ exports.Splitter = Montage.create(Component, {
66 var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id")); 66 var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id"));
67 if(storedData && this.element.getAttribute("data-montage-id") !== null) { 67 if(storedData && this.element.getAttribute("data-montage-id") !== null) {
68 this._collapsed = storedData.value; 68 this._collapsed = storedData.value;
69
69 } else { 70 } else {
70 this._collapsed = false; 71 this._collapsed = false;
71 } 72 }
@@ -77,13 +78,11 @@ exports.Splitter = Montage.create(Component, {
77 draw: { 78 draw: {
78 value: function() { 79 value: function() {
79 if(this.collapsed) { 80 if(this.collapsed) {
80
81 if(this.panel.element) this.panel.element.classList.add("collapsed"); 81 if(this.panel.element) this.panel.element.classList.add("collapsed");
82 else this.panel.classList.add("collapsed"); 82 else this.panel.classList.add("collapsed");
83 this.element.classList.add("collapsed"); 83 this.element.classList.add("collapsed");
84 if(this._resizeBar != null) this.resizeBar.classList.add("collapsed"); 84 if(this._resizeBar != null) this.resizeBar.classList.add("collapsed");
85 } 85 } else {
86 else {
87 if(this.panel.element) this.panel.element.classList.remove("collapsed"); 86 if(this.panel.element) this.panel.element.classList.remove("collapsed");
88 else this.panel.classList.remove("collapsed"); 87 else this.panel.classList.remove("collapsed");
89 this.element.classList.remove("collapsed"); 88 this.element.classList.remove("collapsed");
@@ -92,6 +91,12 @@ exports.Splitter = Montage.create(Component, {
92 } 91 }
93 }, 92 },
94 93
94 didDraw: {
95 value: function() {
96 this.application.ninja.stage.resizeCanvases = true;
97 }
98 },
99
95 handleClick : { 100 handleClick : {
96 value: function() { 101 value: function() {
97 if (!this.disabled) { 102 if (!this.disabled) {
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 212b933e..45a90355 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -873,7 +873,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
873 this.currentLayerSelected.layerData.elementsList.splice(length, 1); 873 this.currentLayerSelected.layerData.elementsList.splice(length, 1);
874 break; 874 break;
875 } 875 }
876 length--; 876 //length--;
877 } 877 }
878 } 878 }
879 }, 879 },
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 947d7937..580d945d 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -283,7 +283,7 @@ exports.Properties = Montage.create(Component, {
283 this.customPi = el.elementModel.pi; 283 this.customPi = el.elementModel.pi;
284 this.displayCustomProperties(el, el.elementModel.pi); 284 this.displayCustomProperties(el, el.elementModel.pi);
285 } 285 }
286 286 var previousInput = this.application.ninja.colorController.colorModel.input;
287 customPI = PiData[this.customPi]; 287 customPI = PiData[this.customPi];
288 // Get all the custom section for the custom PI 288 // Get all the custom section for the custom PI
289 for(var i = 0, customSec; customSec = customPI[i]; i++) { 289 for(var i = 0, customSec; customSec = customPI[i]; i++) {
@@ -352,6 +352,33 @@ exports.Properties = Montage.create(Component, {
352 } 352 }
353 } 353 }
354 } 354 }
355 this.application.ninja.colorController.colorModel.input = previousInput;
356 var color = this.application.ninja.colorController.colorModel.colorHistory[previousInput][this.application.ninja.colorController.colorModel.colorHistory[previousInput].length-1];
357 color.c.wasSetByCode = true;
358 color.c.type = 'change';
359 switch (color.m) {
360 case 'rgb':
361 this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'};
362 this.application.ninja.colorController.colorModel.rgb = color.c;
363 break;
364 case 'hsl':
365 this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'};
366 this.application.ninja.colorController.colorModel.hsl = color.c;
367 break;
368 case 'hex':
369 //TODO: Check if anything needed here
370 break;
371 case 'gradient':
372 this.application.ninja.colorController.colorModel.gradient = color.c;
373 break;
374 case 'hsv':
375 this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'};
376 this.application.ninja.colorController.colorModel.hsv = color.c;
377 break;
378 default:
379 this.application.ninja.colorController.colorModel.applyNoColor();
380 break;
381 }
355 } 382 }
356 } 383 }
357 }, 384 },