From 189c57091c36158de527edf8f94b9e9dda449c9d Mon Sep 17 00:00:00 2001
From: BorisMoore <BorisMoore@gmail.com>
Date: Mon, 9 Aug 2010 11:42:08 -0700
Subject: [PATCH] API name change: Changed .templates() to .template()

---
 README.md                                     |   2 +-
 demos/movies/PagesCore/movies.html            |   2 +-
 demos/movies/PagesTmplPlus/movies1.html       |   2 +-
 demos/movies/PagesTmplPlus/movies2.html       |   2 +-
 demos/movies/PagesTmplPlus/movies3.html       |   2 +-
 .../Interactive/resources/folder.png          | Bin 483 -> 472 bytes
 .../Interactive/resources/treeView.css        |  29 ++++++++------
 .../Interactive/tabsWrapNested.html           |   4 +-
 demos/samplesCore/Interactive/treeView.html   |   4 +-
 demos/samplesCore/basic.html                  |   4 +-
 demos/samplesCore/composition.html            |   4 +-
 demos/samplesTmplPlus/basic.html              |   2 +-
 demos/samplesTmplPlus/composition.html        |   2 +-
 jquery.tmpl.js                                |  36 +++++++++---------
 jquery.tmplPlus.js                            |   5 +--
 15 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/README.md b/README.md
index 1ca9351..4e65a63 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ ____________________________________________________________________
 ____________________________________________________________________
 
 	// Store a string as a compiled template for later use
-	$.templates( "myTmpl", "<span>${firstName}</span>" );
+	$.template( "myTmpl", "<span>${firstName}</span>" );
 
 	// Render stored template and insert after target. 
 	$.tmpl( "myTmpl", dataObject )
diff --git a/demos/movies/PagesCore/movies.html b/demos/movies/PagesCore/movies.html
index a0dd239..50e80dc 100644
--- a/demos/movies/PagesCore/movies.html
+++ b/demos/movies/PagesCore/movies.html
@@ -308,7 +308,7 @@ <h1>Netflix: Book a Movie...</h1>
 			return;
 		}
 		var item = bookingTmplItems[booking.movie.Id],
-			tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).templates();
+			tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).template();
 		if ( item.tmpl !== tmpl) {
 			item.tmpl = tmpl;
 			item.update();
diff --git a/demos/movies/PagesTmplPlus/movies1.html b/demos/movies/PagesTmplPlus/movies1.html
index 8cb1091..7c562d4 100644
--- a/demos/movies/PagesTmplPlus/movies1.html
+++ b/demos/movies/PagesTmplPlus/movies1.html
@@ -309,7 +309,7 @@ <h1>Netflix: Book a Movie...</h1>
 			return;
 		}
 		var item = bookingItem( booking ),
-			tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).templates();
+			tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).template();
 		if ( item.tmpl !== tmpl) {
 			item.tmpl = tmpl; 
 			item.update();
diff --git a/demos/movies/PagesTmplPlus/movies2.html b/demos/movies/PagesTmplPlus/movies2.html
index 0727425..17e35b3 100644
--- a/demos/movies/PagesTmplPlus/movies2.html
+++ b/demos/movies/PagesTmplPlus/movies2.html
@@ -258,7 +258,7 @@ <h1>Netflix: Book a Movie...</h1>
 		var item = bookingItem( booking ),
 			rendered = edit ? onBookingEditRendered  : onBookingRendered;
 		if ( item.rendered !== rendered) {
-			item.tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).templates();
+			item.tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).template();
 			item.rendered = rendered;
 			item.update();
 		}
diff --git a/demos/movies/PagesTmplPlus/movies3.html b/demos/movies/PagesTmplPlus/movies3.html
index fa5fd1f..09ce186 100644
--- a/demos/movies/PagesTmplPlus/movies3.html
+++ b/demos/movies/PagesTmplPlus/movies3.html
@@ -247,7 +247,7 @@ <h1>Netflix: Book a Movie...</h1>
 		var item = bookingItem( booking ),
 			rendered = edit ? onBookingEditRendered  : onBookingRendered;
 		if ( item.rendered !== rendered) {
-			item.tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).templates();
+			item.tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).template();
 			item.rendered = rendered;
 			item.update();
 		}
