Update set & append so that value can come from a pipeline

Hope this doesn't break too many people!
robfig · Oct 25, 2012 · 10787a2 · 10787a2
1 parent 40cd640
commit 10787a2
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git a/samples/booking/app/views/Application/Index.html b/samples/booking/app/views/Application/Index.html
@@ -1,4 +1,4 @@
-{{set "title" "Home" .}}
+{{set . "title" "Home"}}
 {{template "header.html" .}}
 
 <div id="login">

diff --git a/samples/booking/app/views/Application/Register.html b/samples/booking/app/views/Application/Register.html
@@ -1,4 +1,4 @@
-{{set "title" "Register" .}}
+{{set . "title" "Register"}}
 {{template "header.html" .}}
 
 <h1>Register:</h1>

diff --git a/samples/booking/app/views/Hotels/Book.html b/samples/booking/app/views/Hotels/Book.html
@@ -1,5 +1,5 @@
-{{append "moreStyles" "ui-lightness/jquery-ui-1.7.2.custom.css" .}}
-{{append "moreScripts" "js/jquery-ui-1.7.2.custom.min.js" .}}
+{{append . "moreStyles" "ui-lightness/jquery-ui-1.7.2.custom.css"}}
+{{append . "moreScripts" "js/jquery-ui-1.7.2.custom.min.js"}}
 {{template "header.html" .}}
 
 <h1>Book hotel</h1>

diff --git a/samples/booking/app/views/Hotels/Index.html b/samples/booking/app/views/Hotels/Index.html
@@ -1,4 +1,4 @@
-{{set "title" "Search" .}}
+{{set . "title" "Search"}}
 {{template "header.html" .}}
 
 <h1>Search Hotels</h1>

diff --git a/samples/booking/app/views/Hotels/Settings.html b/samples/booking/app/views/Hotels/Settings.html
@@ -1,4 +1,4 @@
-{{set "title" "Settings" .}}
+{{set . "title" "Settings"}}
 {{template "header.html" .}}
 
 <h1>Change your password</h1>

diff --git a/samples/chat/app/views/Application/Index.html b/samples/chat/app/views/Application/Index.html
@@ -1,4 +1,4 @@
-{{set "title" "Sign in" .}}
+{{set . "title" "Sign in"}}
 {{template "header.html" .}}
 
 <div id="home">

diff --git a/samples/chat/app/views/LongPolling/Room.html b/samples/chat/app/views/LongPolling/Room.html
@@ -1,4 +1,4 @@
-{{set "title" "Chat room" .}}
+{{set . "title" "Chat room"}}
 {{template "header.html" .}}
 
 <h1>Ajax, long polling — You are now chatting as {{.user}}

diff --git a/samples/chat/app/views/Refresh/Room.html b/samples/chat/app/views/Refresh/Room.html
@@ -1,4 +1,4 @@
-{{set "title" "Basic Chat room" .}}
+{{set . "title" "Basic Chat room"}}
 {{template "header.html" .}}
 
 <h1>Ajax, using active refresh — You are now chatting as {{.user}}

diff --git a/samples/chat/app/views/WebSocket/Room.html b/samples/chat/app/views/WebSocket/Room.html
@@ -1,4 +1,4 @@
-{{set "title" "Chat room" .}}
+{{set . "title" "Chat room"}}
 {{template "header.html" .}}
 
 <h1>WebSocket — You are now chatting as {{.user}}

diff --git a/samples/facebook-oauth2/app/views/Application/Index.html b/samples/facebook-oauth2/app/views/Application/Index.html
@@ -1,4 +1,4 @@
-{{set "title" "Home" .}}
+{{set . "title" "Home"}}
 {{template "header.html" .}}
 
 <h1>Facebook!</h1>

diff --git a/samples/validation/app/views/Application/Index.html b/samples/validation/app/views/Application/Index.html
@@ -1,4 +1,4 @@
-{{set "title" "Home" .}}
+{{set . "title" "Home"}}
 {{template "header.html" .}}
 
 <h1>Validation samples</h1>

diff --git a/skeleton/app/views/Application/Index.html b/skeleton/app/views/Application/Index.html
@@ -1,4 +1,4 @@
-{{set "title" "Home" .}}
+{{set . "title" "Home"}}
 {{template "header.html" .}}
 
 <h1>Your Application Is Ready</h1>

diff --git a/template.go b/template.go
@@ -59,11 +59,11 @@ var (
 	TemplateFuncs = map[string]interface{}{
 		"url": ReverseUrl,
 		"eq":  func(a, b interface{}) bool { return a == b },
-		"set": func(key string, value interface{}, renderArgs map[string]interface{}) template.HTML {
+		"set": func(renderArgs map[string]interface{}, key string, value interface{}) template.HTML {
 			renderArgs[key] = value
 			return template.HTML("")
 		},
-		"append": func(key string, value interface{}, renderArgs map[string]interface{}) template.HTML {
+		"append": func(renderArgs map[string]interface{}, key string, value interface{}) template.HTML {
 			if renderArgs[key] == nil {
 				renderArgs[key] = []interface{}{value}
 			} else {