Permalink
Browse files

Fix noConflict warning!

  • Loading branch information...
1 parent b9de869 commit a3a721bf58ae1d67f07d8a5feffdc857ae66246c @nakajima committed Jun 20, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 app/views/bookmarklets/edit.html.erb
@@ -32,7 +32,7 @@
<div id="inject-label">
<%= f.check_box :jquery, :onchange => '$("jquery-warning").toggle()' %>
<%= f.label :jquery, 'Inject jQuery <span>Allows you to use jQuery in your bookmarklet, even if it is not loaded on the page.', :id => 'inject-label' %>
- <p id="jquery-warning" style="display:none;">
+ <p id="jquery-warning" style="display:<%= @bookmarklet.jquery? ? 'block' : 'none' %>;">
jQuery will automatically be set to <code>noConflict</code> mode,
meaning any references to <code>$</code> must be replaced by
<code>jQuery</code>.

0 comments on commit a3a721b

Please sign in to comment.