[TWiki-Dev] [SVN] GilmarSantosJr r15366 - in twiki/scratch/TWikiStandAlone: . lib/TWiki/Engine twi

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Author: GilmarSantosJr
Date: 2007-10-20 20:03:32 -0500 (Sat, 20 Oct 2007)
New Revision: 15366

Modified:
   twiki/scratch/TWikiStandAlone/
   twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/CGI.pm
   twiki/scratch/TWikiStandAlone/twikiplugins/BehaviourContrib/data/TWiki/BehaviourContrib.txt
   twiki/scratch/TWikiStandAlone/twikiplugins/TinyMCEPlugin/lib/TWiki/Plugins/TinyMCEPlugin.pm
   twiki/scratch/TWikiStandAlone/twikiplugins/TinyMCEPlugin/lib/TWiki/Plugins/TinyMCEPlugin/DEPENDENCIES
   twiki/scratch/TWikiStandAlone/twikiplugins/TwistyContrib/data/TWiki/TwistyContrib.txt
   twiki/scratch/TWikiStandAlone/twikiplugins/TwistyContrib/lib/TWiki/Contrib/TwistyContrib/MANIFEST
Log:
Item4662: TWikiStandAlone
   * Fixed "first-post parameter persistence" in CGI engine (more details in Bugs:Item4662)
   * Merged from MAIN, rev 15364


Property changes on: twiki/scratch/TWikiStandAlone
___________________________________________________________________
Name: svk:merge
   - 1677e817-7831-46d5-99df-29670531d6f3:/local/MAIN:761
6fe119f3-adff-0310-8d65-eaf721ad8dcd:/local/twiki:13731
a00a5322-12db-0310-a70b-8735589c885e:/branches/TWikiRelease04x00:11417
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/DEVELOP:8671
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/MAIN:15361
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/TWikiRelease04x00:11683
a00a5322-12db-0310-a70b-8735589c885e:/twiki/trunk:1767
da601d30-f818-0410-9a57-a822fe5a4a93:/local/terceiro/TopicTranslationsPlugin:10084
db3699c8-1c30-0410-a7fc-e1c66c7c2fc9:/twiki/enhanced-diff:1757
   + 1677e817-7831-46d5-99df-29670531d6f3:/local/MAIN:761
6fe119f3-adff-0310-8d65-eaf721ad8dcd:/local/twiki:13731
a00a5322-12db-0310-a70b-8735589c885e:/branches/TWikiRelease04x00:11417
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/DEVELOP:8671
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/MAIN:15364
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/TWikiRelease04x00:11683
a00a5322-12db-0310-a70b-8735589c885e:/twiki/trunk:1767
da601d30-f818-0410-9a57-a822fe5a4a93:/local/terceiro/TopicTranslationsPlugin:10084
db3699c8-1c30-0410-a7fc-e1c66c7c2fc9:/twiki/enhanced-diff:1757

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/CGI.pm
===================================================================

--- twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/CGI.pm	2007-10-20 14:37:46 UTC (rev 15365)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/CGI.pm	2007-10-21 01:03:32 UTC (rev 15366)
@@ -45,6 +45,7 @@
 
 sub prepareRequest {
     my ($this, $req, %args) = @_;
+    delete $this->{env};
     $this->{env} = $args{env} if $args{env};
 }
 
@@ -68,6 +69,7 @@
 sub prepareQueryParameters {
     my ( $this, $req ) = @_;
     local(*ENV) = $this->{env} || \%ENV;
+    
     $this->SUPER::prepareQueryParameters($req, $ENV{QUERY_STRING})
         if $ENV{QUERY_STRING};
 }
