Skip to content
This repository has been archived by the owner on May 11, 2021. It is now read-only.

Commit

Permalink
Merge pull request #161332 from mauk81/jslint
Browse files Browse the repository at this point in the history
jslint
  • Loading branch information
ariabuckles committed Apr 21, 2014
2 parents 57555d3 + c45da0c commit 706493c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions requirejs.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"utils/visualizing-derivatives.js",
"utils/word-problems.js",

"main.js",
"main.js"
],
optimize: "none",
out: "genfiles/exercise-content-bundle.js",
Expand All @@ -69,8 +69,8 @@
"utils/calculator.js": true,
"utils/jquery.adhesion.js": true,
"third_party/jquery.cursor-position.js": true,
"third_party/jquery.mobile.vmouse.js": true,
"third_party/jquery.mobile.vmouse.js": true
},
wrap: true,
wrapShim: true,
})
wrapShim: true
});
8 changes: 4 additions & 4 deletions utils/time.js
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ $.extend(KhanUtil, {
"stroke-dasharray": ".",
"stroke-linecap": "round",
"stroke-opacity": dotOpacity
},
}
});

interactiveAnalogClock.graph.addMovableLineSegment({
Expand All @@ -353,7 +353,7 @@ $.extend(KhanUtil, {
"stroke-width": 10,
"stroke-linecap": "round",
"stroke-opacity": handOpacity
},
}
});

interactiveAnalogClock.graph.addMovableLineSegment({
Expand All @@ -366,7 +366,7 @@ $.extend(KhanUtil, {
"stroke-dasharray": ".",
"stroke-linecap": "round",
"stroke-opacity": dotOpacity
},
}
});

interactiveAnalogClock.graph.addMovableLineSegment({
Expand All @@ -378,7 +378,7 @@ $.extend(KhanUtil, {
"stroke-width": 10,
"stroke-linecap": "round",
"stroke-opacity": handOpacity
},
}
});

// for some reason this doesn't work, so for now, create another center point
Expand Down

0 comments on commit 706493c

Please sign in to comment.