Skip to content
Browse files

Merge pull request #400 from dwt/jquery-noconflict-fix

Jquery noconflict fix (bug fixes for #396)
  • Loading branch information...
2 parents 6f1d446 + 4f12dc4 commit 0f1b1ffb3e3ce35008c1548f89b463f3ae724a64 @dchester dchester committed Feb 27, 2014
Showing with 2 additions and 3 deletions.
  1. +1 −1 .jshintrc
  2. +1 −2 src/js/Rickshaw.Graph.Behavior.Series.Toggle.js
View
2 .jshintrc
@@ -7,5 +7,5 @@
"undef": true,
"browser": true,
"node": true,
- "predef": ["Rickshaw", "d3", "$", "console", "io"]
+ "predef": ["Rickshaw", "d3", "jQuery", "console", "io"]
}
View
3 src/js/Rickshaw.Graph.Behavior.Series.Toggle.js
@@ -9,8 +9,6 @@ Rickshaw.Graph.Behavior.Series.Toggle = function(args) {
this.addAnchor = function(line) {
- var $ = jQuery;
-
var anchor = document.createElement('a');
anchor.innerHTML = '✔';
anchor.classList.add('action');
@@ -77,6 +75,7 @@ Rickshaw.Graph.Behavior.Series.Toggle = function(args) {
if (this.legend) {
+ var $ = jQuery;
if (typeof $ != 'undefined' && $(this.legend.list).sortable) {
$(this.legend.list).sortable( {

0 comments on commit 0f1b1ff

Please sign in to comment.
Something went wrong with that request. Please try again.