Commits

Anonymous committed 2c07b6c

Moved manipulation of *page-* vars down into the individual render-tag-* methods

Comments (0)

Files changed (1)

 
 (defmethod render-as-html ( (*current-tag* htmltag) )
 
-  (union-ordered (render-tag-script-libraries *current-tag* ) *page-script-libraries* )
-  (union-ordered (render-tag-scripts *current-tag* ) *page-scripts* )
-  (union-ordered (render-tag-styles *current-tag* ) *page-styles* )
-  (union-ordered (render-tag-style-sheets *current-tag* ) *page-style-sheets* )
-  (union-ordered (render-tag-ready-scripts *current-tag* ) *page-ready-scripts* )
+  (render-tag-script-libraries *current-tag* )
+  (render-tag-scripts *current-tag* )
+  (render-tag-styles *current-tag* )
+  (render-tag-style-sheets *current-tag* )
+  (render-tag-ready-scripts *current-tag* )
 
   (render-tag-content *current-tag* )
 )
 
      ,(when script
 	    `(defmethod render-tag-scripts ( (*current-tag* ,name) )
-	       (list ,script)
+	         (union-ordered (list ,script) *page-scripts* )
 	       )
 	    )
 
      ,(when ready
 	    `(defmethod render-tag-ready-scripts ( (*current-tag* ,name) )
-	       (list ,ready)
+	       (union-ordered (list ,ready) *page-ready-scripts*)
 	       )
 	    )
 	    
      ,(when script-libraries
 	    `(defmethod render-tag-script-libraries ( (*current-tag* ,name) )
-	       ,script-libraries
+	       (union-ordered ,script-libraries *page-script-libraries*)
 	       )
 	    )
 
      ,(when style
 	    `(defmethod render-tag-styles ( (*current-tag* ,name) )
-	       (list ,style)
+	       (union-ordered (list ,style) *page-styles*)
 	       )
 	    )
 
      ,(when style-sheets
 	    `(defmethod render-tag-style-sheets ( (*current-tag* ,name) )
-	       ,style-sheets
+	       (union-ordered ,style-sheets *page-style-sheets*)
 	       )
 	    )
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.