Changeset 65

Show
Ignore:
Timestamp:
04/11/06 20:46:25 (3 years ago)
Author:
DevonJones
Message:

TiddlyWiki 1.2.38 Merge

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • Trunk/core/tiddlywiki.html

    r60 r65  
    11<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 
    22<script type="text/javascript"> 
    3 var version = {major: 1, minor: 2, revision: 37, date: new Date("Oct 30, 2005"), extensions: {}}; 
     3var version = {major: 1, minor: 2, revision: 38, date: new Date("Nov 8, 2005"), extensions: {}}; 
    44</script> 
    55<!-- 
    6 TiddlyWiki 1.2.37 by Jeremy Ruston, (jeremy [at] osmosoft [dot] com) 
     6TiddlyWiki 1.2.38 by Jeremy Ruston, (jeremy [at] osmosoft [dot] com) 
    77 
    88Published under a BSD open source license 
    … …  
    166166}; 
    167167 
    168 config.textPrimitives.upperLetter = "[A-Z\u00c0-\u00de\u0150\u0170]"; 
    169 config.textPrimitives.lowerLetter = "[a-z\u00df-\u00ff_0-9\\-\u0151\u0171]"; 
    170 config.textPrimitives.anyLetter = "[A-Za-z\u00c0-\u00de\u00df-\u00ff_0-9\\-\u0150\u0170\u0151\u0171]"; 
     168 
     169// --------------------------------------------------------------------------------- 
     170// Browser detection... In a very few places, there's nothing else for it but to 
     171// know what browser we're using. 
     172// --------------------------------------------------------------------------------- 
     173 
     174config.userAgent = navigator.userAgent.toLowerCase(); 
     175config.browser = { 
     176        isIE: config.userAgent.indexOf("msie") != -1 && config.userAgent.indexOf("opera") == -1, 
     177        isBadSafari: config.userAgent.indexOf("applewebkit/416.11") != -1 
     178        }; 
     179 
     180// --------------------------------------------------------------------------------- 
     181// Basic regular expressions 
     182// --------------------------------------------------------------------------------- 
     183 
     184if(config.browser.isBadSafari) 
     185        { 
     186        config.textPrimitives.upperLetter = "[A-Z\u00c0-\u00de]"; 
     187        config.textPrimitives.lowerLetter = "[a-z\u00df-\u00ff_0-9\\-]"; 
     188        config.textPrimitives.anyLetter = "[A-Za-z\u00c0-\u00de\u00df-\u00ff_0-9\\-]"; 
     189        } 
     190else 
     191        { 
     192        config.textPrimitives.upperLetter = "[A-Z\u00c0-\u00de\u0150\u0170]"; 
     193        config.textPrimitives.lowerLetter = "[a-z\u00df-\u00ff_0-9\\-\u0151\u0171]"; 
     194        config.textPrimitives.anyLetter = "[A-Za-z\u00c0-\u00de\u00df-\u00ff_0-9\\-\u0150\u0170\u0151\u0171]"; 
     195        } 
    171196config.textPrimitives.anyDigit = "[0-9]"; 
    172197config.textPrimitives.anyNumberChar = "[0-9\\.E]"; 
    … …  
    202227function main() 
    203228{ 
    204         browserTests(); 
    205229        addEvent(document,"click",Popup.onDocumentClick); 
    206230        saveTest(); 
    … …  
    223247        else if(start) 
    224248                displayTiddlers(null,start,1,null,null); 
    225 } 
    226  
    227 // Shame... 
    228 function browserTests() 
    229 { 
    230         var a = navigator.userAgent.toLowerCase(); 
    231         config.browser = { 
    232                 isIE: a.indexOf("msie") != -1 && a.indexOf("opera") == -1 
    233                 }; 
    234249} 
    235250 
    … …  
    40184033                </div> 
    40194034        </div> 
    4020         <div id="storeArea"><div tiddler="DefaultTiddlers" modified="200510302113" modifier="JeremyRuston" tags="systemTiddlers">HelloThere [[30 October 2005]] [[29 October 2005]] [[26 October 2005]] [[18 October 2005]] [[3 October 2005]] [[28 September 2005]] [[27 September 2005]]</div> 
     4035        <div id="storeArea"><div tiddler="DefaultTiddlers" modified="200511100024" modifier="JeremyRuston" tags="systemTiddlers">HelloThere [[10 November 2005]] [[30 October 2005]] [[29 October 2005]] [[26 October 2005]] [[18 October 2005]] [[3 October 2005]] [[28 September 2005]] [[27 September 2005]]</div> 
    40214036<div tiddler="MainMenu" modified="200510302117" modifier="JeremyRuston" tags="systemTiddlers">HelloThere\nTiddlyWiki\nMainFeatures\n[[TiddlyWiki/Dev]]\nGettingStarted\nUsingThisSite\n[[Community]]\nDownloadSoftware\nPluginsAndMacros\n[[ThankYou]]\n[[RSS|RssFeed]]\n\n© [[osmosoft|http://www.osmosoft.com]] 2005\n\n\n&lt;&lt;newTiddler&gt;&gt;\n&lt;&lt;newJournal &quot;DD MMM YYYY&quot;&gt;&gt;</div> 
    40224037<div tiddler="SiteSubtitle" modified="200507121318" modifier="JeremyRuston" tags="systemTiddlers">a reusable non-linear personal web notebook</div>