Changeset 78

Timestamp:

11/04/06 21:57:45 (2 years ago)

Author:

DevonJones

Message:

TiddlyWiki 2.0.00 Merge

Files:

• Tags/2.0.00 (moved) (moved from Branches/2.0.00)
• Tags/2.0.00/tiddlywiki.html (copied) (copied from Branches/2.0.00/tiddlywiki.html)
• Trunk/core/tiddlywiki.html (modified) (91 diffs)

Trunk/core/tiddlywiki.html

@@ -1 @@
-html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN
+HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd
-<script type="text/javascript">
-1, minor: 2, revision: 39, date: new Date("Nov 30, 2005
+2, minor: 0, revision: 0, date: new Date("Jan 5, 2006
-</script>
-<!--
-
-
-
-
-
+
+
+
-
-Redistribution and use in source and binary forms, with or without modification,
@@ -45 +43 @@
-// ---------------------------------------------------------------------------------
-
+// Miscellaneous options
-var config = {
-        // Options that can be set in the options panel and/or cookies
-        options: {
-                chkRegExpSearch: false,
-                chkCaseSensitiveSearch: false,
-                chkAnimate: true,
-                txtUserName: "YourName",
-                chkSaveBackups: true,
-                chkAutoSave: false,
-                chkGenerateAnRssFeed: false,
-                chkSaveEmptyTemplate: false,
-                chkOpenInNewWindow: true,
-                chkToggleLinks: false,
-                chkHttpReadOnly: false,
-                chkForceMinorUpdate: false,
-                txtMainTab: "tabTimeline",
-                txtMoreTab: "moreTabAll"
-                },
-        // List of notification functions to be called when certain tiddlers are changed or deleted
-        notifyTiddlers: [
-                {name: "StyleSheetColors", notify: refreshStyles},
-                {name: "StyleSheetLayout", notify: refreshStyles},
-                {name: "StyleSheet", notify: refreshStyles},
-                {name: null, notify: refreshMenu},
-                {name: null, notify: refreshStory},
-                {name: null, notify: refreshTabs},
-                {name: "SiteTitle", notify: refreshTitle},
-                {name: "SiteSubtitle", notify: refreshSubtitle},
-                {name: "SideBarOptions", notify: refreshSidebar}
-                ],
-        // Shadow tiddlers for emergencies
-        shadowTiddlers: {
-                SideBarOptions: "<<gradient vert #ffffff #cc9900>><<search>><<closeAll>><<permaview>><<saveChanges>><<slider chkSliderOptionsPanel OptionsPanel options 'Change TiddlyWiki advanced options'>>>>",
-                OptionsPanel: "These InterfaceOptions for customising TiddlyWiki are saved in your browser\n\nYour username for signing your edits. Write it as a WikiWord (eg JoeBloggs)\n\n<<option txtUserName>>\n<<option chkSaveBackups>> SaveBackups\n<<option chkAutoSave>> AutoSave\n<<option chkGenerateAnRssFeed>> GenerateAnRssFeed\n<<option chkRegExpSearch>> RegExpSearch\n<<option chkCaseSensitiveSearch>> CaseSensitiveSearch\n<<option chkAnimate>> EnableAnimations\n\nSee AdvancedOptions",
-                AdvancedOptions: "<<option chkOpenInNewWindow>> OpenLinksInNewWindow\n<<option chkSaveEmptyTemplate>> SaveEmptyTemplate\n<<option chkToggleLinks>> Clicking on links to tiddlers that are already open causes them to close\n^^(override with Control or other modifier key)^^\n<<option chkHttpReadOnly>> HideEditingFeatures when viewed over HTTP\n<<option chkForceMinorUpdate>> Treat edits as MinorChanges by preserving date and time\n^^(override with Shift key when clicking 'done' or by pressing Ctrl-Shift-Enter^^",
-                SideBarTabs: "<<tabs txtMainTab Timeline Timeline TabTimeline All 'All tiddlers' TabAll Tags 'All tags' TabTags More 'More lists' TabMore>>",
-                TabTimeline: "<<timeline>>",
-                TabAll: "<<list all>>",
-                TabTags: "<<allTags>>",
-                TabMore: "<<tabs txtMoreTab Missing 'Missing tiddlers' TabMoreMissing Orphans 'Orphaned tiddlers' TabMoreOrphans>>",
-                TabMoreMissing: "<<list missing>>",
-                TabMoreOrphans: "<<list orphans>>"
-                },
-        // Miscellaneous options
-        numRssItems: 20, // Number of items in the RSS feed
-        animFast: 0.12, // Speed for animations (lower == slower)
-        animSlow: 0.01, // Speed for EasterEgg animations
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                },
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                },
-macros: { // Each has a 'handler' member that is inserted later
-       today: {
-       version: {
-       search: {label: "search", prompt: "Search this TiddlyWiki", sizeTextbox: 15, accessKey: "F", successMsg: "%0 tiddlers found matching %1", failureMsg: "No tiddlers found matching %0"
-       tiddler
-       tag: {
-       timeline: {dateFormat: "DD MMM YYYY
-       allTags: {tooltip: "Show tiddlers tagged with '%0'", noTags: "There are no tagged tiddlers"
-       list: {
-               all: {prompt: "All tiddlers in alphabetical order"
-               missing: {prompt: "Tiddlers that have links to them but are not defined"
-               orphans: {prompt: "Tiddlers that are not linked to from any other tiddlers"
-               shadowed: {prompt: "Tiddlers shadowed with default contents"}
-               
-       closeAll: {label: "close all", prompt: "Close all displayed tiddlers (except any that are being edited)"},
-       permaview: {label: "permaview", prompt: "Link to an URL that retrieves all the currently displayed tiddlers"},
-
-
-
-       newTiddler: {label: "new tiddler", prompt: "Create a new tiddler", title: "New Tiddler", accessKey: "N
-       newJournal: {label: "new journal", prompt: "Create a new tiddler from the current date and time", accessKey: "J
-       sparkline: {
-       tabs: {
-       gradient: {}
-       
-textPrimitives: {}
-
-
-
-
+closeAll: {label: "close all", prompt: "Close all displayed tiddlers (except any that are being edited)"},
+permaview: {label: "permaview", prompt: "Link to an URL that retrieves all the currently displayed tiddlers"
+saveChanges: {label: "save changes", prompt: "Save all tiddlers to create a new TiddlyWiki", accessKey: "S"
+slider: {
+option
+newTiddler: {label: "new tiddler", prompt: "Create a new tiddler", title: "New Tiddler", accessKey: "N"
+newJournal: {label: "new journal", prompt: "Create a new tiddler from the current date and time", accessKey: "J
+sparkline: {
+tabs: {},
+gradient: {
+message: {
+view: {
+edit: {},
+tagChooser: {
+toolbar: {}
+};
+
+
+
+closeTiddler: {text: "close", tooltip: "Close this tiddler
+closeOthers: {text: "close others", tooltip: "Close all other tiddlers
+editTiddler: {text: "edit", tooltip: "Edit this tiddler"
+saveTiddler: {text: "done", tooltip: "Save changes to this tiddler"
+cancelTiddler: {text: "cancel", tooltip: "Undo changes to this tiddler"},
+deleteTiddler: {text: "delete", tooltip: "Delete this tiddler", warning: "Are you sure you want to delete '%0'?"
+permalink: {text: "permalink", tooltip: "Permalink for this tiddler"},
+
+
+
+
-// Browser detection... In a very few places, there's nothing else for it but to
-// know what browser we're using.
-// ---------------------------------------------------------------------------------
-
-config.userAgent = navigator.userAgent.toLowerCase();
-config.browser = {
-        isIE: config.userAgent.indexOf("msie") != -1 && config.userAgent.indexOf("opera") == -1,
+        isSafari: config.userAgent.indexOf("applewebkit") != -1,
-        isBadSafari: !((new RegExp("[\u0150\u0170]","g")).test("\u0150"))
-        };
-
-// ---------------------------------------------------------------------------------
-// Basic regular expressions
-
-
+
+
+
+
+
-if(config.browser.isBadSafari)
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-config.textPrimitives.anyDigit = "[0-9]";
-config.textPrimitives.anyNumberChar = "[0-9\\.E]";
-
+file|
-config.textPrimitives.unWikiLink = "~";
-config.textPrimitives.wikiLink = "(?:" + config.textPrimitives.unWikiLink + "{0,1})(?:(?:" + config.textPrimitives.upperLetter + "+" +
@@ -206 +218 @@
-
-// ---------------------------------------------------------------------------------
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-// ---------------------------------------------------------------------------------
@@ -216 +244 @@
-// ---------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-// Starting up
-function main()
-{
+        store = new TiddlyWiki();
+        story = new Story("tiddlerDisplay","tiddler");
-        addEvent(document,"click",Popup.onDocumentClick);
-        saveTest();
@@ -234 +263 @@
-        store.loadFromDiv("storeArea","store");
-        loadSystemConfig();
+        formatter = new Formatter(config.formatters);
-        readOnly = (document.location.toString().substr(0,7) == "http://") ? config.options.chkHttpReadOnly : false;
-        store.notifyAll();
@@ -244 +274 @@
-        var start = store.getTiddlerText("DefaultTiddlers");
-        if(window.location.hash)
-displayTiddlers(null,convertUTF8ToUnicode(decodeURI(window.location.hash.substr(1))),1,null,null
+story.displayTiddlers(null,convertUTF8ToUnicode(decodeURI(window.location.hash.substr(1))).readBracketedList()
-        else if(start)
-displayTiddlers(null,start,1,null,null
+story.displayTiddlers(null,start.readBracketedList()
-}
-
@@ -284 +314 @@
-}
-
+function invokeMacro(place,macro,params,wikifier,tiddler)
+{
+        try
+                {
+                var m = config.macros[macro];
+                if(m && m.handler)
+                        m.handler(place,macro,params.readMacroParams(),wikifier,params,tiddler);
+                else
+                        createTiddlyError(place,config.messages.macroError.format([macro]),config.messages.macroErrorDetails.format([macro,config.messages.missingMacro]));
+                }
+        catch(ex)
+                {
+                createTiddlyError(place,config.messages.macroError.format([macro]),config.messages.macroErrorDetails.format([macro,ex.toString()]));
+                }
+}
+
-// ---------------------------------------------------------------------------------
-// Formatters
-// ---------------------------------------------------------------------------------
+
+function Formatter(formatters)
+{
+        this.formatters = [];
+        var pattern = [];
+        for(var n=0; n<formatters.length; n++)
+                {
+                pattern.push("(" + formatters[n].match + ")");
+                this.formatters.push(formatters[n]);
+                }
+        this.formatterRegExp = new RegExp(pattern.join("|"),"mg");
+}
-
-config.formatterHelpers = {
@@ -384 +442 @@
-                                        w.nextMatch = w.nextMatch + 1;
-                                        w.subWikify(rowContainer,this.rowTerminator);
+                                        table.insertBefore(rowContainer,table.firstChild);
-                                        }
-                                else
-                                        {
-
+
+
-                                        this.rowHandler(w,rowElement,prevColumns);
-                                        }
@@ -501 +561 @@
-
-{
+        name: "monospacedByLineForCSS",
+        match: "^/\\*[\\{]{3}\\*/\\n",
+        lookahead: "/\\*[\\{]{3}\\*/\\n*((?:^[^\\n]*\\n)+?)(\\n*^/\\*[\\}]{3}\\*/$\\n?)", 
+        handler: config.formatterHelpers.monospacedByLineHelper
+},
+
+{
-        name: "monospacedByLineForPlugin",
-        match: "^//\\{\\{\\{\\n",
@@ -673 +740 @@
-{
-        name: "urlLink",
-"(?:http|https|mailto|ftp):[^\\s'\"]+(?:/|\\b)"
+config.textPrimitives.urlPattern
-        handler: function(w)
-        {
@@ -699 +766 @@
-                                else
-                                        e = createExternalLink(w.output,lookaheadMatch[5]);
+                                addClass(e,"imageLink");
-                                }
-                        var img = createTiddlyElement(e,"img");
@@ -716 +784 @@
-        name: "macro",
-        match: "<<",
-[^>]
+(?:[^>]|(?:>(?!>)))
-        handler: function(w)
-        {
@@ -723 +791 @@
-                var lookaheadMatch = lookaheadRegExp.exec(w.source)
-                if(lookaheadMatch && lookaheadMatch.index == w.matchStart && lookaheadMatch[1])
-
-
+
-                        w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                        }
-        }
@@ -865 +920 @@
-                createTiddlyElement(w.output,"br");
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
-];
-
@@ -872 +938 @@
-// ---------------------------------------------------------------------------------
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        this.source = source;
-
+
+
-        this.nextMatch = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -918 +1009 @@
-        do {
-                // Prepare the RegExp match positions
-
+.formatter
-                if(terminatorRegExp)
-                        terminatorRegExp.lastIndex = this.nextMatch;
-                // Get the first matches
-
+.formatter
-                var terminatorMatch = terminatorRegExp ? terminatorRegExp.exec(this.source) : null;
-                // Check for a terminator match
@@ -949 +1040 @@
-                        this.matchLength = formatterMatch[0].length;
-                        this.matchText = formatterMatch[0];
-
+.formatter
-                        // Figure out which formatter matched
-                        var matchingformatter = -1;
@@ -957 +1048 @@
-                        // Call the formatter
-                        if(matchingFormatter != -1)
-
+.formatter
-                        }
-        } while(terminatorMatch || formatterMatch);
@@ -1073 +1164 @@
-config.macros.timeline.handler = function(place,macroName,params)
-{
-
+
+
-        var lastDay = "";
-        for (t=tiddlers.length-1; t>=0; t--)
@@ -1097 +1189 @@
-        var doSearch = function(txt)