From a4f13de455bac5613c3110acca72181801b1e3fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fiedler?= Date: Mon, 5 Mar 2012 22:21:28 +0000 Subject: [PATCH] "renamed getColorStopsFromGradient to parseGradient" --- src/Generate.js | 4 ++-- tests/qunit/unit/generate.js | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Generate.js b/src/Generate.js index ad7d375..df11a28 100644 --- a/src/Generate.js +++ b/src/Generate.js @@ -25,7 +25,7 @@ var reGradients = [ // ["-webkit-linear-gradient(left, rgb(206, 219, 233) 0%, rgb(170, 197, 222) 17%, rgb(97, 153, 199) 50%, rgb(58, 132, 195) 51%, rgb(65, 154, 214) 59%, rgb(75, 184, 240) 71%, rgb(58, 139, 194) 84%, rgb(38, 85, 139) 100%)", "-webkit-linear-gradient", "left", ", rgb(206, 219, 233) 0%, rgb(170, 197, 222) 17%, rgb(97, 153, 199) 50%, rgb(58, 132, 195) 51%, rgb(65, 154, 214) 59%, rgb(75, 184, 240) 71%, rgb(58, 139, 194) 84%, rgb(38, 85, 139) 100%"] // ["-webkit-gradient(linear, 0% 0, 0% 100%, from(rgb(252, 252, 252)), to(rgb(232, 232, 232)))", "-webkit-gradient", "linear", "0% 0", "0% 100%", ", from(rgb(252, 252, 252)), to(rgb(232, 232, 232))"] -_html2canvas.Generate.getColorStopsFromGradient = function(css, bounds) { +_html2canvas.Generate.parseGradient = function(css, bounds) { var gradient, i, len = reGradients.length, m1, stop, m2, m2Len, step, m3; for(i = 0; i < len; i+=1){ @@ -111,7 +111,7 @@ _html2canvas.Generate.Gradient = function(src, bounds) { canvas.width = bounds.width; canvas.height = bounds.height; - gradient = _html2canvas.Generate.getColorStopsFromGradient(src, bounds); + gradient = _html2canvas.Generate.parseGradient(src, bounds); img = new Image(); diff --git a/tests/qunit/unit/generate.js b/tests/qunit/unit/generate.js index e11c4f8..fce1706 100644 --- a/tests/qunit/unit/generate.js +++ b/tests/qunit/unit/generate.js @@ -13,9 +13,9 @@ $(function() { numDivs = {}, expected = {}; - propsToTest['Generate.getColorStopsFromGradient'] = ["backgroundImage"]; - numDivs['Generate.getColorStopsFromGradient'] = $('#backgroundGradients div').length; - expected['Generate.getColorStopsFromGradient'] = [ + propsToTest['Generate.parseGradient'] = ["backgroundImage"]; + numDivs['Generate.parseGradient'] = $('#backgroundGradients div').length; + expected['Generate.parseGradient'] = [ { type: 'linear', x0: 0, @@ -80,23 +80,23 @@ $(function() { } ]; - test('Generate.getColorStopsFromGradient', propsToTest['Generate.getColorStopsFromGradient'].length * numDivs['Generate.getColorStopsFromGradient'], function() { + test('Generate.parseGradient', propsToTest['Generate.parseGradient'].length * numDivs['Generate.parseGradient'], function() { $('#backgroundGradients div').each(function(i, el) { - $.each(propsToTest['Generate.getColorStopsFromGradient'], function(s, prop) { + $.each(propsToTest['Generate.parseGradient'], function(s, prop) { var src, gradient, exptd; src = _html2canvas.Util.getCSS(el, prop); if (/^(-webkit|-o|-moz|-ms|linear)-/.test(src)) { - gradient = _html2canvas.Generate.getColorStopsFromGradient(src, { + gradient = _html2canvas.Generate.parseGradient(src, { width: 50, height: 50 }); // compare - exptd = expected['Generate.getColorStopsFromGradient'][i]; + exptd = expected['Generate.parseGradient'][i]; QUnit.deepEqual(gradient, exptd, 'Parsed gradient; got: ' + JSON.stringify(gradient)); } else {