Merge branch 'master' of github.com:scriptographer/paper.js

build/build.sh

@@ -33,8 +33,3 @@ fi
 
 ./preprocess.sh ../src/paper.js ../out/paper.js "-DBROWSER" $MODE
 ./preprocess.sh ../src/paper.js ../out/paper-server.js "-DSERVER" $MODE
-
-# Generate documentation
-# TODO: switch this on with a flag
-cd jsdoc-toolkit
-java -jar jsrun.jar app/run.js -c=conf/paperjs.conf

build/docs.sh

@@ -0,0 +1,16 @@
+# Paper.js
+#
+# This file is part of Paper.js, a JavaScript Vector Graphics Library,
+# based on Scriptographer.org and designed to be largely API compatible.
+# http://scriptographer.org/
+#
+# Copyright (c) 2011, Juerg Lehni & Jonathan Puckey
+# http://lehni.org/ & http://jonathanpuckey.com/
+#
+# All rights reserved. See LICENSE file for details.
+
+# Generate documentation
+
+cd jsdoc-toolkit
+java -jar jsrun.jar app/run.js -c=conf/paperjs.conf
+cd ..

src/project/Project.js

@@ -89,8 +89,8 @@ var Project = this.Project = Base.extend({
 		return this._currentStyle;
 	},
 
-	// TODO: style selected items with the style:
 	setCurrentStyle: function(style) {
+		// TODO: style selected items with the style:
 		this._currentStyle.initialize(style);
 	},