Changeset 981

Timestamp:

11/26/08 20:41:59 (3 years ago)

Author:

ArthurClemens

Message:

Item116: rebrand javascript classes

Location:

trunk

Files:

• AutoCompletePlugin/data/TWiki/AutoCompletePlugin.txt (modified) (3 diffs)
• FormPlugin/data/Sandbox/FormPluginExamples.txt (modified) (1 diff)
• FormPlugin/data/TWiki/FormPlugin.txt (modified) (1 diff)
• FormPlugin/lib/TWiki/Plugins/FormPlugin.pm (modified) (4 diffs)
• PatternSkin/pub/System/PatternSkin/pattern.js (modified) (1 diff)
• PatternSkin/templates/foswiki.pattern.tmpl (modified) (1 diff)
• TWikiAjaxContrib/data/TWiki/TWikiAjaxContribExamples.txt (modified) (3 diffs)
• core/data/TestCases/TestCaseTWikiJavascripts.txt (modified) (6 diffs)
• core/pub/System/JavascriptFiles/foswiki.js (modified) (1 diff)
• core/pub/System/JavascriptFiles/foswikiForm.js (moved) (moved from trunk/core/pub/System/JavascriptFiles/twikiForm.js) (11 diffs)

trunk/AutoCompletePlugin/data/TWiki/AutoCompletePlugin.txt

@@ -47 +47 @@
 | =itemformat= | The format of an item string in the autocomplete list. Use if the autocomplete list should display different names than the input field - for instance with full person names. The javascript input argument is =item=. | =item= | =itemformat="item[0] + ' (' + item[1] + ')'"= |
 | =delimchar= | Used to accept multiple delimeted queries. | none | =delimchar=","= |
-| =onblur=, =onfocus=, =onchange=, =onselect=, =onmouseover=, =onmouseout= | Javascript parameters for the textfield. | none | =onfocus="twiki.Form.clearBeforeFocusText(this);"= |
+| =onblur=, =onfocus=, =onchange=, =onselect=, =onmouseover=, =onmouseout= | Javascript parameters for the textfield. | none | =onfocus="foswiki.Form.clearBeforeFocusText(this);"= |
 | =itemselecthandler= | Defines a javascript function to be executed when an item is selected. See http://developer.yahoo.com/yui/autocomplete/#customevents. | none | =itemselecthandler="submitJumpForm"= |
 
@@ -61 +61 @@
 }
 </script>
-<form name="myJumpForm" action="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%">%AUTOCOMPLETE{name="topic" datatopic="Sandbox.AutoCompletePluginTestData" onfocus="twiki.Form.clearBeforeFocusText(this);" onblur="twiki.Form.restoreBeforeFocusText(this);" datasection="topiclist" value="Jump" formname="myJumpForm" class="twikiInputField twikiInputFieldBeforeFocus"  itemselecthandler="SubmitJump" size="128px" }%</form>
+<form name="myJumpForm" action="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%">%AUTOCOMPLETE{name="topic" datatopic="Sandbox.AutoCompletePluginTestData" onfocus="foswiki.Form.clearBeforeFocusText(this);" onblur="foswiki.Form.restoreBeforeFocusText(this);" datasection="topiclist" value="Jump" formname="myJumpForm" class="twikiInputField twikiInputFieldBeforeFocus"  itemselecthandler="SubmitJump" size="128px" }%</form>
 </verbatim>
 
@@ -70 +70 @@
 }
 </script>
