aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorEric Guzman2012-03-17 00:05:14 -0700
committerEric Guzman2012-03-17 00:05:14 -0700
commita3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch)
tree497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/panels
parenta6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff)
parent954f5a13e371febcb1c0fb8015c577ee51c23130 (diff)
downloadninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts: js/panels/presets/default-transition-presets.js
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scsscbin15335 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scsscbin17879 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scsscbin23592 -> 0 bytes
-rwxr-xr-xjs/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js2
-rwxr-xr-xjs/panels/Splitter.js5
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js102
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html169
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js743
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css14
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html39
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js161
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js50
-rwxr-xr-xjs/panels/color/colorbutton-manager.js (renamed from js/panels/Color/colorbutton-manager.js)0
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.html (renamed from js/panels/Color/colorchippopup.reel/colorchippopup.html)0
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.js (renamed from js/panels/Color/colorchippopup.reel/colorchippopup.js)0
-rwxr-xr-xjs/panels/color/colorchippopup.reel/config.rb (renamed from js/panels/Color/colorchippopup.reel/config.rb)0
-rwxr-xr-xjs/panels/color/colorchippopup.reel/css/colorchippopup.css (renamed from js/panels/Color/colorchippopup.reel/css/colorchippopup.css)0
-rwxr-xr-xjs/panels/color/colorchippopup.reel/css/colorchippopup.scss (renamed from js/panels/Color/colorchippopup.reel/css/colorchippopup.scss)0
-rwxr-xr-xjs/panels/color/colorchippopup.reel/img/icon_bitmap.png (renamed from js/panels/Color/colorchippopup.reel/img/icon_bitmap.png)bin3072 -> 3072 bytes
-rwxr-xr-xjs/panels/color/colorchippopup.reel/img/icon_colorwheel.png (renamed from js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png)bin3420 -> 3420 bytes
-rwxr-xr-xjs/panels/color/colorchippopup.reel/img/icon_gradient.png (renamed from js/panels/Color/colorchippopup.reel/img/icon_gradient.png)bin2815 -> 2815 bytes
-rwxr-xr-xjs/panels/color/colorchippopup.reel/img/icon_nofill.png (renamed from js/panels/Color/colorchippopup.reel/img/icon_nofill.png)bin2951 -> 2951 bytes
-rwxr-xr-xjs/panels/color/colorchippopup.reel/img/knob.png (renamed from js/panels/Color/colorchippopup.reel/img/knob.png)bin1036 -> 1036 bytes
-rwxr-xr-xjs/panels/color/colorpanel.js (renamed from js/panels/Color/colorpanel.js)0
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html (renamed from js/panels/Color/colorpanelbase.reel/colorpanelbase.html)0
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js (renamed from js/panels/Color/colorpanelbase.reel/colorpanelbase.js)0
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/config.rb (renamed from js/panels/Color/colorpanelbase.reel/config.rb)0
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/css/colorpanelbase.css (renamed from js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css)0
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/css/colorpanelbase.scss (renamed from js/panels/Color/colorpanelbase.reel/css/colorpanelbase.scss)0
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/img/icon_default.png (renamed from js/panels/Color/colorpanelbase.reel/img/icon_default.png)bin3011 -> 3011 bytes
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/img/icon_nocolor.png (renamed from js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png)bin3036 -> 3036 bytes
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/img/icon_swap.png (renamed from js/panels/Color/colorpanelbase.reel/img/icon_swap.png)bin2961 -> 2961 bytes
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/img/knob.png (renamed from js/panels/Color/colorpanelbase.reel/img/knob.png)bin1036 -> 1036 bytes
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html (renamed from js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html)0
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.js (renamed from js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js)2
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/config.rb (renamed from js/panels/Color/colorpanelpopup.reel/config.rb)0
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css (renamed from js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css)0
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss (renamed from js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss)0
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/img/icon_bitmap.png (renamed from js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png)bin3072 -> 3072 bytes
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/img/icon_colorwheel.png (renamed from js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png)bin3420 -> 3420 bytes
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/img/icon_gradient.png (renamed from js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png)bin2815 -> 2815 bytes
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/img/icon_nofill.png (renamed from js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png)bin2951 -> 2951 bytes
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/img/knob.png (renamed from js/panels/Color/colorpanelpopup.reel/img/knob.png)bin1036 -> 1036 bytes
-rwxr-xr-xjs/panels/color/colorpopup-manager.js (renamed from js/panels/Color/colorpopup-manager.js)0
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.html (renamed from js/panels/Color/colortoolbar.reel/colortoolbar.html)0
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.js (renamed from js/panels/Color/colortoolbar.reel/colortoolbar.js)0
-rwxr-xr-xjs/panels/color/colortoolbar.reel/config.rb (renamed from js/panels/Color/colortoolbar.reel/config.rb)0
-rwxr-xr-xjs/panels/color/colortoolbar.reel/css/colortoolbar.css (renamed from js/panels/Color/colortoolbar.reel/css/colortoolbar.css)0
-rwxr-xr-xjs/panels/color/colortoolbar.reel/css/colortoolbar.scss (renamed from js/panels/Color/colortoolbar.reel/css/colortoolbar.scss)0
-rwxr-xr-xjs/panels/properties.reel/properties.html72
-rwxr-xr-xjs/panels/properties.reel/properties.js97
51 files changed, 709 insertions, 747 deletions
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
deleted file mode 100755
index aa8bf258..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
+++ /dev/null
Binary files differ
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
deleted file mode 100755
index fca60390..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
+++ /dev/null
Binary files differ
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
deleted file mode 100755
index fd7938d8..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
+++ /dev/null
Binary files differ
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index b6bee37d..b4eec771 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/Splitter.js b/js/panels/Splitter.js
index 3215e928..e92cb2dd 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");
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 81bd1867..5206ae16 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -38,13 +38,11 @@ var Layer = exports.Layer = Montage.create(Component, {
38 _arrLayerStyles : { 38 _arrLayerStyles : {
39 serializable: true, 39 serializable: true,
40 enumerable: true, 40 enumerable: true,
41 serializable: true,
42 value: [] 41 value: []
43 }, 42 },
44 arrLayerStyles : { 43 arrLayerStyles : {
45 serializable: true, 44 serializable: true,
46 enumerable: true, 45 enumerable: true,
47 serializable: true,
48 get: function() { 46 get: function() {
49 return this._arrLayerStyles; 47 return this._arrLayerStyles;
50 }, 48 },
@@ -84,8 +82,8 @@ var Layer = exports.Layer = Montage.create(Component, {
84 if (newVal !== this._layerName) { 82 if (newVal !== this._layerName) {
85 this._layerEditable.value = newVal; 83 this._layerEditable.value = newVal;
86 this._layerName = newVal; 84 this._layerName = newVal;
87 this._layerEditable.needsDraw = true; 85 this.layerData.layerName = newVal;
88 this.needsDraw = true; 86 this.log('layerName setter: ' + newVal)
89 } 87 }
90 88
91 } 89 }
@@ -110,7 +108,7 @@ var Layer = exports.Layer = Montage.create(Component, {
110 /* Position and Transform hottext values */ 108 /* Position and Transform hottext values */
111 _dtextPositionX : { 109 _dtextPositionX : {
112 value:null, 110 value:null,
113 serializable: true, 111 serializable: true
114 }, 112 },
115 113
116 dtextPositionX:{ 114 dtextPositionX:{
@@ -121,7 +119,7 @@ var Layer = exports.Layer = Montage.create(Component, {
121 set:function(value){ 119 set:function(value){
122 if (this._dtextPositionX !== value) { 120 if (this._dtextPositionX !== value) {
123 this._dtextPositionX = value; 121 this._dtextPositionX = value;
124 this.needsDraw = true; 122 //this.needsDraw = true;
125 } 123 }
126 124
127 } 125 }
@@ -129,7 +127,7 @@ var Layer = exports.Layer = Montage.create(Component, {
129 127
130 _dtextPositionY : { 128 _dtextPositionY : {
131 value:null, 129 value:null,
132 serializable: true, 130 serializable: true
133 }, 131 },
134 132
135 dtextPositionY:{ 133 dtextPositionY:{
@@ -140,7 +138,7 @@ var Layer = exports.Layer = Montage.create(Component, {
140 set:function(value){ 138 set:function(value){
141 if (this._dtextPositionY !== value) { 139 if (this._dtextPositionY !== value) {
142 this._dtextPositionY = value; 140 this._dtextPositionY = value;
143 this.needsDraw = true; 141 //this.needsDraw = true;
144 } 142 }
145 143
146 } 144 }
@@ -148,7 +146,7 @@ var Layer = exports.Layer = Montag