[TWiki-Dev] [SVN] CrawfordCurrie r15063 - in twiki/branches/MAIN/twikiplugins: BehaviourContrib/lib/TWiki/Contrib BehaviourContrib/lib/TWiki/Contrib/BehaviourContrib PatternSkin/templates TwistyPlugin/lib/TWiki/Plugins TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin

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

Author: CrawfordCurrie
Date: 2007-09-26 15:01:15 -0500 (Wed, 26 Sep 2007)
New Revision: 15063

Modified:
   twiki/branches/MAIN/twikiplugins/BehaviourContrib/lib/TWiki/Contrib/BehaviourContrib.pm
   twiki/branches/MAIN/twikiplugins/BehaviourContrib/lib/TWiki/Contrib/BehaviourContrib/MANIFEST
   twiki/branches/MAIN/twikiplugins/PatternSkin/templates/twiki.pattern.tmpl
   twiki/branches/MAIN/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm
   twiki/branches/MAIN/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin/DEPENDENCIES
Log:
Item4732: added an addHEAD method to BehaviourContrib, as it looks to be pretty widely used. Modified the other extensions that already use it to be sympathetic. No way to test TWikiAjaxPlugin, so I didn't touch that.

Modified: twiki/branches/MAIN/twikiplugins/BehaviourContrib/lib/TWiki/Contrib/BehaviourContrib/MANIFEST
===================================================================
--- twiki/branches/MAIN/twikiplugins/BehaviourContrib/lib/TWiki/Contrib/BehaviourContrib/MANIFEST	2007-09-26 19:06:49 UTC (rev 15062)
+++ twiki/branches/MAIN/twikiplugins/BehaviourContrib/lib/TWiki/Contrib/BehaviourContrib/MANIFEST	2007-09-26 20:01:15 UTC (rev 15063)
@@ -1,3 +1,4 @@
 pub/TWiki/BehaviourContrib/behaviour.js 0644
 pub/TWiki/BehaviourContrib/behaviour.compressed.js 0644
-data/TWiki/BehaviourContrib.txt 0644
\ No newline at end of file
+data/TWiki/BehaviourContrib.txt 0644
+lib/TWiki/Contrib/BehaviourContrib.pm 0644
\ No newline at end of file

Modified: twiki/branches/MAIN/twikiplugins/BehaviourContrib/lib/TWiki/Contrib/BehaviourContrib.pm
===================================================================
--- twiki/branches/MAIN/twikiplugins/BehaviourContrib/lib/TWiki/Contrib/BehaviourContrib.pm	2007-09-26 19:06:49 UTC (rev 15062)
+++ twiki/branches/MAIN/twikiplugins/BehaviourContrib/lib/TWiki/Contrib/BehaviourContrib.pm	2007-09-26 20:01:15 UTC (rev 15063)
@@ -2,4 +2,31 @@
 use vars qw( $VERSION );
 $VERSION = '$Rev$';
 $RELEASE = '1.2.3';
-1;
\ No newline at end of file
+
+=begin twiki
+
+---+++ TWiki::Contrib::BehaviourContrib::addHEAD()
+
+This function will automatically add the headers for the contrib to
+the page being rendered. It is intended for use from Plugins and
+other extensions. For example:
+
+<verbatim>
+sub commonTagsHandler {
+  ....
+  require TWiki::Contrib::BehaviourContrib;
+  TWiki::Contrib::BehaviourContrib::addHEAD();
+  ....
+</verbatim>
+
+=cut
+
+sub addHEAD {
+    my $base = '%PUBURLPATH%/%SYSTEMWEB%/BehaviourContrib';
+    my $head = <<HERE;
+<script type='text/javascript' src='$base/behaviour.compressed.js'></script>
+HERE
+    TWiki::Func::addToHEAD( 'BEHAVIOURCONTRIB', $head );
+}
+
+1;

Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/twiki.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/twiki.pattern.tmpl	2007-09-26 19:06:49 UTC (rev 15062)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/twiki.pattern.tmpl	2007-09-26 20:01:15 UTC (rev 15063)
@@ -37,7 +37,7 @@
 %TMPL:P{"twikistyle"}%
 </head>%TMPL:END%
 
-%TMPL:DEF{"script:skinbase"}%<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/BehaviourContrib/behaviour.compressed.js"></script>
+%TMPL:DEF{"script:skinbase"}%<!--BEHAVIOURCONTRIB--><script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/BehaviourContrib/behaviour.compressed.js"></script>
 <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/TWikiJavascripts/twikilib.js"></script>
 <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/TWikiJavascripts/twikiWindow.js"></script>
 <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/TWikiJavascripts/twikiEvent.js"></script>

Modified: twiki/branches/MAIN/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin/DEPENDENCIES
===================================================================
--- twiki/branches/MAIN/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin/DEPENDENCIES	2007-09-26 19:06:49 UTC (rev 15062)
+++ twiki/branches/MAIN/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin/DEPENDENCIES	2007-09-26 20:01:15 UTC (rev 15063)
@@ -1 +1,2 @@
 TWiki::Contrib::TwistyContrib,>=1.4.1,perl,Required. Twisty javascript library
+TWiki::Contrib::BehaviourContrib,>=0,perl,Javascript module

Modified: twiki/branches/MAIN/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm
===================================================================
--- twiki/branches/MAIN/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm	2007-09-26 19:06:49 UTC (rev 15062)
+++ twiki/branches/MAIN/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm	2007-09-26 20:01:15 UTC (rev 15063)
@@ -106,6 +106,17 @@
     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%/%SYSTEMWEB%/BehaviourContrib/behaviour.compressed.js'></script>
+HEAD
+    }
+
     my $header = <<'EOF';
 <style type="text/css" media="all">
 @import url("%PUBURL%/%SYSTEMWEB%/TwistyContrib/twist.css");
@@ -113,7 +124,6 @@
 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/TWikiJavascripts/twikilib.js"></script>
 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/TWikiJavascripts/twikiPref.js"></script>
 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/TWikiJavascripts/twikiCSS.js"></script>
-<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/BehaviourContrib/behaviour.compressed.js"></script>
 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/TwistyContrib/twist.compressed.js"></script>
 <script type="text/javascript">
 // <![CDATA[