diff --git a/demos/samplesCore/Interactive/resources/folder.png b/demos/samplesCore/Interactive/resources/folder.png
index 18727f9f58edc13879aa6258d948053109cb8bfc..577638d6667f892e9dd53bcc0630ac2f2ce63cce 100644
GIT binary patch
delta 408
zcmV;J0cZZ>1K0y0iBL{Q4GJ0x0000DNk~Le0000F0000E2nGNE0Pu=N?~x%(e*g(^
zNLh0L01m_e01m_fl`9S#0003&Nkl<ZI8U8XF-`+95L}-qjvr9cQc^-o1q}iUB)-8H
z5LGH@ctIqPQbIbA5P!Hb<<Z$virdc2>^j5=iX!2}T6?@ZGrJd_9v|}O*Ho^~Po!SQ
zM`yCPf3SkBU&77xX&ygMCC68Le^dNKdwKg%*+vj1<5B)Y&-!1moR)yS^eKuJUtS!p
z)w7z}jIo?ODsf<UFT2uMj`{Thm4wLMS9=EN8yhjsr0d?Tq^S)OXbW?#>S_c2AWuDZ
zk_6ig?k?Q&K*eFju9^#A1EX7KModa&w`{crGpV#t6j`W?-mUM}mCcSZZj`|k+l#??
z;gW1%{v6pcVPGy@)ZChXYml+Wifpifszg&(*)fYaB%5RhAxxPmzyVvUi9JJ&I1B9~
zf;^1wZ?nz;8bL(FBx8xVQ*F}<8EfO~mIt5qKi3bFkQbfP<&V4o0000<MNUMnLSTYi
Ci><5x

delta 419
zcmV;U0bKsr1LFfBiBL{Q4GJ0x0000DNk~Le0000M0000I2m$~A0MJLddXXVZe*s}h
zL_t(IPpy+LY=b})hdWn^MDE;h!>w|4!womwf?7}ws;MO?f+8q_0|%~kMHV+4b0ANi
zJb8N;{<L&-Bx9GSF86)E_bzvLjIqVc1&Wz#F_Y&*Tq<x~C9!i^xGpC%1`2=)-ZR3B
zl7wOpb|x*?ia{5l6SZYUp%wY(e{yWI@9tW`=<%YUorIByVUN`gt9R_nq=i9qZMV_K
z6_CmKW)RxJxPc8?=rmVJrhJCtFAA$ywBaoe;lOLa<5WJmOXFP~?;`NIqRS81kf)hK
z4l5i>M|Y{cDz_DU3K*f`t$z51C#j4>w6_K2d38hK?kHCP5BGP)uQ?w}d6h3FTVeGm
zjVnB^NX|T5VXo0kC5Mg=QRxf8MwIT+4TWveIwFOMGo?!9DwWC@okDbUQDQ?l&j;Sy
zh)5L174TrJtzmxX`kSi0tk+Mn{D9!JC@g>0xMK1<j2`&!pZd2hz5#G{t7py!c7Ff>
N002ovPDHLkV1in*x+wqv

diff --git a/demos/samplesCore/Interactive/resources/treeView.css b/demos/samplesCore/Interactive/resources/treeView.css
index c7c349f..7d329b6 100644
--- a/demos/samplesCore/Interactive/resources/treeView.css
+++ b/demos/samplesCore/Interactive/resources/treeView.css
@@ -7,34 +7,40 @@
 .treeView li
 {
 	list-style-type: none;
-	padding: 1px;
-	margin: 0;
+	padding: 2px;
 }
 
 .treeView li li
 {
-	margin-left: 22px;
+	margin-left: 18px;
 }
 
 .treeView img
 {
 	vertical-align: middle;
 	border: 0px;
+	margin-right:7px;
 }
 
-.folderItem
+img.folder 
 {
-	cursor: pointer;
-	margin: 17px;
-	color:Blue;
-	text-decoration: underline;
-	font-style:italic;
+	width:15px;
+	height:14px;
+}
+
+img.expand 
+{
+	width:8px;
+	width:9px;
 }
 
-.treeView .folderItem
+.treeView li.folderItem
 {
 	cursor: pointer;
-	padding: 0px 0 3px 16px;
+	color:Blue;
+	text-decoration: underline;
+	font-style:italic;
+	margin-bottom: 4px;
 }
 
 .content_true
@@ -42,4 +48,3 @@
 	cursor: pointer;
 	font-weight: bold;
 }
-
diff --git a/demos/samplesCore/Interactive/tabsWrapNested.html b/demos/samplesCore/Interactive/tabsWrapNested.html
index 07998f6..316b93e 100644
--- a/demos/samplesCore/Interactive/tabsWrapNested.html
+++ b/demos/samplesCore/Interactive/tabsWrapNested.html
@@ -61,9 +61,9 @@ <h3>POST</h3>
 				</th>
 			{{/each}}
 		</tr>
-		<tr><td colspan="${tabCount}">
+		<tr><td colspan="${tabCount()}">
 			<div class="body">
