diff options
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc | bin | 15335 -> 0 bytes | |||
-rwxr-xr-x | js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc | bin | 17879 -> 0 bytes | |||
-rwxr-xr-x | js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc | bin | 23592 -> 0 bytes | |||
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 88 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 169 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 725 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 14 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 39 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 161 | ||||
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 45 | ||||
-rwxr-xr-x | js/panels/color/colorbutton-manager.js (renamed from js/panels/Color/colorbutton-manager.js) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorchippopup.reel/colorchippopup.html (renamed from js/panels/Color/colorchippopup.reel/colorchippopup.html) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorchippopup.reel/colorchippopup.js (renamed from js/panels/Color/colorchippopup.reel/colorchippopup.js) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorchippopup.reel/config.rb (renamed from js/panels/Color/colorchippopup.reel/config.rb) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorchippopup.reel/css/colorchippopup.css (renamed from js/panels/Color/colorchippopup.reel/css/colorchippopup.css) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorchippopup.reel/css/colorchippopup.scss (renamed from js/panels/Color/colorchippopup.reel/css/colorchippopup.scss) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorchippopup.reel/img/icon_bitmap.png (renamed from js/panels/Color/colorchippopup.reel/img/icon_bitmap.png) | bin | 3072 -> 3072 bytes | |||
-rwxr-xr-x | js/panels/color/colorchippopup.reel/img/icon_colorwheel.png (renamed from js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png) | bin | 3420 -> 3420 bytes | |||
-rwxr-xr-x | js/panels/color/colorchippopup.reel/img/icon_gradient.png (renamed from js/panels/Color/colorchippopup.reel/img/icon_gradient.png) | bin | 2815 -> 2815 bytes | |||
-rwxr-xr-x | js/panels/color/colorchippopup.reel/img/icon_nofill.png (renamed from js/panels/Color/colorchippopup.reel/img/icon_nofill.png) | bin | 2951 -> 2951 bytes | |||
-rwxr-xr-x | js/panels/color/colorchippopup.reel/img/knob.png (renamed from js/panels/Color/colorchippopup.reel/img/knob.png) | bin | 1036 -> 1036 bytes | |||
-rwxr-xr-x | js/panels/color/colorpanel.js (renamed from js/panels/Color/colorpanel.js) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/colorpanelbase.html (renamed from js/panels/Color/colorpanelbase.reel/colorpanelbase.html) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/colorpanelbase.js (renamed from js/panels/Color/colorpanelbase.reel/colorpanelbase.js) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/config.rb (renamed from js/panels/Color/colorpanelbase.reel/config.rb) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/css/colorpanelbase.css (renamed from js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss (renamed from js/panels/Color/colorpanelbase.reel/css/colorpanelbase.scss) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/img/icon_default.png (renamed from js/panels/Color/colorpanelbase.reel/img/icon_default.png) | bin | 3011 -> 3011 bytes | |||
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/img/icon_nocolor.png (renamed from js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png) | bin | 3036 -> 3036 bytes | |||
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/img/icon_swap.png (renamed from js/panels/Color/colorpanelbase.reel/img/icon_swap.png) | bin | 2961 -> 2961 bytes | |||
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/img/knob.png (renamed from js/panels/Color/colorpanelbase.reel/img/knob.png) | bin | 1036 -> 1036 bytes | |||
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/colorpanelpopup.html (renamed from js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/colorpanelpopup.js (renamed from js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js) | 2 | ||||
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/config.rb (renamed from js/panels/Color/colorpanelpopup.reel/config.rb) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css (renamed from js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss (renamed from js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss) | 0 | ||||
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/img/icon_bitmap.png (renamed from js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png) | bin | 3072 -> 3072 bytes | |||
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/img/icon_colorwheel.png (renamed from js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png) | bin | 3420 -> 3420 bytes | |||
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/img/icon_gradient.png (renamed from js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png) | bin | 2815 -> 2815 bytes | |||
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/img/icon_nofill.png (renamed from js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png) | bin | 2951 -> 2951 bytes | |||
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/img/knob.png (renamed from js/panels/Color/colorpanelpopup.reel/img/knob.png) | bin | 1036 -> 1036 bytes | |||
-rwxr-xr-x | js/panels/color/colorpopup-manager.js (renamed from js/panels/Color/colorpopup-manager.js) | 0 | ||||
-rwxr-xr-x | js/panels/color/colortoolbar.reel/colortoolbar.html (renamed from js/panels/Color/colortoolbar.reel/colortoolbar.html) | 0 | ||||
-rwxr-xr-x | js/panels/color/colortoolbar.reel/colortoolbar.js (renamed from js/panels/Color/colortoolbar.reel/colortoolbar.js) | 0 | ||||
-rwxr-xr-x | js/panels/color/colortoolbar.reel/config.rb (renamed from js/panels/Color/colortoolbar.reel/config.rb) | 0 | ||||
-rwxr-xr-x | js/panels/color/colortoolbar.reel/css/colortoolbar.css (renamed from js/panels/Color/colortoolbar.reel/css/colortoolbar.css) | 0 | ||||
-rwxr-xr-x | js/panels/color/colortoolbar.reel/css/colortoolbar.scss (renamed from js/panels/Color/colortoolbar.reel/css/colortoolbar.scss) | 0 | ||||
-rwxr-xr-x | js/panels/properties.reel/properties.js | 4 |
48 files changed, 601 insertions, 646 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/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 81bd1867..b41680be 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 = Montage.create(Component, { | |||
148 | 146 | ||
149 | _dtextScaleX : { | 147 | _dtextScaleX : { |
150 | value:null, | 148 | value:null, |
151 | serializable: true, | 149 | serializable: true |
152 | }, | 150 | }, |
153 | 151 | ||
154 | dtextScaleX:{ | 152 | dtextScaleX:{ |
@@ -159,7 +157,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
159 | set:function(value){ | 157 | set:function(value){ |
160 | if (this._dtextScaleX !== value) { | 158 | if (this._dtextScaleX !== value) { |
161 | this._dtextScaleX = value; | 159 | this._dtextScaleX = value; |
162 | this.needsDraw = true; | 160 | //this.needsDraw = true; |
163 | } | 161 | } |
164 | 162 | ||
165 | } | 163 | } |
@@ -167,7 +165,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
167 | 165 | ||
168 | _dtextScaleY : { | 166 | _dtextScaleY : { |
169 | value:null, | 167 | value:null, |
170 | serializable: true, | 168 | serializable: true |
171 | }, | 169 | }, |
172 | 170 | ||
173 | dtextScaleY:{ | 171 | dtextScaleY:{ |
@@ -178,7 +176,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
178 | set:function(value){ | 176 | set:function(value){ |
179 | if (this._dtextScaleY !== value) { | 177 | if (this._dtextScaleY !== value) { |
180 | this._dtextScaleY = value; | 178 | this._dtextScaleY = value; |
181 | this.needsDraw = true; | 179 | //this.needsDraw = true; |
182 | } | 180 | } |
183 | 181 | ||
184 | } | 182 | } |
@@ -186,7 +184,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
186 | 184 | ||
187 | _dtextSkewX : { | 185 | _dtextSkewX : { |
188 | value:null, | 186 | value:null, |
189 | serializable: true, | 187 | serializable: true |