Changeset 927


Ignore:
Timestamp:
11/24/08 17:59:40 (3 years ago)
Author:
ArthurClemens
Message:

Item116: rebrand javascipt classes, pass 3

Location:
trunk
Files:
2 added
2 deleted
26 edited

Legend:

Unmodified
Added
Removed
  • trunk/EditTablePlugin/pub/System/EditTablePlugin/edittable.js

    r14 r927  
    77//  
    88// Small refactoring by Arthur Clemens 
    9 // TODO: all functions should be moved from global space to a twiki.EditTable object 
    10  
    11 /** 
    12 Code from TWiki 4.2 to make this plugin compatible with earlier versions. 
    13 */ 
    14 var twiki; 
    15 if (!twiki) twiki = {}; 
    16 twiki.getMetaTag = function(inKey) { 
    17     if (twiki.metaTags == null || twiki.metaTags.length == 0) { 
    18         var head = document.getElementsByTagName("META"); 
    19         head = head[0].parentNode.childNodes; 
    20         twiki.metaTags = new Array(); 
    21         for (var i = 0; i < head.length; i++) { 
    22             if (head[i].tagName != null && 
    23                 head[i].tagName.toUpperCase() == 'META') { 
    24                 twiki.metaTags[head[i].name] = head[i].content; 
    25             } 
    26         } 
    27     } 
    28     return twiki.metaTags[inKey]; 
    29 }; 
     9// TODO: all functions should be moved from global space to a foswiki.EditTable object 
    3010 
    3111/** 
     
    875855*/ 
    876856function init() { 
    877     var noJavascript = twiki.getMetaTag('EDITTABLEPLUGIN_NO_JAVASCRIPTINTERFACE_EditTableId'); 
     857    var noJavascript = foswiki.getMetaTag('EDITTABLEPLUGIN_NO_JAVASCRIPTINTERFACE_EditTableId'); 
    878858        if (noJavascript) return; 
    879     var currentFormName = twiki.getMetaTag('EDITTABLEPLUGIN_FormName'); 
    880     var url = twiki.getMetaTag('EDITTABLEPLUGIN_EditTableUrl'); 
    881     var headerRows = parseInt(twiki.getMetaTag('EDITTABLEPLUGIN_headerRows')); 
    882     var footerRows = parseInt(twiki.getMetaTag('EDITTABLEPLUGIN_footerRows')); 
     859    var currentFormName = foswiki.getMetaTag('EDITTABLEPLUGIN_FormName'); 
     860    var url = foswiki.getMetaTag('EDITTABLEPLUGIN_EditTableUrl'); 
     861    var headerRows = parseInt(foswiki.getMetaTag('EDITTABLEPLUGIN_headerRows')); 
     862    var footerRows = parseInt(foswiki.getMetaTag('EDITTABLEPLUGIN_footerRows')); 
    883863    edittableInit(currentFormName, url, headerRows, footerRows); 
    884864} 
  • trunk/FormPlugin/lib/TWiki/Plugins/FormPlugin.pm

    r781 r927  
    334334@import url("%PUBURL%/%SYSTEMWEB%/FormPlugin/formplugin.css"); 
    335335</style> 
    336 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikilib.js"></script> 
     336<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script> 
    337337<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiCSS.js"></script> 
    338338<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiForm.js"></script> 
  • trunk/JQueryTwistyPlugin/data/TWiki/JQueryTwistyPlugin.txt

    r878 r927  
    108108 
    109109---+++ Make it remember 
    110 To store the last state in a TWIKIPREF cookie, add the parameter =remember="on"=.%BR% 
     110To store the last state in a FOSWIKIPREF cookie, add the parameter =remember="on"=.%BR% 
    111111To test this, reload the page after toggling. 
    112112 
     
    121121%ENDTWISTY% 
    122122 
    123 If a Twisty state has been stored in a TWIKIPREF cookie before, it can be cleared by using =remember="off"=: 
     123If a Twisty state has been stored in a FOSWIKIPREF cookie before, it can be cleared by using =remember="off"=: 
    124124 
    125125<verbatim> 
     
    428428      * Either =div= or =span=; =span= if nothing set 
    429429   * Set TWISTYREMEMBER =  
    430       * Either =on= or =off=; default is not specified. If set to =on= all Twisty states will be stored in a TWIKIPREF cookie; if set to =off= the TWIKIPREF cookie will be cleared 
     430      * Either =on= or =off=; default is not specified. If set to =on= all Twisty states will be stored in a FOSWIKIPREF cookie; if set to =off= the FOSWIKIPREF cookie will be cleared 
    431431 
    432432   * Set SHORTDESCRIPTION = Twisty section !JavaScript library to open/close content dynamically 
  • trunk/JQueryTwistyPlugin/lib/TWiki/Plugins/JQueryTwistyPlugin.pm

    r803 r927  
    366366=pod 
    367367 
    368 Reads a setting from the TWIKIPREF cookie. 
     368Reads a setting from the FOSWIKIPREF cookie. 
    369369Returns: 
    370370   * 1 if the cookie has been set (meaning: show content) 
     
    381381    # which state do we use? 
    382382    my $cgi = new CGI; 
    383     my $cookie = $cgi->cookie('TWIKIPREF'); 
     383    my $cookie = $cgi->cookie('FOSWIKIPREF'); 
    384384    my $tag    = $idTag; 
    385385    $tag =~ s/^(.*)(hide|show|toggle)$/$1/go; 
  • trunk/NatSkin/templates/javascript.nat.tmpl

    r779 r927  
    22%TMPL:DEF{"defaultjavascript"}%<!-- defaultjavascript --> 
    33%TMPL:P{"jqueryjavascript"}% 
    4 <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twiki.js"></script> 
     4<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswiki.js"></script> 
    55<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JQueryPlugin/jquery.superfish.js" ></script> 
    66<script type="text/javascript">  
  • trunk/PatternSkin/pub/System/PatternSkin/pattern.js

    r894 r927  
    106106 
    107107var initForm; // in case initForm is not defined (f.e. when TinyMCE is used and foswiki_edit.js is not loaded 
    108 var TEXT_JUMP = twiki.getMetaTag('TEXT_JUMP'); 
    109 var TEXT_SEARCH = twiki.getMetaTag('TEXT_SEARCH'); 
    110 var TEXT_NUM_TOPICS = twiki.getMetaTag('TEXT_NUM_TOPICS'); 
    111 var TEXT_MODIFY_SEARCH = twiki.getMetaTag('TEXT_MODIFY_SEARCH'); 
     108var TEXT_JUMP = foswiki.getMetaTag('TEXT_JUMP'); 
     109var TEXT_SEARCH = foswiki.getMetaTag('TEXT_SEARCH'); 
     110var TEXT_NUM_TOPICS = foswiki.getMetaTag('TEXT_NUM_TOPICS'); 
     111var TEXT_MODIFY_SEARCH = foswiki.getMetaTag('TEXT_MODIFY_SEARCH'); 
  • trunk/PatternSkin/templates/foswiki.pattern.tmpl

    r906 r927  
    4242 
    4343%TMPL:DEF{"script:skinbase"}%<!--BEHAVIOURCONTRIB--><script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/BehaviourContrib/behaviour.compressed.js"></script> 
    44 <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twikilib.js"></script> 
     44<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script> 
    4545<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twikiWindow.js"></script> 
    4646<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twikiEvent.js"></script> 
  • trunk/PersonalInfoAddOn/data/_PersonalInfoAddOn04x01/PersonalInfoModules.txt

    r714 r927  
    129129<div id="personalInfoSearchResults"><!-- search results will be displayed here --></div> 
    130130<!-- Compatibility for TWiki 4.1 that does not have twikiEvent.js --> 
    131 <script language="javascript" type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikilib.js"></script> 
     131<script language="javascript" type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script> 
    132132<script language="javascript" type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/PersonalInfoAddOn/twikiEvent.js"></script> 
    133133<!-- END compatibility  --> 
     
    145145<verbatim> 
    146146%STARTSECTION{"initSearchBox"}%<!-- Compatibility for TWiki 4.1 that does not have twikiEvent.js --> 
    147 <script language="javascript" type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikilib.js"></script> 
     147<script language="javascript" type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script> 
    148148<script language="javascript" type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/PersonalInfoAddOn/twikiEvent.js"></script> 
    149149<!-- END compatibility  --> 
     
    328328<verbatim> 
    329329%STARTSECTION{"pictureFilterSearch"}%%IF{"context AttachContentPluginEnabled" then='%INCLUDE{"PersonalInfo" section="directSearchScriptFile"}%' else='%INCLUDE{"PersonalInfo" section="directSearchScript" raw="on" literal="on"}%'}%<!-- Compatibility for TWiki 4.1 that does not have twikiEvent.js --> 
    330 <script language="javascript" type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikilib.js"></script> 
     330<script language="javascript" type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script> 
    331331<script language="javascript" type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/PersonalInfoAddOn/twikiEvent.js"></script> 
    332332<!-- END compatibility  --> 
  • trunk/QuickMenuSkin/templates/foswiki.quickmenu.tmpl

    r906 r927  
    1515 
    1616%TMPL:DEF{"script"}% 
    17 <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twiki.js"></script> 
     17<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswiki.js"></script> 
    1818%IF{"context TwistyPluginEnabled" then="" else="<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/TwistyContrib/twist.js'></script>"}% 
    1919<script type="text/javascript"> 
  • trunk/TWikiAjaxContrib/data/TWiki/TWikiAjaxContrib.txt

    r878 r927  
    411411<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/YahooUserInterfaceContrib/build/yahoo/yahoo.js"></script> 
    412412<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/YahooUserInterfaceContrib/build/connection/connection.js"></script> 
    413 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikilib.js"></script> 
     413<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script> 
    414414<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiArray.js"></script> 
    415415<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/TWikiAjaxContrib/twikiAjaxRequest.compressed.js"></script> 
  • trunk/TWikiAjaxContrib/data/TWiki/TWikiAjaxContribExamples.txt

    r714 r927  
    77<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/YahooUserInterfaceContrib/build/yahoo/yahoo.js"></script> 
    88<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/YahooUserInterfaceContrib/build/connection/connection.js"></script> 
    9 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikilib.js"></script> 
     9<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script> 
    1010<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiArray.js"></script> 
    1111<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiHTML.js"></script> 
  • trunk/TWikiAjaxContrib/pub/TWiki/TWikiAjaxContrib/twikiAjaxRequest.js

    r714 r927  
    445445        Or a mixture of code and source urls: 
    446446        <pre> 
    447         <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twiki.js"></script> 
     447        <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswiki.js"></script> 
    448448        <script language="javascript"> 
    449449        // <![CDATA[ 
  • trunk/TWikiAjaxPlugin/lib/TWiki/Plugins/TWikiAjaxPlugin.pm

    r781 r927  
    9393<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/YahooUserInterfaceContrib/build/yahoo/yahoo.js"></script> 
    9494<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/YahooUserInterfaceContrib/build/connection/connection.js"></script> 
    95 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikilib.js"></script> 
     95<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script> 
    9696<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiArray.js"></script> 
    9797<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiHTML.js"></script> 
  • trunk/TopicClassificationAddOn/data/TCAO/RenderAddClassification.txt

    r772 r927  
    2929<verbatim> 
    3030%STARTINCLUDE% 
    31 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twiki.js"></script> 
     31<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswiki.js"></script> 
    3232<script type="text/javascript" language="JavaScript"><!-- 
    3333// The following section create a list of Classification Summary fields from the templates. 
  • trunk/TopicClassificationAddOn/data/TCAO/RenderTopicCreator.txt

    r772 r927  
    3737<verbatim> 
    3838%STARTINCLUDE% 
    39 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twiki.js"></script> 
     39<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswiki.js"></script> 
    4040%INCLUDE{"%SYSTEMWEB%.WebTopicCreator" section="javascriptfunctions" }% 
    4141<script type="text/javascript"> 
  • trunk/TreeBrowserPlugin/pub/TWiki/TreeBrowserPlugin/dtree.js

    r369 r927  
    516516        } 
    517517*/ 
    518     //twiki.js addLoadEvent 
     518    //foswiki.js addLoadEvent 
    519519}; 
    520520 
  • trunk/TwistyContrib/data/System/TwistyContrib.txt

    r878 r927  
    155155@import url("%PUBURL%/%SYSTEMWEB%/TwistyContrib/twist.css"); 
    156156</style> 
    157 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikilib.js"></script> 
     157<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script> 
    158158<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiPref.js"></script> 
    159159<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiCSS.js"></script> 
  • trunk/TwistyPlugin/data/System/TwistyPlugin.txt

    r899 r927  
    104104 
    105105---+++ Make it remember 
    106 To store the last state in a TWIKIPREF cookie, add the parameter =remember="on"=.%BR% 
     106To store the last state in a FOSWIKIPREF cookie, add the parameter =remember="on"=.%BR% 
    107107To test this, reload the page after toggling. 
    108108 
     
    125125%ENDTWISTY% 
    126126 
    127 If a Twisty state has been stored in a TWIKIPREF cookie before, it can be cleared by using =remember="off"=: 
     127If a Twisty state has been stored in a FOSWIKIPREF cookie before, it can be cleared by using =remember="off"=: 
    128128 
    129129<verbatim> 
     
    553553      * Either =div= or =span=; =span= if nothing set 
    554554   * Set TWISTYREMEMBER =  
    555       * Either =on= or =off=; default is not specified. If set to =on= all Twisty states will be stored in a TWIKIPREF cookie; if set to =off= the TWIKIPREF cookie will be cleared 
     555      * Either =on= or =off=; default is not specified. If set to =on= all Twisty states will be stored in a FOSWIKIPREF cookie; if set to =off= the FOSWIKIPREF cookie will be cleared 
    556556 
    557557   * Set SHORTDESCRIPTION = Twisty section !JavaScript library to open/close content dynamically 
  • trunk/TwistyPlugin/lib/Foswiki/Plugins/TwistyPlugin.pm

    r882 r927  
    112112</style> 
    113113<script type='text/javascript' src='%PUBURL%/%SYSTEMWEB%/BehaviourContrib/behaviour.compressed.js'></script> 
    114 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikilib.js"></script> 
     114<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script> 
    115115<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiPref.js"></script> 
    116116<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiCSS.js"></script> 
     
    378378=pod 
    379379 
    380 Reads a setting from the TWIKIPREF cookie. 
     380Reads a setting from the FOSWIKIPREF cookie. 
    381381Returns: 
    382382   * 1 if the cookie has been set (meaning: show content) 
     
    393393    # which state do we use? 
    394394    my $cgi    = new CGI; 
    395     my $cookie = $cgi->cookie('TWIKIPREF'); 
     395    my $cookie = $cgi->cookie('FOSWIKIPREF'); 
    396396    my $tag    = $idTag; 
    397397    $tag =~ s/^(.*)(hide|show|toggle)$/$1/go; 
  • trunk/TwistyPlugin/templates/twistyplugin.tmpl

    r714 r927  
    66</style> 
    77<script type='text/javascript' src='%PUBURL%/%SYSTEMWEB%/BehaviourContrib/behaviour.compressed.js'></script> 
    8 <script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikilib.js"></script> 
     8<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script> 
    99<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiPref.js"></script> 
    1010<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiCSS.js"></script> 
  • trunk/WikiwygContrib/templates/edit.wikiwyg.tmpl

    r714 r927  
    1515<link rel="stylesheet" type="text/css" href="%PUBURLPATH%/%SYSTEMWEB%/WikiwygContrib/twikiwyg.css" type='text/css' media='all'/> 
    1616 
    17 <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twiki.js"></script> 
     17<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswiki.js"></script> 
    1818<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/WikiwygContrib/lib/Wikiwyg.js"></script> 
    1919<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/WikiwygContrib/lib/Wikiwyg/Util.js"></script> 
  • trunk/core/data/System/JavascriptFiles.txt

    r714 r927  
    77        * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
    88         
    9 %META:FILEATTACHMENT{name="twiki.js" attr="" autoattached="1" comment="" date="1130980328" path="twiki.js" size="2920" user="UnknownUser" version=""}% 
     9%META:FILEATTACHMENT{name="foswiki.js" attr="" autoattached="1" comment="" date="1130980328" path="foswiki.js" size="2920" user="UnknownUser" version=""}% 
    1010%META:FILEATTACHMENT{name="twiki_settings.js" attr="" autoattached="1" comment="" date="1130979890" path="twiki_settings.js" size="982" user="UnknownUser" version=""}% 
  • trunk/core/data/TestCases/TestCaseTWikiJavascripts.txt

    r878 r927  
    88 
    99<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/app/jsUnitCore.js"></script> 
    10 <script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikilib.js"></script> 
     10<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script> 
    1111 
    1212%TOC% 
  • trunk/core/pub/System/JavascriptFiles/twikiPref.js

    r894 r927  
    1515twiki.Pref = { 
    1616         
    17         TWIKI_PREF_COOKIE_NAME:"TWIKIPREF", 
     17        TWIKI_PREF_COOKIE_NAME:"FOSWIKIPREF", 
    1818        /** 
    1919        Separates key-value pairs 
     
    8585         
    8686        /** 
    87         To write a TWiki preference cookie (TWIKIPREF), use twiki.Pref.setPref. 
     87        To write a TWiki preference cookie (FOSWIKIPREF), use twiki.Pref.setPref. 
    8888         
    8989        Retrieves the value of the cookie specified by "name". 
  • trunk/core/pub/System/JavascriptFiles/twikiWindow.js

    r14 r927  
    111111// strings use it 
    112112function launchWindow(inWeb, inTopic) { 
    113     var scripturlpath = twiki.getMetaTag('SCRIPTURLPATH'); 
    114     var scriptsuffix = twiki.getMetaTag('SCRIPTSUFFIX'); 
     113    var scripturlpath = foswiki.getMetaTag('SCRIPTURLPATH'); 
     114    var scriptsuffix = foswiki.getMetaTag('SCRIPTSUFFIX'); 
    115115    twiki.Window.openPopup(scripturlpath+'/view'+ 
    116116                           scriptsuffix+'/', 
  • trunk/core/pub/System/JavascriptFiles/unicode_chars.js

    r14 r927  
    11/* 
    2 Unicode characters for international WikiWord support. Importing this file will overwrite the regexes in twiki.js. 
     2Unicode characters for international WikiWord support. Importing this file will overwrite the regexes in foswiki.js. 
    33*/ 
    44 
Note: See TracChangeset for help on using the changeset viewer.