Permalink
Browse files

fixing merge conflicts part II

  • Loading branch information...
1 parent 9667caf commit 853771f60bcef918526b4670875c7ad607e5ed73 @mwittels mwittels committed Jul 9, 2012
Showing with 52 additions and 63 deletions.
  1. +52 −63 exercises/geometry_proofs_1.html
@@ -255,81 +255,70 @@
});
for(var line in graph.congruency.lines){
- for(var line2 in graph.congruency.lines){
-
- $(function(){
- var $statement = $("."+line+"-"+line2);
- var firstLine = graph.congruency.lines[line];
- var secondLine = graph.congruency.lines[line2];
-
- if($statement.length > 0){
- $statement.bind("vmouseover", function(event) {
- firstLine.setHighlighted({
- stroke: ORANGE,
- "stroke-width": 3
- });
- secondLine.setHighlighted({
- stroke: BLUE,
- "stroke-width": 3
- });
- $(this).bind("vmouseout", function(event) {
- firstLine.unsetHighlighted({
- stroke: "black",
- "stroke-width": 2
- });
- secondLine.unsetHighlighted({
- stroke: "black",
- "stroke-width": 2
- });
- });
+ for(var line2 in graph.congruency.lines){
+
+ $(function(){
+ var $statement = $("."+line+"-"+line2);
+ var firstLine = graph.congruency.lines[line];
+ var secondLine = graph.congruency.lines[line2];
+
+ if($statement.length > 0){
+ $statement.bind("vmouseover", function(event) {
+ firstLine.setHighlighted({
+ stroke: ORANGE,
+ "stroke-width": 3
+ });
+ secondLine.setHighlighted({
+ stroke: BLUE,
+ "stroke-width": 3
+ });
+ $(this).bind("vmouseout", function(event) {
+ firstLine.unsetHighlighted({
+ stroke: "black",
+ "stroke-width": 2
});
secondLine.unsetHighlighted({
stroke: "black",
"stroke-width": 2
});
});
});
-
+ secondLine.unsetHighlighted({
+ stroke: "black",
+ "stroke-width": 2
+ });
}
});
}
}
- for(var angle in graph.congruency.angles){
- for(var angle2 in graph.congruency.angles){
- $(function(){
- var $statement = $("."+angle+"-"+angle2);
- var firstAngle = graph.congruency.angles[angle];
- var secondAngle = graph.congruency.angles[angle2];
-
- if($statement.length > 0){
- $statement.bind("vmouseover", function(event) {
- var firstState = firstAngle.state;
- var secondState = secondAngle.state;
- var maxState = Math.max(firstState,secondState);
-
- firstAngle.setHighlighted({
- stroke: ORANGE,
- "stroke-width": 3
- });
- secondAngle.setHighlighted({
- stroke: BLUE,
- "stroke-width": 3
- });
- firstAngle.setState(maxState > 0 ? maxState : 1);
- secondAngle.setState(maxState > 0 ? maxState : 1);
- $(this).bind("vmouseout", function(event) {
- firstAngle.unsetHighlighted({
- stroke: "black",
- "stroke-width": 2
- });
- secondAngle.unsetHighlighted({
- stroke: "black",
- "stroke-width": 2
- });
- firstAngle.setState(firstState);
- secondAngle.setState(secondState);
- });
+ for(var angle in graph.congruency.angles){
+ for(var angle2 in graph.congruency.angles){
+ $(function(){
+ var $statement = $("."+angle+"-"+angle2);
+ var firstAngle = graph.congruency.angles[angle];
+ var secondAngle = graph.congruency.angles[angle2];
+
+ if($statement.length > 0){
+ $statement.bind("vmouseover", function(event) {
+ var firstState = firstAngle.state;
+ var secondState = secondAngle.state;
+ var maxState = Math.max(firstState,secondState);
+
+ firstAngle.setHighlighted({
+ stroke: ORANGE,
+ "stroke-width": 3
+ });
+ secondAngle.setHighlighted({
+ stroke: BLUE,
+ "stroke-width": 3
+ });
+ firstAngle.setState(maxState > 0 ? maxState : 1);
+ secondAngle.setState(maxState > 0 ? maxState : 1);
+ $(this).bind("vmouseout", function(event) {
+ firstAngle.unsetHighlighted({
+ stroke: "black",
+ "stroke-width": 2
});
secondAngle.unsetHighlighted({
stroke: "black",

0 comments on commit 853771f

Please sign in to comment.