Allow "top", "bottom", "center".

uxebu · Jan 23, 2013 · ace4cae · ace4cae
1 parent 73d2e58
commit ace4cae
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/src/renderer/svg/svg.js b/src/renderer/svg/svg.js
@@ -91,6 +91,12 @@ define([
     'mousewheel'
   ];
 
+  var textOriginMap = {
+    top: 'hanging',
+    center: 'middle',
+    bottom: 'auto'
+  };
+
   // tools
   var isArray = tools.isArray;
 
@@ -656,8 +662,8 @@ define([
     setStyle(style, 'textAnchor', 'start');
 
     if (textOrigin != null) {
-      setStyle(style, 'alignmentBaseline', textOrigin === 'top' ? 'hanging' : '');
+      setStyle(style, 'alignmentBaseline', textOriginMap[textOrigin]);
-      setStyle(style, 'dominantBaseline', textOrigin === 'top' ? 'hanging' : '');
+      setStyle(style, 'dominantBaseline', textOriginMap[textOrigin]);
     }
 
   };

diff --git a/test/renderer/svg-spec.js b/test/renderer/svg-spec.js
@@ -134,6 +134,40 @@ define([
       });
     });
 
+    describe('drawText', function() {
+      var textElement;
+      beforeEach(function() {
+        textElement = { style: {} };
+      });
+      it('is a function', function() {
+        expect(typeof createSvgRenderer().drawText).toBe('function');
+      });
+      it('sets baseline-alignment=hanging when attr.textOrigin=top', function() {
+        createSvgRenderer().drawText(textElement, { attributes: { textOrigin: 'top' } });
+        expect(textElement.style.alignmentBaseline).toBe('hanging');
+      });
+      it('sets dominant-alignment=hanging when attr.textOrigin=top', function() {
+        createSvgRenderer().drawText(textElement, { attributes: { textOrigin: 'top' } });
+        expect(textElement.style.dominantBaseline).toBe('hanging');
+      });
+      it('sets baseline-alignment=middle when attr.textOrigin=center', function() {
+        createSvgRenderer().drawText(textElement, { attributes: { textOrigin: 'center' } });
+        expect(textElement.style.alignmentBaseline).toBe('middle');
+      });
+      it('sets dominant-alignment=middle when attr.textOrigin=center', function() {
+        createSvgRenderer().drawText(textElement, { attributes: { textOrigin: 'center' } });
+        expect(textElement.style.dominantBaseline).toBe('middle');
+      });
+      it('sets baseline-alignment=auto when attr.textOrigin=center', function() {
+        createSvgRenderer().drawText(textElement, { attributes: { textOrigin: 'bottom' } });
+        expect(textElement.style.alignmentBaseline).toBe('auto');
+      });
+      it('sets dominant-alignment=auto when attr.textOrigin=center', function() {
+        createSvgRenderer().drawText(textElement, { attributes: { textOrigin: 'bottom' } });
+        expect(textElement.style.dominantBaseline).toBe('auto');
+      });
+    });
+
     describe('Frame logging', function() {
       function createSvgRenderer(fpsLog, getTime) {
         var renderer = new SvgRenderer(createFakeDomNode(), 1, 1, {fpsLog: fpsLog});