🐛 FIX: Refactor renderView() to view() for ColdBox 7+

This should still work in ColdBox 6+, by the way.
coldbox-modules · Nov 17, 2022 · 34b13c2 · 34b13c2
1 parent 7cbefc5
commit 34b13c2
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 23 deletions.
diff --git a/handlers/Export.cfc b/handlers/Export.cfc
@@ -32,7 +32,7 @@ component extends="BaseHandler"{
 			event.setHTTPHeader( name="content-disposition", value='attachment; filename="#prc.loadedAPIName#.json"')
 				.renderData( data=prc.dsl, type="json" );
 		} else {
-			event.renderData( data=renderView( view="export/api", module="relax" ) );
+			event.renderData( data=view( view="export/api", module="relax" ) );
 		}
 	}
 
@@ -82,7 +82,7 @@ component extends="BaseHandler"{
 	private function toWikiMarkup( event, rc, prc, type ){
 		html( event, rc, prc );
 		if( !structKeyExists( rc, "content" ) ){
-			rc.content = renderView( view="apidoc/cfTemplate/api-content", args={"api":prc.dsl}, module="relax" );
+			rc.content = view( view="apidoc/cfTemplate/api-content", args={"api":prc.dsl}, module="relax" );
 		}
 		var data = wikitext.toWiki( translator=arguments.type, html=rc.content );
 		event.setHTTPHeader( name="content-disposition", value='attachment; filename="#prc.loadedAPIName#.#lcase( arguments.type )#.txt"');

diff --git a/handlers/Home.cfc b/handlers/Home.cfc
@@ -21,7 +21,7 @@ component extends="BaseHandler"{
 	* Home
 	*/
 	function relax( event, rc, prc ){
-		event.renderData( data=renderView( view="home/relax", module="relax" ) );
+		event.renderData( data=view( view="home/relax", module="relax" ) );
 	}
 
 	/**
@@ -67,7 +67,7 @@ component extends="BaseHandler"{
 
 		// set view for Rendering
 		if( arguments.widget ){
-			return renderView( view="home/docs/resourceDoc", module="relax" );
+			return view( view="home/docs/resourceDoc", module="relax" );
 		} else {
 			event.setView( view="home/docs/resourceDoc", layout="#rc.print#" );
 		}

diff --git a/handlers/Relaxer.cfc b/handlers/Relaxer.cfc
@@ -101,7 +101,7 @@ component extends="BaseHandler"{
 	*/
 	any function resourceDoc( event, rc, prc ){
 		prc.body = runEvent( event="relax:home.resourceDoc", eventArguments={ widget=true } );
-		event.renderData( data=renderView( view="relaxer/resourceDoc", module="relax" ) );
+		event.renderData( data=view( view="relaxer/resourceDoc", module="relax" ) );
 	}
 
 	/**

diff --git a/layouts/html.cfm b/layouts/html.cfm
@@ -14,7 +14,7 @@
 		<body class="export" style="background-color: white">
 			<div class="container">
 				<cfoutput>
-				#renderView()#
+				#view()#
 				</cfoutput>
 			</div>
 		</body>

diff --git a/layouts/relax.cfm b/layouts/relax.cfm
@@ -112,7 +112,7 @@
 	    </cfif>
 
 		<!--main content start-->
-	    #renderView()#
+	    #view()#
 	    <!--main content end-->
     </div>
 

diff --git a/test-harness/layouts/Main.cfm b/test-harness/layouts/Main.cfm
@@ -1,6 +1,6 @@
 <cfoutput>
 	<h1>Module Tester</h1>
 	<div>
-		#renderView()#
+		#view()#
 	</div>
 	</cfoutput>
diff --git a/views/apidoc/cfTemplate/api-content.cfm b/views/apidoc/cfTemplate/api-content.cfm
@@ -208,7 +208,7 @@
                 #paramTemplate( { "entity":api } )#
             </cfif>
 
-            #renderView(
+            #view(
                 view='apidoc/cfTemplate/x-attributes',
                 args={"entity":api}
             )#
@@ -222,7 +222,7 @@
         <cfloop array="#pathKeys#" index="pathKey">
             <!--- ACF Compatibility Fix for a null pointer exception --->
             <cfscript>
-                writeOutput( renderView(
+                writeOutput( view(
                     view    = 'apidoc/cfTemplate/api-path',
                     args    = {
                         "api" : api,

diff --git a/views/apidoc/cfTemplate/api-method.cfm b/views/apidoc/cfTemplate/api-method.cfm
@@ -47,7 +47,7 @@
 							<h4 class="card-subtitle text-primary">Parameters:</h4>
 						</div>
 						<div class="card-body">
-							#renderView(
+							#view(
 								view = "apidoc/cfTemplate/parameters",
 								args = { "entity" : args.method }
 							)#
@@ -64,14 +64,14 @@
 
 					<cfparam name="args.method.requestBody.required" default="true"/>
 					<h5>Required: <pre>#(args.method.requestBody.required ? 'true' : 'false')#</pre></h5>
-					#renderView(
+					#view(
 						view = "apidoc/cfTemplate/request-body",
 						args = { "entity" : args.method }
 					)#
 					<hr>
 				</cfif>
 
-            	#renderView( view='apidoc/cfTemplate/x-attributes', args={"entity":args.method,"headerNode":"h4"} )#
+            	#view( view='apidoc/cfTemplate/x-attributes', args={"entity":args.method,"headerNode":"h4"} )#
 
             	<cfif
             		!structIsEmpty( args.method[ "responses" ] )
@@ -81,7 +81,7 @@
 	            	<h4 class="card-subtitle text-primary">Responses:</h4>
 	            	<cfloop array="#structKeyArray( args.method[ "responses" ] )#" index="responseKey">
 		            	<cfif isNumeric( responseKey ) or responseKey eq 'default'>
-			            	#renderView(
+			            	#view(
 			            		view="apidoc/cfTemplate/response",
 			            		args={
 				            		"resourceId": args.method["x-resourceId"],

diff --git a/views/apidoc/cfTemplate/api-path.cfm b/views/apidoc/cfTemplate/api-path.cfm
@@ -14,7 +14,7 @@
         <!--- Div Content --->
         <div class="card-body">
 
-            #renderView(
+            #view(
                 view = 'apidoc/cfTemplate/x-attributes',
                 args = { "entity" : args.path, "headerNode" : "h4" }
             )#
@@ -24,7 +24,7 @@
 
                 <cfloop array="#HTTPMethodKeys#" index="httpMethod">
                     <cfif structKeyExists( args.path, httpMethod )>
-                        #renderView(
+                        #view(
                             view = 'apidoc/cfTemplate/api-method',
                             args = {
                                 key     : ucase( httpMethod ),

diff --git a/views/apidoc/cfTemplate/parameters.cfm b/views/apidoc/cfTemplate/parameters.cfm
@@ -52,7 +52,7 @@
 
 					<cfif structKeyExists( param, "schema" )>
 						<td colspan="5" style="vertical-align:top;">
-							#renderView( view="apidoc/cfTemplate/schema", args={ "schema": param[ "schema" ] } )#
+							#view( view="apidoc/cfTemplate/schema", args={ "schema": param[ "schema" ] } )#
 						</td>
 					</cfif>
 

diff --git a/views/apidoc/cfTemplate/request-body.cfm b/views/apidoc/cfTemplate/request-body.cfm
@@ -12,7 +12,7 @@
 		</div>
 		<div id="card_#(args.entity["x-resourceId"] & '-requestBody-' & listLast( key, '/' ))#" class="card-body">
 			<cfif structKeyExists( requestBody.content[ key ], "schema" ) && structKeyExists( requestBody.content[ key ].schema, "properties" )>
-			#renderView( view="apidoc/cfTemplate/schema", args={ "schema": requestBody.content[ key ].schema } )#
+			#view( view="apidoc/cfTemplate/schema", args={ "schema": requestBody.content[ key ].schema } )#
 			</cfif>
 		</div>
 	</div>

diff --git a/views/apidoc/cfTemplate/response.cfm b/views/apidoc/cfTemplate/response.cfm
@@ -33,7 +33,7 @@
 							</h3>
 						</div>
 
-						#renderView( view="apidoc/cfTemplate/schema", args={ "schema": args.response.schema } )#
+						#view( view="apidoc/cfTemplate/schema", args={ "schema": args.response.schema } )#
 
 					</cfif>
 
@@ -47,7 +47,7 @@
 								</div>
 								<div class="card-body">
 									<cfif structKeyExists( args.response.content[ mimetype ], "schema" ) && structKeyExists( args.response.content[ mimetype ].schema, "properties" )>
-									#renderView( view="apidoc/cfTemplate/schema", args={ "schema": args.response.content[ mimetype ].schema } )#
+									#view( view="apidoc/cfTemplate/schema", args={ "schema": args.response.content[ mimetype ].schema } )#
 									</cfif>
 								</div>
 							</div>

diff --git a/views/apidoc/cfTemplate/schema.cfm b/views/apidoc/cfTemplate/schema.cfm
@@ -45,7 +45,7 @@
 					</div>
 				</cfif>
 				<h4 class="card-subtitle text-secondary">Items:</h4>
-				#renderView( view="apidoc/cfTemplate/schema", args={ "schema": args.schema[ "items" ], "showExample" : !structKeyExists( args.schema, "example" ) } )#
+				#view( view="apidoc/cfTemplate/schema", args={ "schema": args.schema[ "items" ], "showExample" : !structKeyExists( args.schema, "example" ) } )#
 			</div>
 		<cfelseif structKeyExists( args.schema, "type" ) OR structKeyExists( args.schema, "properties")>
 

diff --git a/views/home/docs/resourceDefinitions.cfm b/views/home/docs/resourceDefinitions.cfm
@@ -2,5 +2,5 @@
 <h1>Resource Definitions</h1>
 <p>The following are all the resources defined in the <code>#prc.dsl.info.title#</code> API</p>
 <!--- Render Document Collection --->
-#renderView( view="home/docs/resourcePath", collection=prc.dsl.paths, collectionAs="thisResource", module="relax" )#
+#view( view="home/docs/resourcePath", collection=prc.dsl.paths, collectionAs="thisResource", module="relax" )#
 </cfoutput>
diff --git a/views/home/openAPIDocs.cfm b/views/home/openAPIDocs.cfm
@@ -2,7 +2,7 @@
 <div class="row">
 	<div class="col-md-12">
 		<div class="col-md-12">
-			#renderView( view="apidoc/swagger.v2", module="relax" )#
+			#view( view="apidoc/swagger.v2", module="relax" )#
 		</div>
 	</div>
 </div>