[TWiki-Dev] [SVN] ArthurClemens r15992 - twiki/branches/TWikiRelease04x02/twikiplugins/TwistyPlugin/lib/TWiki/Plugins

[<de...@de...>]

Author: ArthurClemens
Date: 2007-12-13 14:11:42 -0600 (Thu, 13 Dec 2007)
New Revision: 15992
Trac url: http://develop.twiki.org/trac/changeset/15992

Modified:
   twiki/branches/TWikiRelease04x02/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm
Log:
Item4991: another fix to the loading order of javascript files in head

Modified: twiki/branches/TWikiRelease04x02/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm
===================================================================
--- twiki/branches/TWikiRelease04x02/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm	2007-12-13 18:03:08 UTC (rev 15991)
+++ twiki/branches/TWikiRelease04x02/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm	2007-12-13 20:11:42 UTC (rev 15992)
@@ -44,7 +44,7 @@
 # This is a free-form string you can use to "name" your own plugin version.
 # It is *not* used by the build automation tools, but is reported as part
 # of the version number in PLUGINDESCRIPTIONS.
-$RELEASE = '1.4.8';
+$RELEASE = '1.4.9';
 
 $pluginName = 'TwistyPlugin';
 
@@ -106,36 +106,14 @@
     return if $doneHeader;
     $doneHeader = 1;
 
-    eval { require TWiki::Contrib::BehaviourContrib; };
-    if ( !$@ && defined(&TWiki::Contrib::BehaviourContrib::addHEAD) ) {
-        TWiki::Contrib::BehaviourContrib::addHEAD();
-    }
-    else {
-        TWiki::Func::addToHEAD( 'BEHAVIOURCONTRIB', <<HEAD);
-<script type='text/javascript' src='%PUBURL%/%TWIKIWEB%/BehaviourContrib/behaviour.compressed.js'></script>
-HEAD
-    }
-
-    my $header = <<'EOF';
+    my $header .= <<'EOF';
 <style type="text/css" media="all">
 @import url("%PUBURL%/%TWIKIWEB%/TwistyContrib/twist.css");
 </style>
+<script type='text/javascript' src='%PUBURL%/%TWIKIWEB%/BehaviourContrib/behaviour.compressed.js'></script>
 <script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/TWikiJavascripts/twikilib.js"></script>
 <script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/TWikiJavascripts/twikiPref.js"></script>
 <script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/TWikiJavascripts/twikiCSS.js"></script>
-EOF
-
-    if ( !$@ && defined(&TWiki::Contrib::BehaviourContrib::addHEAD) ) {
-        TWiki::Contrib::BehaviourContrib::addHEAD();
-    }
-    else {
-        $header .= <<'EOF';
-<script type='text/javascript' src='%PUBURL%/%TWIKIWEB%/BehaviourContrib/behaviour.compressed.js'></script>
-HEAD
-EOF
-    }
-
-    $header .= <<'EOF';
 <script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/TwistyContrib/twist.compressed.js"></script>
 <script type="text/javascript">
 // <![CDATA[