@@ -107,6 +109,10 @@
 
 sub prepareBody {
     my ( $this, $req ) = @_;
+    local (*ENV) = $this->{env} || \%ENV;
+   
+    return unless $ENV{CONTENT_LENGTH};
+    CGI::initialize_globals();
     my $cgi = new CGI();
     my $err = $cgi->cgi_error;
     throw TWiki::EngineException($1, $2)
@@ -116,6 +122,9 @@
 
 sub prepareBodyParameters {
     my ( $this, $req ) = @_;
+    local (*ENV) = $this->{env} || \%ENV;
+    
+    return unless $ENV{CONTENT_LENGTH};
     my %p = $this->{cgi}->Vars;
     while ( my ( $key, $value ) = each %p ) {
         $req->bodyParam( -name => $key, -value => $value );
@@ -125,7 +134,9 @@
 
 sub prepareUploads {
     my ( $this, $req ) = @_;
+    local (*ENV) = $this->{env} || \%ENV;
 
+    return unless $ENV{CONTENT_LENGTH};
     my %uploads;
     foreach my $key ( keys %{ $this->{uploads} } ) {
         my $fname = $this->{cgi}->param($key);
@@ -141,6 +152,8 @@
 
 sub finalizeUploads {
     my ( $this, $res, $req ) = @_;
+    local (*ENV) = $this->{env} || \%ENV;
+
     $req->delete($_) foreach keys %{ $req->uploads };
     undef $_[0]->{cgi};
 }

Modified: twiki/scratch/TWikiStandAlone/twikiplugins/BehaviourContrib/data/TWiki/BehaviourContrib.txt
===================================================================
--- twiki/scratch/TWikiStandAlone/twikiplugins/BehaviourContrib/data/TWiki/BehaviourContrib.txt	2007-10-20 14:37:46 UTC (rev 15365)
+++ twiki/scratch/TWikiStandAlone/twikiplugins/BehaviourContrib/data/TWiki/BehaviourContrib.txt	2007-10-21 01:03:32 UTC (rev 15366)
@@ -62,7 +62,7 @@
 
 <blockquote>
 <verbatim>
-<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/BehaviourContrib/behaviour.compressed.js"></script>
+<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/BehaviourContrib/behaviour.js"></script>
 </verbatim>
 </blockquote>
 
@@ -266,32 +266,31 @@
    * [[http://bennolan.com/behaviour/][Behaviour website]]
    * [[http://groups.google.com/group/behaviour][Behaviour Google Group]]
 
+---++ Installation Instructions
+%$INSTALL_INSTRUCTIONS%
 
----++ Distribution files
-   * [[%PUBURL%/%SYSTEMWEB%/%TOPIC%/behaviour.compressed.js][compressed javascript file]] (3.6K) - processed by [[http://alex.dojotoolkit.org/shrinksafe/][ShrinkSafe]]
-   * [[%PUBURL%/%SYSTEMWEB%/%TOPIC%/behaviour.js][behaviour.js]] (9.7K) - original javascript source
-
-
 ---++ Contrib Settings
    * Set SHORTDESCRIPTION = =Behaviour= Javascript event library to create javascript based interactions that degrade well when javascript is not available
-   
-   
+
+You can also set the global TWiki variable BEHAVIOURCONTRIB_DEBUG to 1 to make the contrib use uncompressed javascript sources, in the event of problems.
+
 ---++ Contrib Info
-| Author: | TWiki:Main.ArthurClemens |
-| Copyright: | Code: =behaviour.js= version 1.1 - Copyright (c) Ben Nolan and Simon Willison. TWiki distribution and updates/additions: TWiki:Main.ArthurClemens. |
-| License: | BSD |
-| Dependencies: | %$DEPENDENCIES% |
-| Contrib&nbsp;Version: | 1.3.1 |
-| Change&nbsp;History: | <!-- specify latest version first -->&nbsp; |
-| 17 Oct 2007 | 1.3 Replaced "faster code" by other code from Dean Edwards, [[ packed by http://groups.google.com/group/behaviour/browse_thread/thread/85137977bedf5ed/3cf3ba8065d41a8c#3cf3ba8065d41a8c][Raymond Irving]]. |
-| 02 Jul 2007 | 1.2 Integrated other faster code by Dean Edwards: [[http://dean.edwards.name/weblog/2006/06/again/][faster onload (again)]]. |
-| 08 Mar 2007 | 1.1 Integrated code by Dean Edwards (see [[#CodeUpdate][Code update version 1.1 with faster DOM queries]]). |
-| 04 Jun 2006 | 1.0  First Version. Included Behaviour version: 1.1. |
+|  Author: | TWiki:Main.ArthurClemens |
+|  Copyright: | Code: =behaviour.js= version 1.1 - Copyright (c) Ben Nolan and Simon Willison. TWiki distribution and updates/additions: TWiki:Main.ArthurClemens. |
+|  License: | BSD |
+|  Version: | %$VERSION% |
+|  Dependencies: | %$DEPENDENCIES% |
+|  Contrib&nbsp;Version: | 1.3.1 |
+|  Change&nbsp;History: | <!-- specify latest version first -->&nbsp; |
+|  17 Oct 2007 | 1.3 Replaced "faster code" by other code from Dean Edwards, [[ packed by http://groups.google.com/group/behaviour/browse_thread/thread/85137977bedf5ed/3cf3ba8065d41a8c#3cf3ba8065d41a8c][Raymond Irving]]. |
+|  02 Jul 2007 | 1.2 Integrated other faster code by Dean Edwards: [[http://dean.edwards.name/weblog/2006/06/again/][faster onload (again)]]. |
+|  08 Mar 2007 | 1.1 Integrated code by Dean Edwards (see [[#CodeUpdate][Code update version 1.1 with faster DOM queries]]). |
+|  04 Jun 2006 | 1.0  First Version. Included Behaviour version: 1.1. |
 |  Home: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC% |
 |  Feedback: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Dev |
 |  Appraisal: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Appraisal |
 
 __Related Topics:__ %SYSTEMWEB%.TWikiPreferences
 
-%META:FILEATTACHMENT{name="behaviour.compressed.js" attr="" autoattached="1" comment="" date="1162075796" path="behaviour.compressed.js" size="2902" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="behaviour.js" attr="" autoattached="1" comment="" date="1161199153" path="behaviour.js" size="8149" user="UnknownUser" version=""}%
+%META:FILEATTACHMENT{name="behaviour.js" attr="" autoattached="1" comment="" date="1162075796" path="behaviour.compressed.js" size="2902" user="UnknownUser" version=""}%
+

Modified: twiki/scratch/TWikiStandAlone/twikiplugins/TinyMCEPlugin/lib/TWiki/Plugins/TinyMCEPlugin/DEPENDENCIES
===================================================================
--- twiki/scratch/TWikiStandAlone/twikiplugins/TinyMCEPlugin/lib/TWiki/Plugins/TinyMCEPlugin/DEPENDENCIES	2007-10-20 14:37:46 UTC (rev 15365)
+++ twiki/scratch/TWikiStandAlone/twikiplugins/TinyMCEPlugin/lib/TWiki/Plugins/TinyMCEPlugin/DEPENDENCIES	2007-10-21 01:03:32 UTC (rev 15366)
@@ -1 +1,2 @@
+TWiki::Plugins::BehaviourContrib,>=15357,perl,Javascript module
 TWiki::Plugins::WysiwygPlugin,>=14523,perl,Translator module

Modified: twiki/scratch/TWikiStandAlone/twikiplugins/TinyMCEPlugin/lib/TWiki/Plugins/TinyMCEPlugin.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/twikiplugins/TinyMCEPlugin/lib/TWiki/Plugins/TinyMCEPlugin.pm	2007-10-20 14:37:46 UTC (rev 15365)
+++ twiki/scratch/TWikiStandAlone/twikiplugins/TinyMCEPlugin/lib/TWiki/Plugins/TinyMCEPlugin.pm	2007-10-21 01:03:32 UTC (rev 15366)
@@ -147,7 +147,7 @@
     unless ($behaving) {
         TWiki::Func::addToHEAD(
             'BEHAVIOURCONTRIB',
-            '<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/BehaviourContrib/behaviour.compressed.js"></script>');
+            '<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/BehaviourContrib/behaviour.js"></script>');
     }
     TWiki::Func::addToHEAD('tinyMCE', <<SCRIPT);
 <meta name="TINYMCEPLUGIN_INIT" content="$metainit" />

Modified: twiki/scratch/TWikiStandAlone/twikiplugins/TwistyContrib/data/TWiki/TwistyContrib.txt
===================================================================
--- twiki/scratch/TWikiStandAlone/twikiplugins/TwistyContrib/data/TWiki/TwistyContrib.txt	2007-10-20 14:37:46 UTC (rev 15365)
+++ twiki/scratch/TWikiStandAlone/twikiplugins/TwistyContrib/data/TWiki/TwistyContrib.txt	2007-10-21 01:03:32 UTC (rev 15366)
@@ -143,17 +143,12 @@
 ---++ Settings
 
 	* Set SHORTDESCRIPTION = Twisty section javascript library to open/close content dynamically 
-	* Set STUB = %$STUB%
 
----++ Installation Instructions
+You can also set the global TWiki variable TWISTYCONTRIB_DEBUG to 1 to make the contrib use uncompressed javascript sources, in the event of problems.
 
-	* Download the ZIP file from the Plugin web (see below)
-	* Unzip ==%TOPIC%.zip== in your ($TWIKI_ROOT) directory. Content:
-	| *File:* | *Description:* |
-%$MANIFEST%
-	* Optionally, run ==%TOPIC%_installer== to automatically check and install other TWiki modules that this module depends on. You can also do this step manually.
-	* Alternatively, manually make sure the dependencies listed in the table below are resolved.
-	%$DEPENDENCIES%
+
+---++ Installation Instructions
+%*INSTALL_INSTRUCTIONS%
 	* !TwistyContrib uses these header includes:
 	<verbatim>
 <style type="text/css" media="all">
@@ -162,30 +157,30 @@
 <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" src="%PUBURL%/%SYSTEMWEB%/BehaviourContrib/behaviour.js"></script>
+<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/TwistyContrib/twist.js"></script>
 </verbatim>
 
 
 ---++ Contrib Info
 
-| Authors: | !JavaScript written by TWiki:Main.ArthurClemens; Contrib packaged by  TWiki:Main.RafaelAlvarez; original !JavaScript written by TWiki:Main.SamHasler. |
-| Copyright &copy;: | 2005 Sam Hasler and Rafael Alvarez; 2006,2007 Arthur Clemens |
-| License: | [[http://www.gnu.org/copyleft/gpl.html][GPL]] |
-| Dependencies: | %$DEPENDENCIES% |
-| Plugin&nbsp;Version: | 20 Jun 2007 (version 1.4.1)  |
-| Change&nbsp;History: | <!-- versions below in reverse order -->&nbsp; |
-| 20 Jun 2007 | 1.4 Arthur Clemens - Updated script so TwistyPlugin can work without extra javascript 'init' calls. |
-| 18 Jun 2007 | 1.3 Arthur Clemens - Updated with TWiki 4 !JavaScript files. |
-| 25 Oct 2006 | 1.2 Arthur Clemens - Updated !JavaScript to support !TwistyPlugin version 1.2  |
-| 26 Sep 2006 | 1.010 Arthur Clemens - Complete !JavaScript rewrite |
-| 12 Sep 2005 | 1.000 First Version |
-| Home: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC% |
-| Feedback: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Dev |
-| Appraisal: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Appraisal |
+|  Authors: | !JavaScript written by TWiki:Main.ArthurClemens; Contrib packaged by  TWiki:Main.RafaelAlvarez; original !JavaScript written by TWiki:Main.SamHasler. |
+|  Copyright &copy;: | 2005 Sam Hasler and Rafael Alvarez; 2006,2007 Arthur Clemens |
+|  License: | [[http://www.gnu.org/copyleft/gpl.html][GPL]] |
+|  Dependencies: | %$DEPENDENCIES% |
+|  Plugin&nbsp;Version: | 20 Jun 2007 (version 1.4.1)  |
+|  Version: | %$VERSION% |
+|  Change&nbsp;History: | <!-- versions below in reverse order -->&nbsp; |
+|  20 Jun 2007 | 1.4 Arthur Clemens - Updated script so TwistyPlugin can work without extra javascript 'init' calls. |
+|  18 Jun 2007 | 1.3 Arthur Clemens - Updated with TWiki 4 !JavaScript files. |
+|  25 Oct 2006 | 1.2 Arthur Clemens - Updated !JavaScript to support !TwistyPlugin version 1.2  |
+|  26 Sep 2006 | 1.010 Arthur Clemens - Complete !JavaScript rewrite |
+|  12 Sep 2005 | 1.000 First Version |
+|  Home: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC% |
+|  Feedback: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Dev |
+|  Appraisal: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Appraisal |
 
 __Related Topics:__ %SYSTEMWEB%.TWikiPreferences
  
 %META:FILEATTACHMENT{name="twist.js" attachment="twist.js" attr="" comment="!JavaScript library" date="1126427179" path="twist.js" size="3441" stream="twist.js" user="TWikiContributor" version="0"}%
-%META:FILEATTACHMENT{name="twist.compressed.js" attachment="twist.compressed.js" attr="" comment="Compressed version of the !JavaScript library" date="1126427179" path="twist.compressed.js" size="3441" stream="twist.compressed.js" user="TWikiContributor" version="0"}%
 %META:FILEATTACHMENT{name="twist.css" attachment="twist.css" attr="" comment="Style Sheet" date="1126427224" path="twist.css" size="122" stream="twist.css" user="TWikiContributor" version="0"}%

Modified: twiki/scratch/TWikiStandAlone/twikiplugins/TwistyContrib/lib/TWiki/Contrib/TwistyContrib/MANIFEST
===================================================================
--- twiki/scratch/TWikiStandAlone/twikiplugins/TwistyContrib/lib/TWiki/Contrib/TwistyContrib/MANIFEST	2007-10-20 14:37:46 UTC (rev 15365)
+++ twiki/scratch/TWikiStandAlone/twikiplugins/TwistyContrib/lib/TWiki/Contrib/TwistyContrib/MANIFEST	2007-10-21 01:03:32 UTC (rev 15366)
@@ -2,4 +2,6 @@
 lib/TWiki/Contrib/TwistyContrib.pm 0444
 pub/TWiki/TwistyContrib/twist.css 0644
 pub/TWiki/TwistyContrib/twist.js 0644
+pub/TWiki/TwistyContrib/twist_src.js 0644
 pub/TWiki/TwistyContrib/twist.compressed.js 0644
+pub/TWiki/TwistyContrib/twist.compressed_src.js 0644





[TWiki-Dev] [SVN] GilmarSantosJr r15366 - in twiki/scratch/TWikiStandAlone: . lib/TWiki/Engine twi

Open Source Enterprise Wiki and Web Application Platform