Fixed jquery_loader, removed some ;'s

Restream · Oct 8, 2012 · c5672f0 · c5672f0
1 parent 95c352d
commit c5672f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/assets/javascripts/jquery_loader.js b/assets/javascripts/jquery_loader.js
@@ -1,7 +1,3 @@
 if(typeof jQuery == 'undefined') {
   document.write('<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js"></script>')
-  document.write('<script type="text/javascript">jQuery.noConflict();</script>')
 }
-else {
-  jQuery.noConflict()
-}
diff --git a/lib/tagging_plugin/tagging_hooks.rb b/lib/tagging_plugin/tagging_hooks.rb
@@ -32,10 +32,10 @@ def view_layouts_base_html_head(context = {})
           result = <<-TAGS
             #{javascript_include_tag 'jquery_loader', :plugin => 'redmine_tagging'}
             <script type="text/javascript">
-              var $j = jQuery.noConflict();
+              var $j = jQuery.noConflict()
               $j(function() {
                 $j('#sidebar').append("#{escape_javascript(tag_cloud)}")
-              });
+              })
             </script>
           TAGS
         else
@@ -93,10 +93,10 @@ def view_issues_form_details_bottom(context={ })
         ac = ac.collect{|tag| "'#{escape_javascript(tag.gsub(/^#/, ''))}'"}.join(', ')
         tags += <<-generatedscript
           <script type="text/javascript">
-            var $j = jQuery.noConflict();
+            var $j = jQuery.noConflict()
             $j(document).ready(function() {
-              $j('#issue_tags').tagSuggest({ tags: [#{ac}] });
-            });
+              $j('#issue_tags').tagSuggest({ tags: [#{ac}] })
+            })
           </script>
         generatedscript