diff options
author | Eric | 2012-03-09 15:55:00 -0800 |
---|---|---|
committer | Eric | 2012-03-09 15:55:00 -0800 |
commit | 1a70520402677cf3ba257921839a656dcf9a76c2 (patch) | |
tree | 5e6a0461e12b234f083c96b26f377815f12c3786 /js/controllers | |
parent | 9e048d2cf359c305e895fe7c0bebf09016896531 (diff) | |
parent | 27b81378ed07afa823b215d0af4f83e150c2222f (diff) | |
download | ninja-1a70520402677cf3ba257921839a656dcf9a76c2.tar.gz |
Merge pull request #3 from joseeight/FileIO-Integration
Integrated dynamic path to assets
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/color-controller.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js index a6e41dd3..53573baf 100755 --- a/js/controllers/color-controller.js +++ b/js/controllers/color-controller.js | |||
@@ -259,6 +259,7 @@ exports.ColorController = Montage.create(Component, { | |||
259 | //Radial gradient | 259 | //Radial gradient |
260 | gradient.stops = []; | 260 | gradient.stops = []; |
261 | gradient.mode = 'radial'; | 261 | gradient.mode = 'radial'; |
262 | gradient.gradientMode = 'radial'; | ||
262 | gradient.css = css; | 263 | gradient.css = css; |
263 | // | 264 | // |
264 | arr = css.split('%,'); | 265 | arr = css.split('%,'); |
@@ -284,6 +285,7 @@ exports.ColorController = Montage.create(Component, { | |||
284 | //Linear gradient | 285 | //Linear gradient |
285 | gradient.stops = []; | 286 | gradient.stops = []; |
286 | gradient.mode = 'linear'; | 287 | gradient.mode = 'linear'; |
288 | gradient.gradientMode = 'linear'; | ||
287 | gradient.css = css; | 289 | gradient.css = css; |
288 | // | 290 | // |
289 | arr = css.split('from('); | 291 | arr = css.split('from('); |
@@ -317,7 +319,7 @@ exports.ColorController = Montage.create(Component, { | |||
317 | } | 319 | } |
318 | } | 320 | } |
319 | //Creating gradient object | 321 | //Creating gradient object |
320 | color = {mode: 'gradient', value: {stops: gradient.stops, mode: gradient.mode, css: css}}; | 322 | color = {mode: 'gradient', value: {stops: gradient.stops, mode: gradient.mode, gradientMode: gradient.gradientMode, css: css}}; |
321 | } else if (css){ | 323 | } else if (css){ |
322 | //Simple solid color | 324 | //Simple solid color |
323 | color = this.parseCssToColor(css); | 325 | color = this.parseCssToColor(css); |