diff --git a/src/style/Color.js b/src/style/Color.js index 46f29e0e..a3bc1aa1 100644 --- a/src/style/Color.js +++ b/src/style/Color.js @@ -725,7 +725,7 @@ var Color = Base.extend(new function() { /** * @return {String} A css string representation of the color. */ - toCss: function(noAlpha) { + toCSS: function(noAlpha) { var components = this._convert('rgb'), alpha = noAlpha || this._alpha == null ? 1 : this._alpha; components = [ @@ -744,7 +744,7 @@ var Color = Base.extend(new function() { return this._canvasStyle; // Normal colors are simply represented by their css string. if (this._type !== 'gradient') - return this._canvasStyle = this.toCss(); + return this._canvasStyle = this.toCSS(); // Gradient code form here onwards var components = this._components, gradient = components[0], diff --git a/src/svg/SVGExport.js b/src/svg/SVGExport.js index 24e60b49..aca2dfff 100644 --- a/src/svg/SVGExport.js +++ b/src/svg/SVGExport.js @@ -382,7 +382,7 @@ new function() { alpha = stopColor.getAlpha(); attrs = { offset: stop._rampPoint, - 'stop-color': stopColor.toCss(true) + 'stop-color': stopColor.toCSS(true) }; // See applyStyle for an explanation of why there are separated // opacity / color attributes. @@ -432,7 +432,7 @@ new function() { : entry.type === 'color' ? value.gradient ? exportGradient(value, item) - : value.toCss(true) // false for noAlpha, see above + : value.toCSS(true) // false for noAlpha, see above : entry.type === 'array' ? value.join(',') : entry.type === 'number' diff --git a/test/tests/Color.js b/test/tests/Color.js index 637e7403..e92ffb8b 100644 --- a/test/tests/Color.js +++ b/test/tests/Color.js @@ -16,38 +16,38 @@ test('Set named color', function() { var path = new Path(); path.fillColor = 'red'; compareColors(path.fillColor, new Color(1, 0, 0)); - equals(path.fillColor.toCss(), 'rgb(255, 0, 0)'); + equals(path.fillColor.toCSS(), 'rgb(255, 0, 0)'); }); test('Set color to hex', function() { var path = new Path(); path.fillColor = '#ff0000'; compareColors(path.fillColor, new Color(1, 0, 0)); - equals(path.fillColor.toCss(), 'rgb(255, 0, 0)'); + equals(path.fillColor.toCSS(), 'rgb(255, 0, 0)'); var path = new Path(); path.fillColor = '#f00'; compareColors(path.fillColor, new Color(1, 0, 0)); - equals(path.fillColor.toCss(), 'rgb(255, 0, 0)'); + equals(path.fillColor.toCSS(), 'rgb(255, 0, 0)'); }); test('Set color to object', function() { var path = new Path(); path.fillColor = { red: 1, green: 0, blue: 1}; compareColors(path.fillColor, new Color(1, 0, 1)); - equals(path.fillColor.toCss(), 'rgb(255, 0, 255)'); + equals(path.fillColor.toCSS(), 'rgb(255, 0, 255)'); var path = new Path(); path.fillColor = { gray: 0.2 }; compareColors(path.fillColor, new Color(0.2)); - equals(path.fillColor.toCss(), 'rgb(51, 51, 51)'); + equals(path.fillColor.toCSS(), 'rgb(51, 51, 51)'); }); test('Set color to array', function() { var path = new Path(); path.fillColor = [1, 0, 0]; compareColors(path.fillColor, new Color(1, 0, 0)); - equals(path.fillColor.toCss(), 'rgb(255, 0, 0)'); + equals(path.fillColor.toCSS(), 'rgb(255, 0, 0)'); }); test('Creating Colors', function() {