corrected parsing strokeWidth with 'px'

kityan · Sep 7, 2014 · 4ff8139 · 4ff8139
1 parent f65be1f
commit 4ff8139
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/morfana.js b/morfana.js
@@ -30,12 +30,12 @@ var config = {}	;
 
 // set default values
 configure({
-	autoStart: true, 			// start Morfana after loading complete
-	freezeWord: false, 			// add vertical padding to word's span or "freeze" word in its inital place
-	strokeWidth: 1.5,			//
+	autoStart: true, 		// start Morfana after loading complete
+	freezeWord: false, 		// add vertical padding to word's span or "freeze" word in its inital place
+	strokeWidth: 1.5,		// px
 	stroke: 'rgb(150,150,150)',
 	disablePointerEvents: true,	// add pointer-events: none to each svg
-	zeroEndingWidthFactor: 0.43
+	zeroEndingWidthFactor: 0.43	// now: width of "zero-ending" = data.height * zeroEndingWidthFactor + 9
 });
 
 // Queue - array for processing words with setInterval()
@@ -574,6 +574,7 @@ function doQueue() {
  */
 function configure(obj) {
 	$.extend(true, config, obj);
+	config['strokeWidth'] = parseFloat(config['strokeWidth']);
 }
 
 

diff --git a/tests/game.html b/tests/game.html
@@ -4,7 +4,7 @@
 <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
 <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/rangy/1.2.3/rangy-core.js"></script>
 <script type="text/javascript" src="./../morfana.js"></script>
-<script type="text/x-morfana-config">Morfana.configure({strokeWidth: 1.5});</script>
+<script type="text/x-morfana-config">Morfana.configure({strokeWidth: 3, zeroEndingWidthFactor: 0.53});</script>
 <script type="text/javascript">Morfana.draw();</script>
 <style>
 body