Focus editor when switching the preview on or off

Don't refresh the body editor when switching the preview on and off
Fix typo in 7d8766d2b9
2026-02-15 14:39:50 +00:00 · 2023-09-19 16:08:47 +01:00 · 2023-09-17 10:37:33 +01:00 · 2023-09-13 18:06:30 +01:00 · 2023-09-13 18:04:12 +01:00 · 2023-09-13 15:55:23 +01:00
12 changed files with 37 additions and 22 deletions
--- a/bin/build-site.sh
+++ b/bin/build-site.sh
@@ -104,13 +104,15 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--build favicon static index \
 	|| exit 1

-# /empty.html			Empty
-# /empty.hta			For Internet Explorer
+# /empty.html					Empty
+# /empty.hta					For Internet Explorer
+# /empty-external-core.html		External core empty
+# /tiddlywikicore-<version>.js	Core plugin javascript
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/empty \
 	--verbose \
 	--output $TW5_BUILD_OUTPUT \
-	--build empty \
+	--build empty emptyexternalcore \
 	|| exit 1


--- a/core/modules/editor/engines/framed.js
+++ b/core/modules/editor/engines/framed.js
@@ -60,7 +60,7 @@ function FramedEngine(options) {
 		this.domNode.value = this.value;
 	}
 	// Set the attributes
