Permalink
Browse files

Merge remote-tracking branch 'mrdoob/dev'

  • Loading branch information...
2 parents 4becf19 + 262d992 commit 45d870649dd84d863ef68e2b8c4e896e3b408342 @zz85 zz85 committed Apr 16, 2012
Showing with 15 additions and 17 deletions.
  1. +6 −6 build/Three.js
  2. +6 −6 build/custom/ThreeExtras.js
  3. +1 −2 gui/js/Code.js
  4. +2 −3 src/extras/controls/FirstPersonControls.js
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -27,7 +27,6 @@ var Code = function () {
temp.innerHTML = _codegen( true );
temp = temp.firstChild.nodeValue;
temp = temp.replace("js/Three.js", "../build/Three.js");
- temp = temp.replace("js/RequestAnimationFrame.js", "../examples/js/RequestAnimationFrame.js");
console.log('test', temp);
@@ -119,7 +118,7 @@ var Code = function () {
if ( html ) {
- string = '<!doctype html>\n<html>\n\t<body>\n\t\t<script src=\"js/Three.js\"></script>\n\t\t<script src=\"js/RequestAnimationFrame.js\"></script>\n\t\t<script>\n' + ( '\n' + string ).replace( /\n/gi, '\n\t\t\t' ) + '\n\n\t\t</script>\n\t</body>\n</html>';
+ string = '<!doctype html>\n<html>\n\t<body>\n\t\t<script src=\"js/Three.js\"></script>\n\t\t<script>\n' + ( '\n' + string ).replace( /\n/gi, '\n\t\t\t' ) + '\n\n\t\t</script>\n\t</body>\n</html>';
}
Oops, something went wrong.

0 comments on commit 45d8706

Please sign in to comment.