Menu
▾
▴
[TWiki-Dev] [SVN] ArthurClemens r15993 - in twiki/branches/MAIN/twikiplugins: TwistyBundleTWiki04x00x05/data/TWiki TwistyBundleTWiki04x00x05/lib/TWiki/Contrib TwistyBundleTWiki04x00x05/lib/TWiki/Plugins TwistyBundleTWiki04x01/data/TWiki TwistyBundleTWiki04x01/lib/TWiki/Contrib TwistyBundleTWiki04x01/lib/TWiki/Plugins TwistyBundleTWiki04x02/data/TWiki TwistyBundleTWiki04x02/lib/TWiki/Contrib TwistyBundleTWiki04x02/lib/TWiki/Plugins TwistyPlugin/lib/TWiki/Plugins
Author: ArthurClemens Date: 2007-12-13 14:11:46 -0600 (Thu, 13 Dec 2007) New Revision: 15993 Trac url: http://develop.twiki.org/trac/changeset/15993 Modified: twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x00x05/data/TWiki/TwistyBundleTWiki04x00x05.txt twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x00x05/lib/TWiki/Contrib/TwistyBundleTWiki04x00x05.pm twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x00x05/lib/TWiki/Plugins/TwistyPlugin.pm twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x01/data/TWiki/TwistyBundleTWiki04x01.txt twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x01/lib/TWiki/Contrib/TwistyBundleTWiki04x01.pm twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x01/lib/TWiki/Plugins/TwistyPlugin.pm twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x02/data/TWiki/TwistyBundleTWiki04x02.txt twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x02/lib/TWiki/Contrib/TwistyBundleTWiki04x02.pm twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x02/lib/TWiki/Plugins/TwistyPlugin.pm twiki/branches/MAIN/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm Log: Item4991: another fix to the loading order of javascript files in head Modified: twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x00x05/data/TWiki/TwistyBundleTWiki04x00x05.txt =================================================================== --- twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x00x05/data/TWiki/TwistyBundleTWiki04x00x05.txt 2007-12-13 20:11:42 UTC (rev 15992) +++ twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x00x05/data/TWiki/TwistyBundleTWiki04x00x05.txt 2007-12-13 20:11:46 UTC (rev 15993) @@ -24,8 +24,9 @@ | License: | See individual extension topics | | Version: | %$VERSION% | | Dependencies: | %$DEPENDENCIES% | -| Contrib Version: | 1.0.3 (24 Nov 2007) | +| Contrib Version: | 1.0.4 (13 Dec 2007) | | Change History: | <!-- specify latest version first --> | +| 13 Dec 2007 | 1.0.4 Update !TwistyPlugin 1.4.9. | | 24 Nov 2007 | 1.0.1 Update !TwistyPlugin 1.4.8. | | 19 Nov 2007 | 1.0 First version (!TwistyPlugin 1.4.5). | | Home: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC% | Modified: twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x00x05/lib/TWiki/Contrib/TwistyBundleTWiki04x00x05.pm =================================================================== --- twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x00x05/lib/TWiki/Contrib/TwistyBundleTWiki04x00x05.pm 2007-12-13 20:11:42 UTC (rev 15992) +++ twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x00x05/lib/TWiki/Contrib/TwistyBundleTWiki04x00x05.pm 2007-12-13 20:11:46 UTC (rev 15993) @@ -9,7 +9,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.0.3'; +$RELEASE = '1.0.4'; 1; Modified: twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x00x05/lib/TWiki/Plugins/TwistyPlugin.pm =================================================================== --- twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x00x05/lib/TWiki/Plugins/TwistyPlugin.pm 2007-12-13 20:11:42 UTC (rev 15992) +++ twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x00x05/lib/TWiki/Plugins/TwistyPlugin.pm 2007-12-13 20:11:46 UTC (rev 15993) @@ -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[ Modified: twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x01/data/TWiki/TwistyBundleTWiki04x01.txt =================================================================== --- twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x01/data/TWiki/TwistyBundleTWiki04x01.txt 2007-12-13 20:11:42 UTC (rev 15992) +++ twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x01/data/TWiki/TwistyBundleTWiki04x01.txt 2007-12-13 20:11:46 UTC (rev 15993) @@ -24,8 +24,9 @@ | License: | See individual extension topics | | Version: | %$VERSION% | | Dependencies: | %$DEPENDENCIES% | -| Contrib Version: | 1.0.3 (24 Nov 2007) | +| Contrib Version: | 1.0.4 (13 Dec 2007) | | Change History: | <!-- specify latest version first --> | +| 13 Dec 2007 | 1.0.4 Update !TwistyPlugin 1.4.9. | | 24 Nov 2007 | 1.0.1 Update !TwistyPlugin 1.4.8. | | 19 Nov 2007 | 1.0 First version (!TwistyPlugin 1.4.5). | | Home: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC% | Modified: twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x01/lib/TWiki/Contrib/TwistyBundleTWiki04x01.pm =================================================================== --- twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x01/lib/TWiki/Contrib/TwistyBundleTWiki04x01.pm 2007-12-13 20:11:42 UTC (rev 15992) +++ twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x01/lib/TWiki/Contrib/TwistyBundleTWiki04x01.pm 2007-12-13 20:11:46 UTC (rev 15993) @@ -9,7 +9,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.0.3'; +$RELEASE = '1.0.4'; 1; Modified: twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x01/lib/TWiki/Plugins/TwistyPlugin.pm =================================================================== --- twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x01/lib/TWiki/Plugins/TwistyPlugin.pm 2007-12-13 20:11:42 UTC (rev 15992) +++ twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x01/lib/TWiki/Plugins/TwistyPlugin.pm 2007-12-13 20:11:46 UTC (rev 15993) @@ -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[ Modified: twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x02/data/TWiki/TwistyBundleTWiki04x02.txt =================================================================== --- twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x02/data/TWiki/TwistyBundleTWiki04x02.txt 2007-12-13 20:11:42 UTC (rev 15992) +++ twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x02/data/TWiki/TwistyBundleTWiki04x02.txt 2007-12-13 20:11:46 UTC (rev 15993) @@ -23,8 +23,9 @@ | License: | See individual extension topics | | Version: | %$VERSION% | | Dependencies: | %$DEPENDENCIES% | -| Contrib Version: | 1.0.3 (24 Nov 2007) | +| Contrib Version: | 1.0.4 (13 Dec 2007) | | Change History: | <!-- specify latest version first --> | +| 13 Dec 2007 | 1.0.4 Update !TwistyPlugin 1.4.9. | | 24 Nov 2007 | 1.0.1 Update !TwistyPlugin 1.4.8. | | 19 Nov 2007 | 1.0 First version (!TwistyPlugin 1.4.5). | | Home: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC% | Modified: twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x02/lib/TWiki/Contrib/TwistyBundleTWiki04x02.pm =================================================================== --- twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x02/lib/TWiki/Contrib/TwistyBundleTWiki04x02.pm 2007-12-13 20:11:42 UTC (rev 15992) +++ twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x02/lib/TWiki/Contrib/TwistyBundleTWiki04x02.pm 2007-12-13 20:11:46 UTC (rev 15993) @@ -9,7 +9,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.0.3'; +$RELEASE = '1.0.4'; 1; Modified: twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x02/lib/TWiki/Plugins/TwistyPlugin.pm =================================================================== --- twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x02/lib/TWiki/Plugins/TwistyPlugin.pm 2007-12-13 20:11:42 UTC (rev 15992) +++ twiki/branches/MAIN/twikiplugins/TwistyBundleTWiki04x02/lib/TWiki/Plugins/TwistyPlugin.pm 2007-12-13 20:11:46 UTC (rev 15993) @@ -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[ Modified: twiki/branches/MAIN/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm =================================================================== --- twiki/branches/MAIN/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm 2007-12-13 20:11:42 UTC (rev 15992) +++ twiki/branches/MAIN/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm 2007-12-13 20:11:46 UTC (rev 15993) @@ -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[ |