Re-introduced Raphael, and refactored the rendering code into theme-{snap,raphael}.js, for Snapsvg, and Raphael. This included changing and cleaning up the theme interface.

Author: bramp

src/diagram.js

@@ -40,8 +40,7 @@ Diagram.prototype.getActorWithAlias = function(input) {
 	} else {
 		name = alias = input;
 	}
-
-	return this.getActor(alias, name);
+    return this.getActor(alias, name);
 };
 
 Diagram.prototype.setTitle = function(title) {
@@ -145,7 +144,6 @@ Diagram.ParseError = ParseError;
 
 Diagram.parse = function(input) {
 	// TODO jison v0.4.17 changed their API slightly, so parser is no longer defined:
-
 	// Create the object to track state and deal with errors
 	parser.yy = new Diagram();
 	parser.yy.parseError = function(message, hash) {

src/main.js

@@ -40,5 +40,4 @@
 	} else {
 		root.Diagram = Diagram;
 	}
-
 }());

src/sequence-diagram.js

@@ -40,8 +40,9 @@ Diagram.prototype.drawSVG = function (container, options) {
 		throw new Error("Invalid container: " + container);
 	}
 
-	new Diagram.themes[options.theme](this, options, function(drawing) {
-		drawing.draw(div);
-	});
+	var themeFunc = new Diagram.themes[options.theme];
+    themeFunc(this, options, function(drawing) {
+        drawing.draw(div);
+    });
 
 }; // end of drawSVG

src/theme-raphael.js

@@ -27,7 +27,6 @@ if (typeof Raphael != 'undefined') {
 		return this.path("M{0},{1} L{2},{3}", x1, y1, x2, y2);
 	};
 
-
 	/******************
 	 * RaphaelTheme
 	 ******************/
@@ -170,7 +169,6 @@ if (typeof Raphael != 'undefined') {
 
 	// Take the standard RaphaelTheme and make all the lines wobbly
 	_.extend(RaphaelHandTheme.prototype, RaphaelTheme.prototype, {
-
         setup_paper : function(container) {
             RaphaelTheme.prototype.setup_paper.call(this, container);
             this._font._obj = this._paper.getFont('daniel');

src/theme-snap.js

@@ -258,7 +258,6 @@ if (typeof Snap != 'undefined') {
 
 	// Take the standard SnapTheme and make all the lines wobbly
 	_.extend(SnapHandTheme.prototype, SnapTheme.prototype, {
-
 		draw_line : function(x1, y1, x2, y2, linetype, arrowhead) {
 			var line = this._paper.path(handLine(x1, y1, x2, y2)).attr(LINE);
 			if (arrowhead !== undefined) {

src/theme.js

@@ -317,8 +317,9 @@ _.extend(BaseTheme.prototype, {
 
 	draw_title : function() {
 		var title = this._title;
-		if (title)
-			this.draw_text_box(title, title.message, TITLE_MARGIN, TITLE_PADDING, this._font, ALIGN_LEFT);
+		if (title) {
+            this.draw_text_box(title, title.message, TITLE_MARGIN, TITLE_PADDING, this._font, ALIGN_LEFT);
+        }
 	},
 
 	draw_actors : function(offsetY) {

test/test.html

@@ -53,6 +53,8 @@
         <script src="../bower_components/raphael/raphael-min.js"></script>
         <script src="../bower_components/snap.svg/dist/snap.svg.js"></script>
         <script src="../bower_components/bower-webfontloader/webfont.js"></script>
+        <script src="../bower_components/raphael/raphael-min.js"></script>
+
 
         <!--
         <script src="../build/diagram-grammar.js"></script>