Changeset 2360

Timestamp:

07/02/09 00:39:18 (8 months ago)

Author:

lmajano

Message:

addAsset now only loads assets when they have not been loaded already

Files:

• coldbox/trunk/system/FrameworkSupertype.cfc (modified) (1 diff)

coldbox/trunk/system/FrameworkSupertype.cfc

@@ -329 +329 @@
                         var x = 1;
                         var thisAsset = "";
+                        var event = controller.getRequestService().getContext();
+                        
+                        // request assets storage
+                        event.paramValue("cbox_assets","");
                         
                         for(x=1; x lte listLen(arguments.asset); x=x+1){
                                 thisAsset = listGetAt(arguments.asset,x);
-                                if( listLast(thisAsset,".") eq "js" ){
-                                        sb.append('<script src="#thisAsset#" type="text/javascript" language="javascript"></script>');
+                                // Is asset already loaded
+                                if( listFindNoCase(event.getValue("cbox_assets"),thisAsset) ){
+                                        
+                                        // Load Asset
+                                        if( listLast(thisAsset,".") eq "js" ){
+                                                sb.append('<script src="#thisAsset#" type="text/javascript" language="javascript"></script>');
+                                        }
+                                        else{
+                                                sb.append('<link href="#thisAsset#" type="text/css" rel="stylesheet" />');
+                                        }
+                                        
+                                        // Store It as Loaded
+                                        event.setValue("cbox_assets", listAppend(event.getValue("cbox_assets"),thisAsset) );
+                                        
+                                        //Load it
+                                        htmlhead(sb.toString());
                                 }
-                                else{
-                                        sb.append('<link href="#thisAsset#" type="text/css" rel="stylesheet" />');
-                                }
-                        }
-                </cfscript>
-                <cfhtmlhead text="#sb.toString()#">
+                        }
+                </cfscript>
         </cffunction>