Merge remote-tracking branch 'upstream/master'

core/modules/parsers/htmlparser.js

@@ -23,7 +23,8 @@ var HtmlParser = function(type,text,options) {
 		type: "element",
 		tag: "iframe",
 		attributes: {
-			src: {type: "string", value: src}
+			src: {type: "string", value: src},
+			sandbox: {type: "string", value: "sandbox"}
 		}
 	}];
 };

core/wiki/tags/PageTemplate.tid

@@ -1,3 +1,3 @@
 title: $:/tags/PageTemplate
-list: [[$:/core/ui/PageTemplate/sidebar]] [[$:/core/ui/PageTemplate/story]] [[$:/core/ui/PageTemplate/alerts]] [[$:/core/ui/PageTemplate/topleftbar]] [[$:/core/ui/PageTemplate/toprightbar]]
+list: [[$:/core/ui/PageTemplate/topleftbar]] [[$:/core/ui/PageTemplate/toprightbar]] [[$:/core/ui/PageTemplate/sidebar]] [[$:/core/ui/PageTemplate/story]] [[$:/core/ui/PageTemplate/alerts]]
 

editions/test/tiddlers/tests/test-filters.js

@@ -33,13 +33,13 @@ describe("Filter tests", function() {
 				tiddler: new $tw.Tiddler({title: "TiddlerSeventh",
 					text: "",
 					list: "TiddlerOne [[Tiddler Three]] [[a fourth tiddler]] MissingTiddler",
-					tags: []
+					tags: ["one"]
 				}),
 			},
 			"Tiddler8": {
 				tiddler: new $tw.Tiddler({title: "Tiddler8",
 					text: "Tidd",
-					tags: [],
+					tags: ["one"],
 					"test-field": "JoeBloggs"
 				})
 			}
@@ -162,11 +162,11 @@ describe("Filter tests", function() {
 	});
 
 	it("should handle the tagging operator", function() {
-		expect(wiki.filterTiddlers("[[one]tagging[]sort[title]]").join(",")).toBe("Tiddler Three,TiddlerOne");
-		expect(wiki.filterTiddlers("[[one]tagging[]]").join(",")).toBe("Tiddler Three,TiddlerOne");
+		expect(wiki.filterTiddlers("[[one]tagging[]sort[title]]").join(",")).toBe("Tiddler Three,Tiddler8,TiddlerOne,TiddlerSeventh");
+		expect(wiki.filterTiddlers("[[one]tagging[]]").join(",")).toBe("Tiddler Three,TiddlerOne,Tiddler8,TiddlerSeventh");
 		expect(wiki.filterTiddlers("[[two]tagging[]sort[title]]").join(",")).toBe("$:/TiddlerFive,$:/TiddlerTwo,Tiddler Three");
 		var fakeWidget = {getVariable: function() {return "one";}};
-		expect(wiki.filterTiddlers("[all[current]tagging[]sort[title]]",fakeWidget).join(",")).toBe("Tiddler Three,TiddlerOne");
+		expect(wiki.filterTiddlers("[all[current]tagging[]]",fakeWidget).join(",")).toBe("Tiddler Three,TiddlerOne,Tiddler8,TiddlerSeventh");
 	});
 
 	it("should handle the untagged operator", function() {

editions/tw5.com/tiddlers/concepts/OrderOfTaggedTiddlers.tid

@@ -1,5 +1,5 @@
 created: 20150124125646000
-modified: 20150124202917000
+modified: 20150127154154000
 tags: Concepts
 title: Order of Tagged Tiddlers
 
@@ -12,4 +12,4 @@ When ~TiddlyWiki generates a list of the tiddlers that have a particular tag (e.
 
 # In each remaining tiddler <<.place T>>, look for a <<.field list-after>> field. If this has a tiddler title as its value, place tiddler <<.place T>> just <<.em after>> that one.
 
-# If any tiddlers still remain, place them at the end of the list. <!-- in alphabetical order if #1378 is accepted; then also update Tagging -->
+# If any tiddlers still remain, place them at the end of the list in ascending alphabetical order of title. The difference between capital and lowercase letters is ignored.

editions/tw5.com/tiddlers/filters/each.tid

@@ -1,5 +1,5 @@
 created: 20140410103123179
-modified: 20150124164957000
+modified: 20150127202915000
 tags: [[Filter Operators]] [[Group Operators]]
 title: each Operator
 type: text/vnd.tiddlywiki
@@ -8,13 +8,19 @@ purpose: select one of each group of input titles by field
 
 <$macrocall $name=".operator-def"
 input="a [[selection of titles|Title Selection]]"
-parameter="the name of a [[field|TiddlerFields]]"
+suffix="optionally, `list`"
+parameter="the name of a [[field|TiddlerFields]], defaulting to <<.field title>>"
 paramName="f"
 output="a selection containing the first input title encountered for each distinct value of field <<.place f>>"
 />
 
-Each input title is processed in turn. The value of field <<.place f>> in the corresponding tiddler is examined, and as long as the value has not been encountered before, the title is appended to the output set.
+Each input title is processed in turn. The value of field <<.place f>> in the corresponding tiddler is examined.
 
-If a tiddler doesn't contain field <<.place f>>, or contains it but with an empty value, then it contributes nothing to the output.
+;each
+:As long as the field's value has not been encountered before, the title is appended to the output.
+;each:list
+:The value is treated as a [[title list|Title List]]. Each title in the list considered in turn. If it has not been encountered before, it is appended to the output.
+
+If a tiddler doesn't contain field <<.place f>>, it is treated as if the field's value was empty.
 
 <<.operator-examples "each">>

editions/tw5.com/tiddlers/filters/eachday.tid

@@ -1,5 +1,5 @@
 created: 20140410103123179
-modified: 20150124214554000
+modified: 20150127202806000
 tags: [[Filter Operators]] [[Group Operators]] [[Date Operators]]
 title: eachday Operator
 type: text/vnd.tiddlywiki
@@ -13,7 +13,7 @@ paramName="f"
 output="a selection containing the first input title encountered for each distinct value (ignoring times of day) of field <<.place f>>"
 />
 
-Each input title is processed in turn. The value of field <<.place f>> in the corresponding tiddler is examined, and as long as this indicates a date that has not been encountered before, the title is appended to the output set.
+Each input title is processed in turn. The value of field <<.place f>> in the corresponding tiddler is examined, and as long as this indicates a date that has not been encountered before, the title is appended to the output.
 
 If a tiddler doesn't contain field <<.place f>>, it contributes nothing to the output.
 

editions/tw5.com/tiddlers/howtos/Tagging.tid

@@ -1,5 +1,5 @@
 created: 20140904075400000
-modified: 20150124202936000
+modified: 20150127154219000
 tags: [[Working with TiddlyWiki]] Concepts
 title: Tagging
 type: text/vnd.tiddlywiki
@@ -33,7 +33,7 @@ You can use the [[tag manager|$:/TagManager]], found on the ''Tags'' tab under '
 
 ! Change the order in which tags are listed
 
-By default, tagged tiddlers are listed in the order they were added to the wiki. The <<.olink sort>> operator can change the order to alphabetical.
+By default, tagged tiddlers are listed in alphabetical order.
 
 If you want any other order, add a <<.flink ListField>> field to the tag tiddler, and set its value to be a [[list of the tiddlers|Title List]] in that order.
 

editions/tw5.com/tiddlers/system/operator-macros.tid

@@ -1,8 +1,12 @@
 created: 20150117152607000
-modified: 20150126144131000
+modified: 20150127203427000
 title: $:/editions/tw5.com/operator-macros
 tags: $:/tags/Macro
 
+\define .operator-suffix-name(suffixName)
+<$macrocall $name=".if" cond="""$suffixName$""" then="<<.place '$suffixName$'>> = " else=""/>
+\end
+
 \define .operator-def(input,negationInput,suffix,suffixName,parameter,paramName,output,negationOutput)
 <table class="doc-table">
 <tr><th align="left">purpose</th><td>{{!!purpose}}</td></tr>
@@ -11,7 +15,7 @@ tags: $:/tags/Macro
 then="""<tr><th align="left">`!` input</th><td>$negationInput$</td></tr>"""
 else=""/>
 <$macrocall $name=".if" cond="""$suffix$"""
-then="""<tr><th align="left">[[suffix|Filter Step]]</th><td><<.place "$suffixName$">> = $suffix$</td></tr>"""
+then="""<tr><th align="left">[[suffix|Filter Step]]</th><td><<.operator-suffix-name "$suffixName$">>$suffix$</td></tr>"""
 else=""/>
 <tr><th align="left">[[parameter|Filter Parameter]]</th><td><$macrocall $name=".if" cond="""$paramName$""" then="<<.place '$paramName$'>> = " else=""/>$parameter$</td></tr>
 <tr><th align="left">output</th><td>$output$</td></tr>