-				{{html tabContent}}
+				{{html tabContent()}}
 			</div>
 		</td></tr>
 	</tbody></table>
diff --git a/demos/samplesCore/Interactive/treeView.html b/demos/samplesCore/Interactive/treeView.html
index b1b1b1b..36e9da6 100644
--- a/demos/samplesCore/Interactive/treeView.html
+++ b/demos/samplesCore/Interactive/treeView.html
@@ -18,8 +18,8 @@ <h1>Tree View</h1>
 
 <script id="folderTmpl" type="text/html">
 	<li class="content_${hasContent($item)}">
-		<img src="resources/${expanderImage}.png" />
-		<img src="resources/folder.png" />
+		<img class="expand" src="resources/${expanderImage}.png" />
+		<img class="folder" src="resources/folder.png" />
 		<span>${name}</span>
 	</li>
 	{{if expanded}}
diff --git a/demos/samplesCore/basic.html b/demos/samplesCore/basic.html
index 90957cb..048625c 100644
--- a/demos/samplesCore/basic.html
+++ b/demos/samplesCore/basic.html
@@ -67,7 +67,7 @@
 		.appendTo( "ul" );
 
 	// Store a string as a compiled template for later use
-	$.templates( "myTmpl", '<li>My template: <a href="${url}">${getName()}</a> {{if $item.showCities}}(${cityJoin()}){{/if}}</li>' );
+	$.template( "myTmpl", '<li>My template: <a href="${url}">${getName()}</a> {{if $item.showCities}}(${cityJoin()}){{/if}}</li>' );
 
 	// Render stored template and insert after target. 
 	// Target wrapped set has more than one element, so rendered template cloned into two places in DOM
@@ -81,7 +81,7 @@
 		.appendTo( "ul" );
 
 	// Store a template declared in a script block as a named template for later use.
-	$( "#sometmpl" ).templates( "peopleList" );
+	$( "#sometmpl" ).template( "peopleList" );
 
 	// Use the named template
 	$.tmpl( "peopleList", arrayOfDataObjects )
