Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix problem with extraneous raw markup in saved files
Previously, raw markup tiddlers were being saved even if they weren't included in the saveTiddlerFilter. This meant that, for example, using "save empty" button in GettingStarted would include the splash screen markup tiddler.
- Loading branch information
Showing
1 changed file
with
19 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,59 @@ | ||
| title: $:/core/templates/tiddlywiki5.html | ||
|
|
||
| \rules only filteredtranscludeinline transcludeinline | ||
| <!doctype html> | ||
| {{$:/core/templates/MOTW.html}}<html> | ||
| <$set name="saveTiddlerAndShadowsFilter" filter="[subfilter<saveTiddlerFilter>] [subfilter<saveTiddlerFilter>plugintiddlers[]]"> | ||
| `<!doctype html> | ||
| `{{$:/core/templates/MOTW.html}}`<html> | ||
| <head> | ||
| <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> | ||
| <!--~~ Raw markup for the top of the head section ~~--> | ||
| {{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}} | ||
| `{{{ [<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}}` | ||
| <meta http-equiv="X-UA-Compatible" content="IE=Edge"/> | ||
| <meta name="application-name" content="TiddlyWiki" /> | ||
| <meta name="generator" content="TiddlyWiki" /> | ||
| <meta name="tiddlywiki-version" content="{{$:/core/templates/version}}" /> | ||
| <meta name="tiddlywiki-version" content="`{{$:/core/templates/version}}`" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <meta name="apple-mobile-web-app-capable" content="yes" /> | ||
| <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> | ||
| <meta name="mobile-web-app-capable" content="yes"/> | ||
| <meta name="format-detection" content="telephone=no" /> | ||
| <meta name="copyright" content="{{$:/core/copyright.txt}}" /> | ||
| <meta name="copyright" content="`{{$:/core/copyright.txt}}`" /> | ||
| <link id="faviconLink" rel="shortcut icon" href="favicon.ico"> | ||
| <title>{{$:/core/wiki/title}}</title> | ||
| <title>`{{$:/core/wiki/title}}`</title> | ||
| <!--~~ This is a Tiddlywiki file. The points of interest in the file are marked with this pattern ~~--> | ||
|
|
||
| <!--~~ Raw markup ~~--> | ||
| {{{ [all[shadows+tiddlers]tag[$:/core/wiki/rawmarkup]] [all[shadows+tiddlers]tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}} | ||
| {{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified]] ||$:/core/templates/raw-static-tiddler}}} | ||
| `{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/core/wiki/rawmarkup]] ||$:/core/templates/plain-text-tiddler}}} | ||
| {{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}} | ||
| {{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified]] ||$:/core/templates/raw-static-tiddler}}}` | ||
| </head> | ||
| <body class="tc-body"> | ||
| <!--~~ Raw markup for the top of the body section ~~--> | ||
| {{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified/TopBody]] ||$:/core/templates/raw-static-tiddler}}} | ||
| `{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/TopBody]] ||$:/core/templates/raw-static-tiddler}}}` | ||
| <!--~~ Static styles ~~--> | ||
| <div id="styleArea"> | ||
| {{$:/boot/boot.css||$:/core/templates/css-tiddler}} | ||
| `{{$:/boot/boot.css||$:/core/templates/css-tiddler}}` | ||
| </div> | ||
| <!--~~ Static content for Google and browsers without JavaScript ~~--> | ||
| <noscript> | ||
| <div id="splashArea"> | ||
| {{$:/core/templates/static.area}} | ||
| `{{$:/core/templates/static.area}}` | ||
| </div> | ||
| </noscript> | ||
| <!--~~ Ordinary tiddlers ~~--> | ||
| {{$:/core/templates/store.area.template.html}} | ||
| `{{$:/core/templates/store.area.template.html}}` | ||
| <!--~~ Library modules ~~--> | ||
| <div id="libraryModules" style="display:none;"> | ||
| {{{ [is[system]type[application/javascript]library[yes]] ||$:/core/templates/javascript-tiddler}}} | ||
| `{{{ [is[system]type[application/javascript]library[yes]] ||$:/core/templates/javascript-tiddler}}}` | ||
| </div> | ||
| <!--~~ Boot kernel prologue ~~--> | ||
| <div id="bootKernelPrefix" style="display:none;"> | ||
| {{ $:/boot/bootprefix.js ||$:/core/templates/javascript-tiddler}} | ||
| `{{ $:/boot/bootprefix.js ||$:/core/templates/javascript-tiddler}}` | ||
| </div> | ||
| <!--~~ Boot kernel ~~--> | ||
| <div id="bootKernel" style="display:none;"> | ||
| {{ $:/boot/boot.js ||$:/core/templates/javascript-tiddler}} | ||
| `{{ $:/boot/boot.js ||$:/core/templates/javascript-tiddler}}` | ||
| </div> | ||
| <!--~~ Raw markup for the bottom of the body section ~~--> | ||
| {{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}} | ||
| `{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}}` | ||
| </body> | ||
| </html> | ||
| </html>` |