From 0e514f78109ad8dd6d362ec22ae4191f0760cec1 Mon Sep 17 00:00:00 2001 From: Eric Rowell Date: Sat, 24 Nov 2012 00:05:37 -0800 Subject: [PATCH] fixed up text path draw func --- src/shapes/TextPath.js | 2 +- tests/dataUrls/nodeShapeTypeSelector.js | 1 + tests/html/unitTests.html | 1 + tests/js/unit/containerTests.js | 8 +++++++- 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 tests/dataUrls/nodeShapeTypeSelector.js diff --git a/src/shapes/TextPath.js b/src/shapes/TextPath.js index 6478b7b1..b9d91c89 100644 --- a/src/shapes/TextPath.js +++ b/src/shapes/TextPath.js @@ -70,7 +70,7 @@ Kinetic.TextPath.prototype = { context.translate(p0.x, p0.y); context.rotate(glyphInfo[i].rotation); - this.fillStrokeText(context); + this.fillStrokeText(context, glyphInfo[i].text); context.restore(); diff --git a/tests/dataUrls/nodeShapeTypeSelector.js b/tests/dataUrls/nodeShapeTypeSelector.js new file mode 100644 index 00000000..2b3c3f55 --- /dev/null +++ b/tests/dataUrls/nodeShapeTypeSelector.js @@ -0,0 +1 @@ +var nodeShapeTypeSelector = 'data:image/png;base64,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'; diff --git a/tests/html/unitTests.html b/tests/html/unitTests.html index bf54f400..49cea2de 100644 --- a/tests/html/unitTests.html +++ b/tests/html/unitTests.html @@ -12,6 +12,7 @@ + diff --git a/tests/js/unit/containerTests.js b/tests/js/unit/containerTests.js index f74c0e07..bf4e484d 100644 --- a/tests/js/unit/containerTests.js +++ b/tests/js/unit/containerTests.js @@ -647,7 +647,7 @@ Test.Modules.CONTAINER = { test(group.get('Group').length === 0, 'group should have 0 groups'); }, - 'node and shape type selector': function(containerId) { + '*node and shape type selector': function(containerId) { var stage = new Kinetic.Stage({ container: containerId, width: 578, @@ -781,6 +781,12 @@ Test.Modules.CONTAINER = { test(group.get('Group').length === 0, 'group should have 0 groups'); test(group.get('Rect').length === 1, 'group should have 1 rects'); test(group.get('Circle').length === 1, 'gropu should have 1 circles'); + + stage.toDataURL({ + callback: function(dataUrl) { + test(dataUrl === nodeShapeTypeSelector, 'problem with node and shape type selector render.'); + } + }); }, 'remove shape': function(containerId) { var stage = new Kinetic.Stage({