-	if(this.widget.editType) {
+	if(this.widget.editType && this.widget.editTag !== "textarea") {
 		this.domNode.setAttribute("type",this.widget.editType);
 	}
 	if(this.widget.editPlaceholder) {
--- a/core/modules/editor/engines/simple.js
+++ b/core/modules/editor/engines/simple.js
@@ -34,7 +34,7 @@ function SimpleEngine(options) {
 		this.domNode.value = this.value;
 	}
 	// Set the attributes
-	if(this.widget.editType) {
+	if(this.widget.editType && this.widget.editTag !== "textarea") {
 		this.domNode.setAttribute("type",this.widget.editType);
 	}
 	if(this.widget.editPlaceholder) {
--- a/core/ui/EditTemplate/body/default.tid
+++ b/core/ui/EditTemplate/body/default.tid
@@ -1,5 +1,9 @@
 title: $:/core/ui/EditTemplate/body/default

+\function edit-preview-state()
+[{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] +[get[text]] :else[[no]]
+\end
+
 \define config-visibility-title()
 $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 \end
@@ -10,15 +14,16 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$

 \whitespace trim
 <$let
-	edit-preview-state={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
 	importTitle=<<qualify $:/ImportImage>>
 	importState=<<qualify $:/state/ImportImage>> >
 <$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> >
-<$reveal stateTitle=<<edit-preview-state>> type="match" text="yes" tag="div">
-<div class="tc-tiddler-preview">
+<div>
+<div class={{{ [function[edit-preview-state]match[yes]then[tc-tiddler-preview]] +[join[ ]] }}}>

 <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>

+<$list filter="[function[edit-preview-state]match[yes]]" variable="ignore">
+
 <div class="tc-tiddler-preview-preview" data-tiddler-title={{!!draft.title}} data-tags={{!!tags}}>

 <$transclude tiddler={{$:/state/editpreviewtype}} mode="inline">
@@ -29,13 +34,12 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$

 </div>

+</$list>
+
 </div>
-</$reveal>

-<$reveal stateTitle=<<edit-preview-state>> type="nomatch" text="yes" tag="div">
+</div>

-<$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
-
-</$reveal>
 </$dropzone>
+
 </$let>
--- a/core/ui/EditorToolbar/preview.tid
+++ b/core/ui/EditorToolbar/preview.tid
@@ -9,11 +9,17 @@ button-classes: tc-text-editor-toolbar-item-start-group
 shortcuts: ((preview))

 \whitespace trim
+<$let
+	edit-preview-state={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
+>
 <$reveal state=<<edit-preview-state>> type="match" text="yes" tag="span">
 {{$:/core/images/preview-open}}
 <$action-setfield $tiddler=<<edit-preview-state>> $value="no"/>
+<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
 </$reveal>
 <$reveal state=<<edit-preview-state>> type="nomatch" text="yes" tag="span">
 {{$:/core/images/preview-closed}}
 <$action-setfield $tiddler=<<edit-preview-state>> $value="yes"/>
+<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
 </$reveal>
+</$let>
--- a/editions/empty/tiddlywiki.info
+++ b/editions/empty/tiddlywiki.info
@@ -12,6 +12,9 @@
 		"empty": [
 			"--render","$:/core/save/all","empty.html","text/plain",
 			"--render","$:/core/save/all","empty.hta","text/plain"],
+		"emptyexternalcore": [
+			"--render","$:/core/save/offline-external-js","empty-external-core.html","text/plain",
+			"--render","$:/core/templates/tiddlywiki5.js","[[tiddlywikicore-]addsuffix<version>addsuffix[.js]]","text/plain"],
 		"externalimages": [
 			"--savetiddlers","[is[image]]","images",
 			"--setfield","[is[image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
@@ -20,7 +23,7 @@
 		"static": [
 			"--render","$:/core/templates/static.template.html","static.html","text/plain",
 			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",			
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",
 			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
-}
+}
--- a/editions/pluginlibrary/tiddlywiki.info
+++ b/editions/pluginlibrary/tiddlywiki.info
@@ -17,8 +17,8 @@
 		],
 		"library": [
 			"--makelibrary","$:/UpgradeLibrary",
-   			"--savelibrarytiddlers","$:/UpgradeLibrary","[prefix[$:/]] -[[$:/plugins/tiddlywiki/upgrade]] -[[$:/plugins/tiddlywiki/translators]] -[[$:/plugins/tiddlywiki/pluginlibrary]] -[[$:/plugins/tiddlywiki/jasmine]]","recipes/library/tiddlers/","$:/UpgradeLibrary/List",
-   			"--savetiddler","$:/UpgradeLibrary/List","recipes/library/tiddlers.json",
+			"--savelibrarytiddlers","$:/UpgradeLibrary","[prefix[$:/]] -[[$:/plugins/tiddlywiki/upgrade]] -[[$:/plugins/tiddlywiki/translators]] -[[$:/plugins/tiddlywiki/pluginlibrary]] -[[$:/plugins/tiddlywiki/jasmine]]","recipes/library/tiddlers/","$:/UpgradeLibrary/List",
+			"--savetiddler","$:/UpgradeLibrary/List","recipes/library/tiddlers.json",
 			"--rendertiddler","$:/plugins/tiddlywiki/pluginlibrary/library.template.html","index.html","text/plain"]
 	}
 }
--- a/editions/resumebuilder/tiddlywiki.info
+++ b/editions/resumebuilder/tiddlywiki.info
@@ -20,4 +20,4 @@
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico"]
 	}
-}
+}
--- a/editions/server-external-js/tiddlywiki.info
+++ b/editions/server-external-js/tiddlywiki.info
@@ -17,7 +17,7 @@
 		"static": [
 			"--render","$:/core/templates/static.template.html","static.html","text/plain",
 			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",			
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",
 			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"],
 		"tiddlywikicore": [
 			"--render","$:/core/templates/tiddlywiki5.js","[[tiddlywikicore-]addsuffix<version>addsuffix[.js]]","text/plain"]
--- a/editions/tw.org/tiddlywiki.info
+++ b/editions/tw.org/tiddlywiki.info
@@ -21,7 +21,7 @@
 		"static": [
 			"--render","$:/core/templates/static.template.html","static.html","text/plain",
 			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html",				
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html",
 			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	},
 	"config": {
--- a/editions/tw5.com/tiddlywiki.info
+++ b/editions/tw5.com/tiddlywiki.info
@@ -49,7 +49,7 @@
 		"static": [
 			"--render","$:/core/templates/static.template.html","static.html","text/plain",
 			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html",			
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html",
 			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"],
 		"external-js": [
 			"--render","$:/core/save/offline-external-js","[[external-]addsuffix<version>addsuffix[.html]]","text/plain",
--- a/themes/tiddlywiki/vanilla/settings.multids
+++ b/themes/tiddlywiki/vanilla/settings.multids
@@ -1,6 +1,6 @@
 title: $:/themes/tiddlywiki/vanilla/settings/

-fontfamily: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;
+fontfamily: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji
 codefontfamily: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace
 backgroundimageattachment: fixed
 backgroundimagesize: auto
Author	SHA1	Message	Date
Jeremy Ruston	bb3253fb21	Focus editor when switching the preview on or off	2023-09-19 16:08:47 +01:00
Jeremy Ruston	276ba92429	Don't refresh the body editor when switching the preview on and off	2023-09-17 10:37:33 +01:00
Jeremy Ruston	49c96901f3	Fix typo in `7d8766d2b9`	2023-09-13 18:06:30 +01:00
Jeremy Ruston	7d8766d2b9	Test editors shouldn't set type attribute of textareas fixes #7732	2023-09-13 18:04:12 +01:00
Simon Baird	6255856205	Add offline-external-js to empty edition (#7737 ) Currently I'm building these files myself for use on tiddlyhost.com. I'm thinking it would be nicer if they were built and distributed by TiddlyWiki's own build automation, so this is a step towards that. The two new files that are created, "empty-external-core.js" and "tiddlywikicore-<version>.js" will appear alongside the existing "empty.html" and "empty.hta" when the TiddlyWiki site is deployed.	2023-09-13 15:55:23 +01:00
Simon Baird	6f307ae01e	Fix edition file formatting inconsistencies (#7738 ) I noticed these inconsistencies in the tiddlywiki.info json files while working on the previous commit and thought I'd fix them for the sake of neatness and tidiness. This contains whitespace changes only, so git diff -b should be empty. Includes: - Remove some trailing whitespace in several files - Fix incorrect indenting in one file - Add end of file newlines in two files	2023-09-13 15:12:49 +01:00
Simon Huber	213a850715	Remove ";" from value of $:/themes/tiddlywiki/vanilla/settings/fontfamily (#7735 ) the tiddler gets transcluded in the stylesheets like so: ``` font-family: {{$:/themes/tiddlywiki/vanilla/settings/fontfamily}}; ``` note - the semicolon at the end So this semicolon is superfluous	2023-09-12 09:11:18 +01:00