Skip to content

Commit

Permalink
Merge pull request mrdoob#11 from emackey/fixes
Browse files Browse the repository at this point in the history
Various fixes
  • Loading branch information
jfontan committed Nov 19, 2013
2 parents 6cb9a4b + be3368d commit 534799b
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
body {

background-color: #000000;
margin: 0px;
margin: 0;
padding: 0;
overflow: hidden;

}
Expand Down Expand Up @@ -180,11 +181,9 @@
return;
}

var effect = document.createElement( 'div' );
document.body.appendChild( effect );

canvas = document.createElement( 'canvas' );
effect.appendChild( canvas );
canvas.style.display = 'block';
document.body.appendChild( canvas );

//

Expand Down Expand Up @@ -607,7 +606,7 @@
currentProgram = program;

compileButton.style.color = '#00ff00';
compileButton.textContent = 'compiled succesfully';
compileButton.textContent = 'compiled successfully';

set_save_button('visible');

Expand Down Expand Up @@ -794,12 +793,14 @@
indexEnd = error.indexOf(':', index);
if (indexEnd > index) {
lineNum = parseInt(error.substring(index, indexEnd));
index = indexEnd + 1;
indexEnd = error.indexOf("ERROR: 0:", index);
lineError = htmlEncode((indexEnd > index) ? error.substring(index, indexEnd) : error.substring(index));
line = code.setMarker(lineNum - 1, '<abbr title="' + lineError + '">' + lineNum + '</abbr>', "errorMarker");
code.setLineClass(line, "errorLine");
errorLines.push(line);
if ((!isNaN(lineNum)) && (lineNum > 0)) {
index = indexEnd + 1;
indexEnd = error.indexOf("ERROR: 0:", index);
lineError = htmlEncode((indexEnd > index) ? error.substring(index, indexEnd) : error.substring(index));
line = code.setMarker(lineNum - 1, '<abbr title="' + lineError + '">' + lineNum + '</abbr>', "errorMarker");
code.setLineClass(line, "errorLine");
errorLines.push(line);
}
}
}

Expand Down

0 comments on commit 534799b

Please sign in to comment.