-<form name="myJumpForm" action="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%">%AUTOCOMPLETE{name="topic" datatopic="Sandbox.AutoCompletePluginTestData" onfocus="twiki.Form.clearBeforeFocusText(this);" onblur="twiki.Form.restoreBeforeFocusText(this);" datasection="topiclist" value="Jump" formname="myJumpForm" class="twikiInputField twikiInputFieldBeforeFocus"  itemselecthandler="SubmitJump" size="128px" }%</form>
+<form name="myJumpForm" action="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%">%AUTOCOMPLETE{name="topic" datatopic="Sandbox.AutoCompletePluginTestData" onfocus="foswiki.Form.clearBeforeFocusText(this);" onblur="foswiki.Form.restoreBeforeFocusText(this);" datasection="topiclist" value="Jump" formname="myJumpForm" class="twikiInputField twikiInputFieldBeforeFocus"  itemselecthandler="SubmitJump" size="128px" }%</form>
 
 ---++ Installation Instructions

trunk/FormPlugin/data/Sandbox/FormPluginExamples.txt

@@ -617 +617 @@
 method="POST"
 validate="on"
-onSubmit="return (twiki.Form.makeSafeForTableEntry) ? twiki.Form.makeSafeForTableEntry(this) : true;"
+onSubmit="return (foswiki.Form.makeSafeForTableEntry) ? foswiki.Form.makeSafeForTableEntry(this) : true;"
 }%
 <!-- <nop>CommentPlugin attributes -->

trunk/FormPlugin/data/TWiki/FormPlugin.txt

@@ -466 +466 @@
 |  08 Mar 2008 | 1.2 Added =condition=, =noformhtml= and =dateformat= attributes. |
 |  19 Oct 2007 | 1.1 Added =date= type. |
-|  09 Jun 2007 | 1.0.5 Added upload parameter; option to turn off form validation; custom javascript has been replaced by code in =pub/TWiki/JavascriptFiles/twikiForm.js=; added Flickr example. |
-|  27 May 2007 | 1.0.4 Update javascript calls to new =twikiForm.js=. |
+|  09 Jun 2007 | 1.0.5 Added upload parameter; option to turn off form validation; custom javascript has been replaced by code in =pub/TWiki/JavascriptFiles/foswikiForm.js=; added Flickr example. |
+|  27 May 2007 | 1.0.4 Update javascript calls to new =foswikiForm.js=. |
 |  19 May 2007 | 1.0.3 Added element attributes: =focus=, =disabled=, =readonly=; Javascript parameters =beforeclick=, =onFocus=, =onBlur=, =onMouseOver=, =onMouseOut=, =onSelect=, =onChange=, =onClick=, =onKeyUp=; form parameter =onSubmit=. Fallback for form POSTs and TWiki versions earlier than 4.2: POST requests are converted to GET requests. |
 |  15 May 2007 | 1.0.2 Added form attribute =elementformat=; changed parameter names for consistency: =class= to =cssclass=, =elementformat= to =fieldformat=.  |

trunk/FormPlugin/lib/TWiki/Plugins/FormPlugin.pm

@@ -336 +336 @@
 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script>
 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikiCSS.js"></script>
-<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiForm.js"></script>
+<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikiForm.js"></script>
 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikiString.js"></script>
 END
@@ -767 +767 @@
     if ($focus) {
         my $focusCall =
-            '<script type="text/javascript">twiki.Form.setFocus("'
+            '<script type="text/javascript">foswiki.Form.setFocus("'
           . $currentForm{'name'} . '", "'
           . $name
@@ -788 +788 @@
         }
         $beforeclickCall .=
-            'var el=twiki.Form.getFormElement(formName, "' 
+            'var el=foswiki.Form.getFormElement(formName, "' 
           . $name
-          . '"); twiki.Form.initBeforeFocusText(el,"'
+          . '"); foswiki.Form.initBeforeFocusText(el,"'
           . $beforeclick . '");';
         $beforeclickCall .= '</script>';
