mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2025-01-26 08:56:52 +00:00
Merge branch 'master' into geospatial-plugin
This commit is contained in:
commit
60e94bf5a5
@ -295,7 +295,7 @@ InnerWikiWidget.prototype.readTiddlerDataWidget = function(dataWidget) {
|
||||
if(tiddler) {
|
||||
fields = tiddler.getFieldStrings();
|
||||
}
|
||||
results.push($tw.utils.extend({},item,fields));
|
||||
results.push($tw.utils.extend({},fields,item));
|
||||
})
|
||||
return results;
|
||||
} else {
|
||||
|
@ -17,7 +17,7 @@ var rawHash = document.location.hash.substring(1);
|
||||
if(rawHash.charAt(0) === "#") {
|
||||
var hash;
|
||||
try{
|
||||
hash = $tw.utils.decodeURIComponentSafe(rawHash.substring(1));
|
||||
hash = decodeURIComponent(rawHash.substring(1));
|
||||
} catch(ex) {
|
||||
console.log("Share plugin: Error decoding location hash",ex);
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
title: $:/plugins/tiddlywiki/share/wizard
|
||||
|
||||
\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
|
||||
|
||||
\define inner-share-actions()
|
||||
@ -12,10 +12,12 @@ title: $:/plugins/tiddlywiki/share/wizard
|
||||
|
||||
\define share-actions()
|
||||
<$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}}>
|
||||
<<inner-share-actions>>
|
||||
</$set>
|
||||
</$set>
|
||||
</$set>
|
||||
\end
|
||||
|
||||
<div class="tc-sharing-wizard-wrapper">
|
||||
|
Loading…
Reference in New Issue
Block a user