Changeset 2436 for branches/5.2/www/requirements/mura/MuraScope.cfc

Timestamp:

06/27/10 04:34:47 (23 months ago)

Author:

mattlevine

Message:

1. Adding the ability to have theme local contentRenderer.cfc files. Changed it so that each request gets it's own instance of a theme contentRenderer.cfc and the Mura scope lookup first looks into the theme renderer and then the site render. This reverses the previous statement about the hierarchy.

File:

• branches/5.2/www/requirements/mura/MuraScope.cfc (modified) (3 diffs)

branches/5.2/www/requirements/mura/MuraScope.cfc

@@ -33 +33 @@
                 <cfif isObject(getEvent()) and structKeyExists(variables.instance.event,MissingMethodName)>
                         <cfset object=variables.instance.event>
+                <cfelseif isObject(getThemeRenderer()) and structKeyExists(getThemeRenderer(),MissingMethodName)>
+                        <cfset object=getThemeRenderer()>
                 <cfelseif isObject(getContentRenderer()) and structKeyExists(getContentRenderer(),MissingMethodName)>
                         <cfset object=getContentRenderer()>
-                <cfelseif isObject(getThemeRenderer()) and structKeyExists(getThemeRenderer(),MissingMethodName)>
-                        <cfset object=getThemeRenderer()>
                 <cfelseif isObject(getContentBean()) and structKeyExists(getContentBean(),MissingMethodName)>
                         <cfset object=getContentBean()>
@@ -68 +68 @@
                         <cfset event("contentRenderer",request.contentRenderer)>
                 <cfelseif len(event('siteid'))>
-                        <cfset event("contentRenderer",createObject("component","#siteConfig().getAssetMap()#.contentRenderer").init(event))>
+                        <cfset event("contentRenderer",createObject("component","#siteConfig().getAssetMap()#.contentRenderer").init(event=event,$=event("muraScope"),mura=event("muraScope") ) )>
                 <cfelseif structKeyExists(application,"contentRenderer")>
                         <cfset event("contentRenderer",application.contentRenderer)>
@@ -85 +85 @@
 
 <cffunction name="getThemeRenderer" output="false" returntype="any">
-        <cfreturn event("themeRenderer")>
+        <cfif isObject(event("themeRenderer"))>
+                <cfreturn event("themeRenderer")>
+        <cfelseif len(event('siteid')) and fileExists(expandPath(siteConfig().getThemeIncludePath()) & "/contentRenderer.cfc" )>
+                <cfset event("themeRenderer",createObject("component","#siteConfig().getThemeAssetMap()#.contentRenderer").init(event=event,$=event("muraScope"),mura=event("muraScope") ) )>
+        <cfelse>
+                <cfreturn event("themeRenderer")>
+        </cfif>
+</cffunction>
+
+<cffunction name="setThemeRenderer" output="false" returntype="any">
+        <cfargument name="themeRenderer">
+        <cfif isObject(arguments.themeRenderer)>
+                <cfset event("themeRenderer",arguments.themeRenderer)>
+        </cfif>
+        <cfreturn this>
 </cffunction>