@@ -923 +923 @@
     if ($beforeclick) {
         $value   = $beforeclick;
-        $onFocus = 'twiki.Form.clearBeforeFocusText(this)';
-        $onBlur  = 'twiki.Form.restoreBeforeFocusText(this)';
+        $onFocus = 'foswiki.Form.clearBeforeFocusText(this)';
+        $onBlur  = 'foswiki.Form.restoreBeforeFocusText(this)';
 
         # additional init function in _formElement

trunk/PatternSkin/pub/System/PatternSkin/pattern.js

@@ -61 +61 @@
         },
         '#jumpFormField' : function(el) {
-                twiki.Form.initBeforeFocusText(el,TEXT_JUMP);
+                foswiki.Form.initBeforeFocusText(el,TEXT_JUMP);
                 el.onfocus = function() {
-                        twiki.Form.clearBeforeFocusText(this);
+                        foswiki.Form.clearBeforeFocusText(this);
                 }
                 el.onblur = function() {
-                        twiki.Form.restoreBeforeFocusText(this);
+                        foswiki.Form.restoreBeforeFocusText(this);
                 }
         },
         '#quickSearchBox' : function(el) {
-                twiki.Form.initBeforeFocusText(el,TEXT_SEARCH);
+                foswiki.Form.initBeforeFocusText(el,TEXT_SEARCH);
                 el.onfocus = function() {
-                        twiki.Form.clearBeforeFocusText(this);
+                        foswiki.Form.clearBeforeFocusText(this);
                 }
                 el.onblur = function() {
-                        twiki.Form.restoreBeforeFocusText(this);
+                        foswiki.Form.restoreBeforeFocusText(this);
                 }
         },

trunk/PatternSkin/templates/foswiki.pattern.tmpl

@@ -47 +47 @@
 <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twikiHTML.js"></script>
 <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikiCSS.js"></script>
-<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twikiForm.js"></script>
+<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikiForm.js"></script>
 <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/PatternSkin/pattern.js"></script>%TMPL:END%
 

trunk/TWikiAjaxContrib/data/TWiki/TWikiAjaxContribExamples.txt

@@ -13 +13 @@
 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/BehaviourContrib/behaviour.compressed.js"></script>
 <!-- Additional script for this page -->
-<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiForm.js"></script>
+<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikiForm.js"></script>
 
 %TOC{title="On this page:"}%
