Permalink
Browse files

Merge pull request #814 from Pensco/ui_jquery_bug

Prevent reassignment of window.$ [ci skip]
  • Loading branch information...
2 parents e4ece89 + 8cebcec commit 62887f417473e37bd8a756a5c377f2dcbead0eb5 @bbenezech bbenezech committed Nov 2, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 app/assets/javascripts/rails_admin/ui.js.coffee
@@ -1,4 +1,4 @@
-$ = jQuery.noConflict()
+$ = jQuery
$("#list input.checkbox.toggle").live "click", ->
checked_status = $(this).is(":checked")

0 comments on commit 62887f4

Please sign in to comment.