Item8531:

   * removing derived files
   * fixing NoConflict to be added to the body, not the head



git-svn-id: http://svn.foswiki.org/trunk@6360 0b4bb1d4-4e5a-0410-9cc4-b2b747904278

JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugin.pm

@@ -109,20 +109,20 @@ sub init {
     $footer .= "<script type='text/javascript' src='$this->{puburl}/$js'></script>\n";
   }
 
-  # dependencies
-  my @headerDependency = ('JQUERYPLUGIN::FOSWIKI'); # jquery.foswiki is in there by default
+  # gather dependencies
+  my @dependencies = ('JQUERYPLUGIN::FOSWIKI'); # jquery.foswiki is in there by default
   foreach my $dep (@{$this->{dependencies}}) {
     if ($dep =~ /^JQUERYPLUGIN/) {
-      push @headerDependency, $dep;
+      push @dependencies, $dep;
     } else {
       Foswiki::Plugins::JQueryPlugin::Plugins::createPlugin($dep);
-      push @headerDependency, 'JQUERYPLUGIN::'.uc($dep);
+      push @dependencies, 'JQUERYPLUGIN::'.uc($dep);
     }
   }
 
-  Foswiki::Func::addToZone('head', "JQUERYPLUGIN::".uc($this->{name}), $header, join(', ', @headerDependency))
+  Foswiki::Func::addToZone('head', "JQUERYPLUGIN::".uc($this->{name}), $header, join(', ', @dependencies))
     if $header;
-  Foswiki::Func::addToZone('body', "JQUERYPLUGIN::".uc($this->{name}), $footer, join(', ', @headerDependency))
+  Foswiki::Func::addToZone('body', "JQUERYPLUGIN::".uc($this->{name}), $footer, join(', ', @dependencies))
     if $footer;
 
   return 1;

JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugins.pm

@@ -54,17 +54,13 @@ sub init () {
 
   # load jquery
   my $jQuery = $Foswiki::cfg{JQueryPlugin}{JQueryVersion} || 'jquery-1.3.2';
-
-  my $footer = "<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/$jQuery.js'></script>\n";
+  my $footer = "<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/$jQuery.js'></script>";
 
   # switch on noconflict mode
-  my $header = '';
-  if ($Foswiki::cfg{JQueryPlugin}{NoConflict}) {
-    $header .= "<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/jquery.noconflict.js'></script>\n";
-  }
+  $footer .= "\n<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/jquery.noconflict.js'></script>"
+    if $Foswiki::cfg{JQueryPlugin}{NoConflict};
 
-  Foswiki::Func::addToZone('head', 'JQUERYPLUGIN', "\n".$header) if $header;
-  Foswiki::Func::addToZone('body', 'JQUERYPLUGIN', "\n".$footer);
+  Foswiki::Func::addToZone('body', 'JQUERYPLUGIN', $footer);
 
   # initial plugins
   createPlugin('Foswiki'); # this one is needed anyway