diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/components | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components')
54 files changed, 1040 insertions, 327 deletions
diff --git a/js/components/SliderBase.js b/js/components/SliderBase.js index 8df868a2..a6c3ff6d 100755 --- a/js/components/SliderBase.js +++ b/js/components/SliderBase.js | |||
| @@ -83,7 +83,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, { | |||
| 83 | } | 83 | } |
| 84 | this.needsDraw = true; | 84 | this.needsDraw = true; |
| 85 | } | 85 | } |
| 86 | } | 86 | }, |
| 87 | serializable: true | ||
| 87 | }, | 88 | }, |
| 88 | 89 | ||
| 89 | // Internal flags to determine what the change/changing events will contain | 90 | // Internal flags to determine what the change/changing events will contain |
| @@ -153,7 +154,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, { | |||
| 153 | } | 154 | } |
| 154 | this.needsDraw = true; | 155 | this.needsDraw = true; |
| 155 | } | 156 | } |
| 156 | } | 157 | }, |
| 158 | serializable: true | ||
| 157 | }, | 159 | }, |
| 158 | 160 | ||
| 159 | _maxValue: { | 161 | _maxValue: { |
| @@ -175,7 +177,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, { | |||
| 175 | } | 177 | } |
| 176 | this.needsDraw = true; | 178 | this.needsDraw = true; |
| 177 | } | 179 | } |
| 178 | } | 180 | }, |
| 181 | serializable: true | ||
| 179 | }, | 182 | }, |
| 180 | 183 | ||
| 181 | _valueCoef: { | 184 | _valueCoef: { |
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html index 707bd637..5af6dff8 100755 --- a/js/components/colorwheel.reel/colorwheel.html +++ b/js/components/colorwheel.reel/colorwheel.html | |||
| @@ -18,7 +18,11 @@ | |||
| 18 | "owner": { | 18 | "owner": { |
| 19 | "prototype": "js/components/colorwheel.reel[ColorWheel]", | 19 | "prototype": "js/components/colorwheel.reel[ColorWheel]", |
| 20 | "properties": { | 20 | "properties": { |
| 21 | "element": {"#": "colorwheel"} | 21 | "element": {"#": "colorwheel"}, |
| 22 | "wheel": {"#": "wheel"}, | ||
| 23 | "wheelSelect": {"#": "wselect"}, | ||
| 24 | "swatch": {"#": "swatch"}, | ||
| 25 | "swatchSelect": {"#": "sselect"} | ||
| 22 | 26 | ||
| 23 | } | 27 | } |
| 24 | } | 28 | } |
| @@ -30,10 +34,10 @@ | |||
| 30 | <body> | 34 | <body> |
| 31 | 35 | ||
| 32 | <div data-montage-id="colorwheel" class="colorwheel"> | 36 | <div data-montage-id="colorwheel" class="colorwheel"> |
| 33 | <canvas></canvas> | 37 | <canvas data-montage-id="wheel"></canvas> |
| 34 | <canvas></canvas> | 38 | <canvas data-montage-id="swatch"></canvas> |
| 35 | <canvas></canvas> | 39 | <canvas data-montage-id="sselect"></canvas> |
| 36 | <canvas></canvas> | 40 | <canvas data-montage-id="wselect"></canvas> |
| 37 | </div> | 41 | </div> |
| 38 | 42 | ||
| 39 | </body> | 43 | </body> |
diff --git a/js/components/colorwheel.reel/colorwheel.js b/js/components/colorwheel.reel/colorwheel.js index 343422e2..0980253c 100755 --- a/js/components/colorwheel.reel/colorwheel.js +++ b/js/components/colorwheel.reel/colorwheel.js | |||
| @@ -14,19 +14,16 @@ exports.ColorWheel = Montage.create(Component, { | |||
| 14 | //////////////////////////////////////////////////////////////////// | 14 | //////////////////////////////////////////////////////////////////// |
| 15 | // | 15 | // |
| 16 | hasTemplate: { | 16 | hasTemplate: { |
| 17 | enumerable: false, | ||
| 18 | value: true | 17 | value: true |
| 19 | }, | 18 | }, |
| 20 | //////////////////////////////////////////////////////////////////// | 19 | //////////////////////////////////////////////////////////////////// |
| 21 | //Value of wheel in HSV (360, 100, 100) | 20 | //Value of wheel in HSV (360, 100, 100) |
| 22 | _value: { | 21 | _value: { |
| 23 | enumerable: false, | ||
| 24 | value: {h: 0, s: 0, v: 0} | 22 | value: {h: 0, s: 0, v: 0} |
| 25 | }, | 23 | }, |
| 26 | //////////////////////////////////////////////////////////////////// | 24 | //////////////////////////////////////////////////////////////////// |
| 27 | //Value of wheel in HSV (360, 100, 100) | 25 | //Value of wheel in HSV (360, 100, 100) |
| 28 | value: { | 26 | value: { |
| 29 | enumerable: false, | ||
| 30 | get: function() { | 27 | get: function() { |
| 31 | return this._value; | 28 | return this._value; |
| 32 | }, | 29 | }, |
| @@ -34,8 +31,8 @@ exports.ColorWheel = Montage.create(Component, { | |||
| 34 | this._value = value; | 31 | this._value = value; |
| 35 | if (this._wheelData) { | 32 | if (this._wheelData) { |
| 36 | if (value && !value.wasSetByCode) { | 33 | if (value && !value.wasSetByCode) { |
| 37 | this.wheelSelectorAngle(value.h/this.element._component.math.TAU*360); | 34 | this.wheelSelectorAngle(value.h/this._math.TAU*360); |
| 38 | this.drawSwatchColor(value.h/this.element._component.math.TAU*360); | 35 | this.drawSwatchColor(value.h/this._math.TAU*360); |
| 39 | this.drawSwatchSelector(value.s*100, value.v*100); | 36 | this.drawSwatchSelector(value.s*100, value.v*100); |
| 40 | } | 37 | } |
| 41 | if (!this._isMouseDown) { | 38 | if (!this._isMouseDown) { |
| @@ -47,14 +44,12 @@ exports.ColorWheel = Montage.create(Component, { | |||
| 47 | //////////////////////////////////////////////////////////////////// | 44 | //////////////////////////////////////////////////////////////////// |
| 48 | //Stroke size of wheel | 45 | //Stroke size of wheel |
| 49 | _strokeWidth: { | 46 | _strokeWidth: { |
| 50 | enumerable: false, | ||
| 51 | value: 2 | 47 | value: 2 |
| 52 | }, | 48 | }, |
| 53 | //////////////////////////////////////////////////////////////////// | ||