diff --git a/demos/samplesCore/composition.html b/demos/samplesCore/composition.html
index b636f91..1d21919 100644
--- a/demos/samplesCore/composition.html
+++ b/demos/samplesCore/composition.html
@@ -53,12 +53,12 @@
 }
 
 function getTemplate( key ) {
-	return $( "#tmpl" + key ).templates();
+	return $( "#tmpl" + key ).template();
 }
 
 $(function(){
 	// Create named template, to be used in composition below
-	$.templates( "citySeparator", '<tr class="citySeparator"><td colspan="2"></td></tr>' );
+	$.template( "citySeparator", '<tr class="citySeparator"><td colspan="2"></td></tr>' );
 	
 	$( "#tmplPeople" )
 		.tmpl( people )
diff --git a/demos/samplesTmplPlus/basic.html b/demos/samplesTmplPlus/basic.html
index 60b8db3..5ea0965 100644
--- a/demos/samplesTmplPlus/basic.html
+++ b/demos/samplesTmplPlus/basic.html
@@ -61,7 +61,7 @@
 	$("ul").append( tmpl, dataObject, null );
 
 	// Store a string as a compiled template for later use
-	$.templates( "myTmpl", '<li>My template: <a href="${url}">${getName()}</a> {{if $item.showCities}}(${cityJoin()}){{/if}}</li>' );
+	$.template( "myTmpl", '<li>My template: <a href="${url}">${getName()}</a> {{if $item.showCities}}(${cityJoin()}){{/if}}</li>' );
 	
 	// Render stored template and insert after target. 
 	// Target wrapped set has more than one element, so rendered template cloned into two places in DOM
diff --git a/demos/samplesTmplPlus/composition.html b/demos/samplesTmplPlus/composition.html
index 63b17d7..70bb9b9 100644
--- a/demos/samplesTmplPlus/composition.html
+++ b/demos/samplesTmplPlus/composition.html
@@ -54,7 +54,7 @@
 }
 
 function getTemplate( key ) {
-	return $( "#tmpl" + key ).templates();
+	return $( "#tmpl" + key ).template();
 }
 
 $(function(){
diff --git a/jquery.tmpl.js b/jquery.tmpl.js
index 936a7bf..cde098b 100644
--- a/jquery.tmpl.js
+++ b/jquery.tmpl.js
@@ -1,4 +1,4 @@
-	/*
+/*
  * jQuery Templating Plugin
  * Copyright 2010, John Resig
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -83,8 +83,8 @@
 		},
 
 		// Consider the first wrapped element as a template declaration, and get the compiled template or store it as a named template.
-		templates: function( name ) {
-			return jQuery.templates( name, this[0] );
+		template: function( name ) {
+			return jQuery.template( name, this[0] );
 		},
 
 		domManip: function( args, table, callback, options ) {
@@ -121,7 +121,7 @@
 			if ( topLevel ) {
 				// This is a top-level tmpl call (not from a nested template using {{tmpl}})
 				parentItem = topTmplItem;
-				tmpl = jQuery.templates[tmpl] || jQuery.templates( null, tmpl );
+				tmpl = jQuery.template[tmpl] || jQuery.template( null, tmpl );
 			} else if ( !tmpl ) {
 				// The template item is already associated with DOM - this is a refresh.
 				// Re-evaluate rendered template for the parentItem
@@ -166,17 +166,17 @@
 		},
 
 		// Set:
-		// Use $.templates( name, tmpl ) to cache a named template,
+		// Use $.template( name, tmpl ) to cache a named template,
 		// where tmpl is a template string, a script element or a jQuery instance wrapping a script element, etc.
-		// Use $( "selector" ).templates( name ) to provide access by name to a script block template declaration.
+		// Use $( "selector" ).template( name ) to provide access by name to a script block template declaration.
 
 		// Get:
-		// Use $.templates( name ) to access a cached template.
-		// Also $( selectorToScriptBlock ).templates(), or $.templates( null, templateString )
+		// Use $.template( name ) to access a cached template.
+		// Also $( selectorToScriptBlock ).template(), or $.template( null, templateString )
 		// will return the compiled template, without adding a name reference.
-		// If templateString includes at least one HTML tag, $.templates( templateString ) is equivalent
-		// to $.templates( null, templateString )
-		templates: function( name, tmpl ) {
+		// If templateString includes at least one HTML tag, $.template( templateString ) is equivalent
+		// to $.template( null, templateString )
+		template: function( name, tmpl ) {
 			if (tmpl) {
 				// Compile template and associate with name
 				if ( typeof tmpl === "string" ) {
@@ -189,13 +189,13 @@
 					// If this is a template block, use cached copy, or generate tmpl function and cache.
 					tmpl = jQuery.data( tmpl, "tmpl" ) || jQuery.data( tmpl, "tmpl", buildTmplFn( tmpl.innerHTML ));
 				}
-				return typeof name === "string" ? (jQuery.templates[name] = tmpl) : tmpl;
+				return typeof name === "string" ? (jQuery.template[name] = tmpl) : tmpl;
 			}
 			// Return named compiled template
-			return typeof name !== "string" ? jQuery.templates( null, name ): 
-				(jQuery.templates[name] || 
+			return typeof name !== "string" ? jQuery.template( null, name ): 
+				(jQuery.template[name] || 
 					// If not in map, treat as a selector. (If integrated with core, use quickExpr.exec) 
-					jQuery.templates( null, htmlExpr.test( name ) ? name : jQuery( name ))); 
+					jQuery.template( null, htmlExpr.test( name ) ? name : jQuery( name ))); 
 		},
 
 		encode: function( text ) {
@@ -456,15 +456,15 @@
 
 	function tiNest( tmpl, data, options ) {
 		// nested template, using {{tmpl}} tag
-		return jQuery.tmpl( jQuery.templates( tmpl ), data, options, this );
+		return jQuery.tmpl( jQuery.template( tmpl ), data, options, this );
 	}
 
 	function tiWrap( call, wrapped ) {
 		// nested template, using {{wrap}} tag
-		var options = call.options;
+		var options = call.options || {};
 		options.wrapped = wrapped;
 		// Apply the template, which may incorporate wrapped content, 
-		return jQuery.tmpl( jQuery.templates( call.tmpl ), call.data, options, call.parent );
+		return jQuery.tmpl( jQuery.template( call.tmpl ), call.data, options, call.parent );
 	}
 
 	function tiHtml( filter, textOnly ) {
diff --git a/jquery.tmplPlus.js b/jquery.tmplPlus.js
index c7b7cb6..ffa8893 100644
--- a/jquery.tmplPlus.js
+++ b/jquery.tmplPlus.js
@@ -78,7 +78,7 @@
 				dmArgs = jQuery.makeArray( arguments );
 
 				// Eval template to obtain fragment to clone and insert
-				dmArgs[0] = [ jQuery.tmpl( jQuery.templates( tmpl ), data, args[2], args[3] ) ];
+				dmArgs[0] = [ jQuery.tmpl( jQuery.template( tmpl ), data, args[2], args[3] ) ];
 
 				dmArgs[2] = function( fragClone ) {
 					// Handler called by oldManip when rendered template has been inserted into DOM.
@@ -90,6 +90,3 @@
 		}
 	});
 })(jQuery);
-
-
-