From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- js/controllers/color-controller.js | 282 ++++++++++++++++++------------------- 1 file changed, 141 insertions(+), 141 deletions(-) (limited to 'js/controllers/color-controller.js') diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js index c5c614ea..194b7153 100755 --- a/js/controllers/color-controller.js +++ b/js/controllers/color-controller.js @@ -30,13 +30,13 @@ POSSIBILITY OF SUCH DAMAGE. //////////////////////////////////////////////////////////////////////// // -var Montage = require("montage/core/core").Montage, - Component = require("montage/ui/component").Component, - ColorModel = require("js/models/color-model").ColorModel, - ColorPanelBase = require("js/panels/Color/colorpanelbase.reel").ColorPanelBase, - ElementsMediator = require("js/mediators/element-mediator").ElementMediator, - ColorPopupManager = require("js/panels/Color/colorpopup-manager").ColorPopupManager, - ColorButtonManager = require("js/panels/Color/colorbutton-manager").ColorButtonManager; +var Montage = require("montage/core/core").Montage, + Component = require("montage/ui/component").Component, + ColorModel = require("js/models/color-model").ColorModel, + ColorPanelBase = require("js/panels/Color/colorpanelbase.reel").ColorPanelBase, + ElementsMediator = require("js/mediators/element-mediator").ElementMediator, + ColorPopupManager = require("js/panels/Color/colorpopup-manager").ColorPopupManager, + ColorButtonManager = require("js/panels/Color/colorbutton-manager").ColorButtonManager; //////////////////////////////////////////////////////////////////////// //Exporting as ColorController exports.ColorController = Montage.create(Component, { @@ -48,14 +48,14 @@ exports.ColorController = Montage.create(Component, { //////////////////////////////////////////////////////////////////// // deserializedFromTemplate: { - value: function () { - //Setting up colorManager in other classes - this.colorPanelBase.colorManager = this.colorModel; - this.colorPopupManager.colorManager = this.colorModel; - this.colorButtonManager.colorManager = this.colorModel; - //Listening for color changes - this.colorModel.addEventListener('change', this, false); - } + value: function () { + //Setting up colorManager in other classes + this.colorPanelBase.colorManager = this.colorModel; + this.colorPopupManager.colorManager = this.colorModel; + this.colorButtonManager.colorManager = this.colorModel; + //Listening for color changes + this.colorModel.addEventListener('change', this, false); + } }, //////////////////////////////////////////////////////////////////// // @@ -90,7 +90,7 @@ exports.ColorController = Montage.create(Component, { //////////////////////////////////////////////////////////////////// // _popupTab: { - value: 'wheel' + value: 'wheel' }, //////////////////////////////////////////////////////////////////// // @@ -131,7 +131,7 @@ exports.ColorController = Montage.create(Component, { //////////////////////////////////////////////////////////////////// // _fill: { - value: null + value: null }, //////////////////////////////////////////////////////////////////// // @@ -142,7 +142,7 @@ exports.ColorController = Montage.create(Component, { //////////////////////////////////////////////////////////////////// // _stroke: { - value: null + value: null }, //////////////////////////////////////////////////////////////////// // @@ -154,16 +154,16 @@ exports.ColorController = Montage.create(Component, { // getBackground: { value: function (element) { - //TODO: Return object with all background properties - console.log(ElementsMediator.getProperty(element, 'background-color')); - console.log(ElementsMediator.getProperty(element, 'background-image')); + //TODO: Return object with all background properties + console.log(ElementsMediator.getProperty(element, 'background-color')); + console.log(ElementsMediator.getProperty(element, 'background-image')); } }, //////////////////////////////////////////////////////////////////// // getBorder: { value: function (element) { - + } }, //////////////////////////////////////////////////////////////////// @@ -189,14 +189,14 @@ exports.ColorController = Montage.create(Component, { // handleChange: { value: function (e) { - // + // var color, input = e._event.input, panelMode, mode = e._event.mode; if (this.colorView) { - panelMode = this.colorView.panelMode; + panelMode = this.colorView.panelMode; } // if (mode === 'nocolor') { - color = {value: null, css: 'none'}; + color = {value: null, css: 'none'}; } else if (panelMode === 'rgb' && e._event.rgba && mode !== 'gradient') { color = e._event.rgba; color.webGlColor = e._event.webGlColor; @@ -206,7 +206,7 @@ exports.ColorController = Montage.create(Component, { } else if (mode !== 'gradient'){ color = {value: e._event.hex, css: '#'+e._event.hex}; } else if (mode === 'gradient'){ - color = e._event.value.value; + color = e._event.value.value; } color.mode = panelMode; color.wasSetByCode = true; @@ -215,15 +215,15 @@ exports.ColorController = Montage.create(Component, { //////////////////////////////////////////////////////////// // if (input === 'fill') { - // - this.fill = color; + // + this.fill = color; // if(e._event.wasSetByCode) return; - // + // this.setColor(mode, color, true); } else if (input === 'stroke') { - // - this.stroke = color; + // + this.stroke = color; // if(e._event.wasSetByCode) return; @@ -237,93 +237,93 @@ exports.ColorController = Montage.create(Component, { //Converts CSS to a color object to be used by the color model getColorObjFromCss: { value: function (css) { - // - var color, arr, i, j, temp, c, gradient; - //console.log(css.indexOf('-webkit'), css); - if (css && css.indexOf('-webkit') >= 0) { - // - gradient = {mode: null, stops: null}; - //Checking for gradient type - if (css.indexOf('-webkit-radial-gradient') >= 0) { - //Radial gradient - gradient.stops = []; - gradient.mode = 'radial'; - gradient.gradientMode = 'radial'; - gradient.css = css; - // - arr = css.split('%,'); - // - for (j=1; arr[j]; j++) { - //TODO: Add HSL support - if (arr[j].indexOf('rgb') >= 0 && arr[j].indexOf('rgba') < 0) { - temp = arr[j].split('rgb'); - temp = temp[1].replace(/\(/i, ""); - temp = temp.split(')'); - c = this.parseCssToColor('rgb('+temp[0]+')'); - gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: parseInt(temp[1].replace(/\%/i, ""))}); - } else if (css.indexOf('rgba') >= 0) { - - temp = arr[j].split('rgba'); - temp = temp[1].replace(/\(/i, ""); - temp = temp.split(')'); - c = this.parseCssToColor('rgba('+temp[0]+')'); - gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: parseInt(temp[1].replace(/\%/i, ""))}); - } - } - } else if (css.indexOf('-webkit-gradient') >= 0) { - //Linear gradient - gradient.stops = []; - gradient.mode = 'linear'; - gradient.gradientMode = 'linear'; - gradient.css = css; - // - arr = css.split('from('); - // - if (arr.length > 1) { - arr = arr[1].split('),'); - } else { - arr = (css.split(css.split('color-stop(')[0])[1]).split('),'); - } - // - for (i=0; arr[i]; i++) { - arr[i] = arr[i].replace(/ color-stop\(/i, ""); - // - if (arr[i].indexOf('to(') >= 0) { - arr[i] = arr[i].replace(/ to\(/i, ""); - arr[i] = arr[i].replace(/\)\)/i, ""); - } - // - if (i === 0 && arr[i].indexOf('color-stop') === -1) { - arr[i] = {css: arr[i], percent: 0}; - } else if (i === arr.length-1) { - temp = arr[i].split(', rgb'); - if (temp.length > 1) { - arr[i] = {css: 'rgb'+temp[1].replace(/\)\)/i, ""), percent: Math.round(parseFloat(temp[0])*100)}; - } else { - arr[i] = {css: arr[i], percent: 100}; - } - } else { - // - if (arr[i].indexOf('rgb') >= 0 && arr[i].indexOf('rgba') < 0) { - temp = arr[i].split(', rgb'); - temp[0] = temp[0].replace(/color\-stop\(/gi, ''); - arr[i] = {css: 'rgb'+temp[1], percent: Math.round(parseFloat(temp[0])*100)}; - } else if (arr[i].indexOf('rgba') >= 0) { - temp = arr[i].split(', rgba'); - arr[i] = {css: 'rgba'+temp[1], percent: Math.round(parseFloat(temp[0])*100)}; - } - } - // - c = this.parseCssToColor(arr[i].css); - gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: arr[i].percent}); - } - } - //Creating gradient object - color = {mode: 'gradient', value: {stops: gradient.stops, mode: gradient.mode, gradientMode: gradient.gradientMode, css: css}}; - } else if (css){ - //Simple solid color - color = this.parseCssToColor(css); - } + // + var color, arr, i, j, temp, c, gradient; + //console.log(css.indexOf('-webkit'), css); + if (css && css.indexOf('-webkit') >= 0) { + // + gradient = {mode: null, stops: null}; + //Checking for gradient type + if (css.indexOf('-webkit-radial-gradient') >= 0) { + //Radial gradient + gradient.stops = []; + gradient.mode = 'radial'; + gradient.gradientMode = 'radial'; + gradient.css = css; + // + arr = css.split('%,'); + // + for (j=1; arr[j]; j++) { + //TODO: Add HSL support + if (arr[j].indexOf('rgb') >= 0 && arr[j].indexOf('rgba') < 0) { + temp = arr[j].split('rgb'); + temp = temp[1].replace(/\(/i, ""); + temp = temp.split(')'); + c = this.parseCssToColor('rgb('+temp[0]+')'); + gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: parseInt(temp[1].replace(/\%/i, ""))}); + } else if (css.indexOf('rgba') >= 0) { + + temp = arr[j].split('rgba'); + temp = temp[1].replace(/\(/i, ""); + temp = temp.split(')'); + c = this.parseCssToColor('rgba('+temp[0]+')'); + gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: parseInt(temp[1].replace(/\%/i, ""))}); + } + } + } else if (css.indexOf('-webkit-gradient') >= 0) { + //Linear gradient + gradient.stops = []; + gradient.mode = 'linear'; + gradient.gradientMode = 'linear'; + gradient.css = css; + // + arr = css.split('from('); + // + if (arr.length > 1) { + arr = arr[1].split('),'); + } else { + arr = (css.split(css.split('color-stop(')[0])[1]).split('),'); + } + // + for (i=0; arr[i]; i++) { + arr[i] = arr[i].replace(/ color-stop\(/i, ""); + // + if (arr[i].indexOf('to(') >= 0) { + arr[i] = arr[i].replace(/ to\(/i, ""); + arr[i] = arr[i].replace(/\)\)/i, ""); + } + // + if (i === 0 && arr[i].indexOf('color-stop') === -1) { + arr[i] = {css: arr[i], percent: 0}; + } else if (i === arr.length-1) { + temp = arr[i].split(', rgb'); + if (temp.length > 1) { + arr[i] = {css: 'rgb'+temp[1].replace(/\)\)/i, ""), percent: Math.round(parseFloat(temp[0])*100)}; + } else { + arr[i] = {css: arr[i], percent: 100}; + } + } else { + // + if (arr[i].indexOf('rgb') >= 0 && arr[i].indexOf('rgba') < 0) { + temp = arr[i].split(', rgb'); + temp[0] = temp[0].replace(/color\-stop\(/gi, ''); + arr[i] = {css: 'rgb'+temp[1], percent: Math.round(parseFloat(temp[0])*100)}; + } else if (arr[i].indexOf('rgba') >= 0) { + temp = arr[i].split(', rgba'); + arr[i] = {css: 'rgba'+temp[1], percent: Math.round(parseFloat(temp[0])*100)}; + } + } + // + c = this.parseCssToColor(arr[i].css); + gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: arr[i].percent}); + } + } + //Creating gradient object + color = {mode: 'gradient', value: {stops: gradient.stops, mode: gradient.mode, gradientMode: gradient.gradientMode, css: css}}; + } else if (css){ + //Simple solid color + color = this.parseCssToColor(css); + } // TODO - Hack for inconsistent color object -- some workflows set color.color and some color.value if(color) { @@ -337,36 +337,36 @@ exports.ColorController = Montage.create(Component, { } } //Returning color object (or null if none) - return color; + return color; } }, //////////////////////////////////////////////////////////////////// //Parses simple solid CSS string into color object parseCssToColor: { value: function (css) { - var color, r, p; - //Parsing string and converting into color object - if (css.indexOf('#') >= 0) { - color = {mode: 'hex', css: css, value: css.split('#')[1]}; - } else if (css.indexOf('rgb') >= 0 && css.indexOf('rgba') < 0) { - r = /^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/; - p = css.match(r); + var color, r, p; + //Parsing string and converting into color object + if (css.indexOf('#') >= 0) { + color = {mode: 'hex', css: css, value: css.split('#')[1]}; + } else if (css.indexOf('rgb') >= 0 && css.indexOf('rgba') < 0) { + r = /^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/; + p = css.match(r); color = {mode: 'rgb', css: css, value: {css: css, r: parseInt(p[1]), g: parseInt(p[2]), b: parseInt(p[3]), a: 1}}; - } else if (css.indexOf('rgba') >= 0) { - r = /^rgba\((\d+),\s*(\d+),\s*(\d+),\s*(\d*\.?\d+)\)$/; - p = css.match(r); - color = {mode: 'rgb', css: css, value: {css: css, r: parseInt(p[1]), g: parseInt(p[2]), b: parseInt(p[3]), a: parseFloat(p[4])}}; - } else if (css.indexOf('hsl') >= 0 && css.indexOf('hsla') < 0) { - r = /^hsl\((\d+),\s*(\d+),\s*(\d+)\)$/; - p = css.match(r); - color = {mode: 'hsl', css: css, value: {css: css, h: parseInt(p[1]), s: parseInt(p[2]), l: parseInt(p[3]), a: 1}}; - } if (css.indexOf('hsla') >= 0) { - r = /^hsla\((\d+),\s*(\d+),\s*(\d+),\s*(\d*\.?\d+)\)$/; - p = css.match(r); - color = {mode: 'hsl', css: css, value: {css: css, h: parseInt(p[1]), s: parseInt(p[2]), l: parseInt(p[3]), a: parseFloat(p[4])}}; - } - //Must be a valid CSS or null will be returned - return color; + } else if (css.indexOf('rgba') >= 0) { + r = /^rgba\((\d+),\s*(\d+),\s*(\d+),\s*(\d*\.?\d+)\)$/; + p = css.match(r); + color = {mode: 'rgb', css: css, value: {css: css, r: parseInt(p[1]), g: parseInt(p[2]), b: parseInt(p[3]), a: parseFloat(p[4])}}; + } else if (css.indexOf('hsl') >= 0 && css.indexOf('hsla') < 0) { + r = /^hsl\((\d+),\s*(\d+),\s*(\d+)\)$/; + p = css.match(r); + color = {mode: 'hsl', css: css, value: {css: css, h: parseInt(p[1]), s: parseInt(p[2]), l: parseInt(p[3]), a: 1}}; + } if (css.indexOf('hsla') >= 0) { + r = /^hsla\((\d+),\s*(\d+),\s*(\d+),\s*(\d*\.?\d+)\)$/; + p = css.match(r); + color = {mode: 'hsl', css: css, value: {css: css, h: parseInt(p[1]), s: parseInt(p[2]), l: parseInt(p[3]), a: parseFloat(p[4])}}; + } + //Must be a valid CSS or null will be returned + return color; } } //////////////////////////////////////////////////////////////////// -- cgit v1.2.3 From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:53:10 -0700 Subject: Remove trailing spaces --- js/controllers/color-controller.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'js/controllers/color-controller.js') diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js index 194b7153..8be2421f 100755 --- a/js/controllers/color-controller.js +++ b/js/controllers/color-controller.js @@ -27,7 +27,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + //////////////////////////////////////////////////////////////////////// // var Montage = require("montage/core/core").Montage, @@ -163,7 +163,7 @@ exports.ColorController = Montage.create(Component, { // getBorder: { value: function (element) { - + } }, //////////////////////////////////////////////////////////////////// @@ -262,14 +262,14 @@ exports.ColorController = Montage.create(Component, { c = this.parseCssToColor('rgb('+temp[0]+')'); gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: parseInt(temp[1].replace(/\%/i, ""))}); } else if (css.indexOf('rgba') >= 0) { - + temp = arr[j].split('rgba'); temp = temp[1].replace(/\(/i, ""); temp = temp.split(')'); c = this.parseCssToColor('rgba('+temp[0]+')'); gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: parseInt(temp[1].replace(/\%/i, ""))}); } - } + } } else if (css.indexOf('-webkit-gradient') >= 0) { //Linear gradient gradient.stops = []; -- cgit v1.2.3