Merge remote-tracking branch 'mainrepo/master'

mustache/Mustache.cfc

@@ -1,31 +1,3 @@
-<!---
-	Mustache.cfc
-	https://github.com/dswitzer/Mustache.cfc
-
-	The MIT License
-
-	Copyright (c) 2009 Chris Wanstrath (Ruby)
-	Copyright (c) 2010 Patrick McElhaney (ColdFusion)
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the
-	"Software"), to deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to
-	permit persons to whom the Software is furnished to do so, subject to
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be
-	included in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-	NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-	LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-	OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
---->
 <cfcomponent output="false">
 	<!---
 		reference for string building
@@ -354,4 +326,4 @@
 		<cfset variables.partials = arguments.partials />
 	</cffunction>
 
-</cfcomponent>
+</cfcomponent>

tests/Helper.cfc

@@ -5,10 +5,10 @@
 
 	<cffunction name="getComplexContext" access="public">
 		<cfset var context = {} />
-		<cfset var context["Settings"] = {EnableEmailUpdates=true, ShowPrivateNote=false, Signature="Support Team"} />
-		<cfset var context["Assignee"] = {Name="Tommy"} />
-		<cfset var context["Customer"] = {Name="Jenny", Phone="867-5309"} />
-		<cfset var context["Ticket"]   = {Number="1234", Subject="E-mail not working", Priority="Medium", Description="Here's a description#variables.crlf2#with some#variables.crlf2#new lines", Note="User needs to update their software to the latest version.", PrivateNote="Client doesn't want to listen to instructions"} />
+		<cfset context["Settings"] = {EnableEmailUpdates=true, ShowPrivateNote=false, Signature="Support Team"} />
+		<cfset context["Assignee"] = {Name="Tommy"} />
+		<cfset context["Customer"] = {Name="Jenny", Phone="867-5309"} />
+		<cfset context["Ticket"]   = {Number="1234", Subject="E-mail not working", Priority="Medium", Description="Here's a description#variables.crlf2#with some#variables.crlf2#new lines", Note="User needs to update their software to the latest version.", PrivateNote="Client doesn't want to listen to instructions"} />
 
 		<cfreturn context />
 	</cffunction>