diff --git a/core/modules/filters/filter.js b/core/modules/filters/filter.js index 5923d48a0..bf11560ce 100644 --- a/core/modules/filters/filter.js +++ b/core/modules/filters/filter.js @@ -14,7 +14,7 @@ Export our filter function */ exports.filter = function(source,operator,options) { var suffixes = operator.suffixes || [], - defaultFilterRunPrefix = (suffixes[0] || [options.defaultFilterRunPrefix] || [])[0] || "or", + defaultFilterRunPrefix = (suffixes[0] && suffixes[0][0]) || options.defaultFilterRunPrefix || "or", filterFn = options.wiki.compileFilter(operator.operand,{defaultFilterRunPrefix}), results = [], target = operator.prefix !== "!"; diff --git a/core/modules/filters/subfilter.js b/core/modules/filters/subfilter.js index 4f428ef7d..2c1a631ff 100644 --- a/core/modules/filters/subfilter.js +++ b/core/modules/filters/subfilter.js @@ -14,7 +14,7 @@ Export our filter function */ exports.subfilter = function(source,operator,options) { var suffixes = operator.suffixes || [], - defaultFilterRunPrefix = (suffixes[0] || [options.defaultFilterRunPrefix] || [])[0] || "or"; + defaultFilterRunPrefix = (suffixes[0] && suffixes[0][0]) || options.defaultFilterRunPrefix || "or"; var list = options.wiki.filterTiddlers(operator.operand,options.widget,source,{defaultFilterRunPrefix}); if(operator.prefix === "!") { var results = []; diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid index b13a091d2..4bb869f51 100644 --- a/core/wiki/macros/CSS.tid +++ b/core/wiki/macros/CSS.tid @@ -2,6 +2,7 @@ title: $:/core/macros/CSS tags: $:/tags/Macro \procedure actions-compile-palette-filtered(consolidatedPalette,outputPalette) + \function tf.colour(name) [getindex] :else[[$:/config/DefaultColourMappings/]addsuffixget[text]] :map[tf.colour-inner-transform-classic-palette-entry] :map[subfilter:alljoin[ ]] \function colour(name) [tf.colour] @@ -83,12 +84,6 @@ tags: $:/tags/Macro <$transclude $variable="actions-compile-palette" inputPalette={{$:/palette}} outputPalette="$:/temp/palette-colours"/> \end actions-recompile-current-palette -\procedure actions-switch-colour-palette(paletteTitle) -\procedure tv-action-refresh-policy() always -<$action-deletetiddler $tiddler="$:/temp/palette-colours"/> -<> -\end actions-switch-colour-palette - \procedure tv-palette-name() $:/temp/palette-colours \function tf.colour(name)