Changeset 2436

Timestamp:

06/27/10 04:34:47 (20 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.

Location:

branches/5.2/www/requirements/mura

Files:

• Handler/standardSetContentRendererHandler.cfc (modified) (1 diff)
• MuraScope.cfc (modified) (3 diffs)
• event.cfc (modified) (1 diff)

branches/5.2/www/requirements/mura/Handler/standardSetContentRendererHandler.cfc

@@ -24 +24 @@
 <cffunction name="handle" output="false" returnType="any">
         <cfargument name="event" required="true">
-        
-        <cfset event.setValue('contentRenderer',createObject("component","#event.getSite().getAssetMap()#.includes.contentRenderer").init(event))/>
-        <cfset event.setValue("themeRenderer",event.getSite().getThemeRenderer())>
+        <cfset var $=event.getValue("muraScope")>
+        <cfset event.setValue('contentRenderer',createObject("component","#event.getSite().getAssetMap()#.includes.contentRenderer").init(event=event,$=$,mura=$))/>
+        <cfif fileExists(expandPath(event.getSite().getThemeIncludePath()) & "/contentRenderer.cfc")>
+                <cfset event.setValue("themeRenderer",createObject("component","#event.getSite().getThemeAssetMap()#.contentRenderer").init(event=event,$=$,mura=$))>
+        </cfif>
 </cffunction>
 

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>
 

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

@@ -188 +188 @@
         <cfif not valueExists("contentRenderer")>
                 <cfset setValue("contentRenderer",createObject("component","#application.settingsManager.getSite(getValue('siteid')).getAssetMap()#.includes.contentRenderer").init(this))>
+        </cfif>
+        <cfif not valueExists("themeRenderer") and fileExists(expandPath(getSite().getThemeIncludePath()) & "/contentRenderer.cfc")>
+                <cfset setValue("themeRenderer",createObject("component","#getSite().getThemeAssetMap()#.contentRenderer").init(event=this,$=getValue('MuraScope'),mura=getValue('MuraScope')))>
         </cfif> 
         <cfif not valueExists("localHandler") and fileExists(expandPath("/#application.configBean.getWebRootMap()#") & "/#getValue('siteid')#/includes/eventHandler.cfc")>
                 <cfset setValue("localHandler",createObject("component","#application.configBean.getWebRootMap()#.#getValue('siteid')#.includes.eventHandler").init())>
         </cfif>
-
-        <cfset setValue("themeRenderer",application.settingsManager.getSite(getValue("siteID")).getThemeRenderer())>
         
         <cfreturn this>