Prevent duplicate loading of resources with combine option during mul…

…tiple calls to the tags, scripts, and/or css methods for a single page. Ref ticket #6 (2cb1b01090c0cdfd96c2c54aa45538ac).
yui · Nov 22, 2009 · 0ceada8 · 0ceada8
1 parent fbc3e44
commit 0ceada8
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/phploader/loader.php b/phploader/loader.php
@@ -717,12 +717,10 @@ function getAllDependencies($mname, $loadOptional=false, $completed=array()) {
             $key .= YUI_OPTIONAL;
         }
 
-        /*
         if (isset($this->depCache[$key])) {
             // $this->log("Using cache " . $mname);
             return $this->depCache[$key];
         }
-        */
 
         $m = $this->modules[$mname];
         $mProvides = $this->getProvides($mname);
@@ -1266,6 +1264,9 @@ function processDependencies($outputType, $moduleType, $skipSort=false, $showLoa
         // keep track of all the stuff we loaded so that we don't reload 
         // scripts if the page makes multiple calls to tags
         $this->loaded = array_merge($this->loaded, $sorted);
+        if ($this->combine === true) {
+            $this->clearComboLink($outputType);
+        }
 
         // return the raw data structure
         if ($outputType == YUI_DATA) {
@@ -1466,6 +1467,23 @@ function getComboLink($type) {
         return $url;
     }
 
+    /**
+    * Clears the combo url of already loaded modules for a specific resource type.  Prevents
+    * duplicate loading of modules if the page makes multiple calls to tags, css, or script.
+    * @method clearComboLink
+    * @param {string} type Resource type (i.e.) YUI_JS or YUI_CSS
+    */
+    function clearComboLink($type) {
+        if ($type == YUI_CSS) {
+            $this->cssComboLocation = null;
+        } else if ($type == YUI_JS) {
+            $this->jsComboLocation = null;
+        } else {
+            $this->cssComboLocation = null;
+            $this->jsComboLocation  = null;
+        }
+    }
+
     /**
     * Adds a module the combo collection for a specified resource type
     * @method addToCombo