@@ -846 +846 @@
 <verbatim>
 function postSearchForm () {
-        var queryString = twiki.Form.formData2QueryString(
+        var queryString = foswiki.Form.formData2QueryString(
                 document.getElementById('searchForm')
         );
@@ -903 +903 @@
 // <![CDATA[
 function postSearchForm () {
-        var queryString = twiki.Form.formData2QueryString(
+        var queryString = foswiki.Form.formData2QueryString(
                 document.getElementById('searchForm')
         );

trunk/core/data/TestCases/TestCaseTWikiJavascripts.txt

@@ -114 +114 @@
 
 
----++ twiki.Form
-<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiForm.js"></script>
+---++ foswiki.Form
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikiForm.js"></script>
 
 <form id="testForm" name="testForm">
@@ -158 +158 @@
 </form>
 
----+++ twiki.Form.formData2QueryString
+---+++ foswiki.Form.formData2QueryString
 
 <script language="javascript">
@@ -165 +165 @@
     function testFormData2QueryStringWithValidArgs() {
         {
-                        var queryString = twiki.Form.formData2QueryString(
+                        var queryString = foswiki.Form.formData2QueryString(
                                 document.getElementById('testForm')
                         );
@@ -171 +171 @@
                 }
                 {
-                        var queryString = twiki.Form.formData2QueryString(
+                        var queryString = foswiki.Form.formData2QueryString(
                                 document.getElementById('testForm'),
                                 {collapseMulti:false}
@@ -178 +178 @@
                 }
                 {
-                        var queryString = twiki.Form.formData2QueryString(
+                        var queryString = foswiki.Form.formData2QueryString(
                                 document.getElementById('testForm'),
                                 {collapseMulti:true}
@@ -189 +189 @@
         {
                 var formElem = document.getElementById('doesNotExist');
-                        var queryString = twiki.Form.formData2QueryString(formElem);
+                        var queryString = foswiki.Form.formData2QueryString(formElem);
                         assertNull("Non-existing form should return null", queryString);
                 }
                 {
-                        var queryString = twiki.Form.formData2QueryString(
+                        var queryString = foswiki.Form.formData2QueryString(
                                 document.getElementById('testForm'),
                                 {bla:true}

trunk/core/pub/System/JavascriptFiles/foswiki.js

@@ -8 +8 @@
 foswikiCSS.js
 foswikiEvent.js
-twikiForm.js
+foswikiForm.js
 twikiFunction.js
 twikiHTML.js

trunk/core/pub/System/JavascriptFiles/foswikiForm.js

@@ -3 +3 @@
 */
 
-if (twiki == undefined) var twiki = {};
-twiki.Form = {
+if (foswiki == undefined) var foswiki = {};
+foswiki.Form = {
         
         /*
@@ -20 +20 @@
         Version 1.3
         
-        Changes for TWiki:
+        Changes for Foswiki:
         Added KEYVALUEPAIR_DELIMITER and documentation by Arthur Clemens, 2006
         */
@@ -35 +35 @@
         @example
         <code>
-        var queryString = twiki.Form.formData2QueryString(
+        var queryString = foswiki.Form.formData2QueryString(
                 document.getElementById('myForm'),
                 {collapseMulti:true}
@@ -61 +61 @@
                                                 + '='
                                                 + encodeURI(formElem.value)
-                                                + twiki.Form.KEYVALUEPAIR_DELIMITER;
+                                                + foswiki.Form.KEYVALUEPAIR_DELIMITER;
                                         break;
                                 
@@ -84 +84 @@
                                                                         + '='
                                                                         + encodeURI(currOpt.text)
-                                                                        + twiki.Form.KEYVALUEPAIR_DELIMITER;
+                                                                        + foswiki.Form.KEYVALUEPAIR_DELIMITER;
                                                         }
                                                 }
                                         }
                                         if (opts.collapseMulti) {
-                                                str += twiki.Form.KEYVALUEPAIR_DELIMITER;
+                                                str += foswiki.Form.KEYVALUEPAIR_DELIMITER;
                                         }
                                         break;
@@ -99 +99 @@
                                                         + '='
                                                         + encodeURI(formElem.value)
-                                                        + twiki.Form.KEYVALUEPAIR_DELIMITER;
+                                                        + foswiki.Form.KEYVALUEPAIR_DELIMITER;
                                         }
                                         break;
@@ -121 +121 @@
                                                         + encodeURI(formElem.value);
                                                 }
-                                                str += twiki.Form.KEYVALUEPAIR_DELIMITER;
+                                                str += foswiki.Form.KEYVALUEPAIR_DELIMITER;
                                                 lastElemName = formElem.name;
                                         }
@@ -134 +134 @@
         
         /**
-        Makes form field values safe to insert in a TWiki table. Any table-breaking characters are replaced.
+        Makes form field values safe to insert in a Foswiki table. Any table-breaking characters are replaced.
         @param inForm: (String) the form to make safe
         */
@@ -171 +171 @@
         setFocus:function(inFormName, inInputFieldName) {
                 try {
-                        var el = twiki.Form.getFormElement(inFormName, inInputFieldName);
+                        var el = foswiki.Form.getFormElement(inFormName, inInputFieldName);
                         el.focus();
                 } catch (er) {}
@@ -184 +184 @@
                 el.FP_defaultValue = inText;
                 if (!el.value || el.value == inText) {
-                        twiki.Form._setDefaultStyle(el);
+                        foswiki.Form._setDefaultStyle(el);
                 }
         },
@@ -209 +209 @@
         restoreBeforeFocusText:function(el) {
                 if (!el.value && el.FP_defaultValue) {
-                        twiki.Form._setDefaultStyle(el);
+                        foswiki.Form._setDefaultStyle(el);
                 }
                 foswiki.CSS.removeClass(el, "twikiInputFieldFocus");