Changeset 2572

Timestamp:

07/23/10 17:24:30 (7 weeks ago)

Author:

mattlevine

Message:

1. Fixing issue with setting jsDateKey()

Location:

branches/5.2/www/requirements/mura/resourceBundle

Files:

• resourceBundleFactory.cfc (modified) (1 diff)
• utils.cfc (modified) (3 diffs)

branches/5.2/www/requirements/mura/resourceBundle/resourceBundleFactory.cfc

@@ -833 +833 @@
 
 <!--- now we create a date so we can parse it and figure out the date format and then create a date validation key --->
-<cfif not len(arguments.mySession.dateKey) or not len(arguments.mySession.dateKeyFormat)> --->
+<cfif not len(arguments.mySession.dateKey) or not len(arguments.mySession.dateKeyFormat)>
         <cfset utils=getUtils(arguments.mySession.locale)>
         <cfset arguments.mySession.dateKey=utils.getJSDateKey()>

branches/5.2/www/requirements/mura/resourceBundle/utils.cfc

@@ -32 +32 @@
         
                 <cfset loadLocale()>
+                
                 <cfreturn this />
         </cffunction>
@@ -350 +351 @@
         <cfloop list="#formatTest#" index="f" delimiters="#dtCh#">
                 <cfif listFind("2018,18",f)>    
-                        <cfset dateKeyFormat=listAppend(dateKeyFormat,"YYYY",dtCh)>
+                        <cfset variables.dateKeyFormat=listAppend(variables.dateKeyFormat,"YYYY",dtCh)>
                 <cfelseif f eq 11>
-                        <cfset dateKeyFormat=listAppend(dateKeyFormat,"MM",dtCh)>
+                        <cfset variables.dateKeyFormat=listAppend(variables.dateKeyFormat,"MM",dtCh)>
                 <cfelse>
-                        <cfset dateKeyFormat=listAppend(dateKeyFormat,"DD",dtCh)>
+                        <cfset variables.dateKeyFormat=listAppend(variables.dateKeyFormat,"DD",dtCh)>
                 </cfif>
         </cfloop>
@@ -366 +367 @@
         </cfif>
         
-        <cfset datekeyExample=lsDateFormat(createDate(2018,11,10),datekeyFormat)/>
-
-<cfsavecontent variable="jsDateKey">
+        <cfset variables.datekeyExample=lsDateFormat(createDate(2018,11,10),datekeyFormat)/>
+
+<cfsavecontent variable="variables.jsDateKey">
 <cfoutput><script type="text/javascript">
-var dtExample="#datekeyExample#";
+var dtExample="#variables.datekeyExample#";
 var dtCh="#dtCh#";
 var dtFormat =[#dtFormat#];