mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-02-05 05:30:02 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into geospatial-plugin

Browse Source
This commit is contained in:
jeremy@jermolene.com 2023-01-13 10:54:22 +00:00
commit 60e94bf5a5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/tiddlywiki/innerwiki/innerwiki.js
View File

@ -295,7 +295,7 @@ InnerWikiWidget.prototype.readTiddlerDataWidget = function(dataWidget) {
if(tiddler) { if(tiddler) {
fields = tiddler.getFieldStrings(); fields = tiddler.getFieldStrings();
} }
results.push($tw.utils.extend({},item,fields)); results.push($tw.utils.extend({},fields,item));
}) })
return results; return results;
} else { } else {

2
plugins/tiddlywiki/share/rawmarkup.js
View File

@ -17,7 +17,7 @@ var rawHash = document.location.hash.substring(1);
if(rawHash.charAt(0) === "#") { if(rawHash.charAt(0) === "#") {
var hash; var hash;
try{ try{
hash = $tw.utils.decodeURIComponentSafe(rawHash.substring(1)); hash = decodeURIComponent(rawHash.substring(1));
} catch(ex) { } catch(ex) {
console.log("Share plugin: Error decoding location hash",ex); console.log("Share plugin: Error decoding location hash",ex);
} }

4
plugins/tiddlywiki/share/wizard.tid
View File

@ -1,7 +1,7 @@
title: $:/plugins/tiddlywiki/share/wizard title: $:/plugins/tiddlywiki/share/wizard
\define generate-json() \define generate-json()
<$macrocall $name="jsontiddlers" filter=<<share-filter>> spaces="" $output="text/vnd.tiddlywiki"/> <$macrocall $name="jsontiddlers" filter=<<share-filter>> spaces="" $output="text/raw"/>
\end \end
\define inner-share-actions() \define inner-share-actions()
@ -12,10 +12,12 @@ title: $:/plugins/tiddlywiki/share/wizard
\define share-actions() \define share-actions()
<$set name="base-url" value={{$:/config/plugins/share/base-url}} emptyValue={{$:/info/url/full}}> <$set name="base-url" value={{$:/config/plugins/share/base-url}} emptyValue={{$:/info/url/full}}>
<$set name="tv-action-refresh-policy" value="always">
<$set name="share-filter" value={{$:/config/plugins/share/filter}}> <$set name="share-filter" value={{$:/config/plugins/share/filter}}>
<<inner-share-actions>> <<inner-share-actions>>
</$set> </$set>
</$set> </$set>
</$set>
\end \end
<div class="tc-sharing-wizard-wrapper"> <div class="tc-sharing-wizard-wrapper">