Create a theme_view function script which allows modules in the head or admin_head functions to specify javascript files that are required for this page.

In this commit, these script files are expressed at the end of the head or admin_head calls and appended to the beginning of the block stack.  In a future commit these will be combined and gzipped for download.

1 files changed, 25 insertions, 25 deletions

diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 0679087e..b6b24b27 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -21,22 +21,22 @@ class gallery_theme_Core {
   static function head($theme) {
     $session = Session::instance();
     $buf = "";
-    $buf .= html::script("lib/jquery.js");
-    $buf .= html::script("lib/jquery.form.js");
-    $buf .= html::script("lib/jquery-ui.js");
-    $buf .= html::script("lib/gallery.common.js");
-    $buf .= html::script("lib/gallery.dialog.js");
-    $buf .= html::script("lib/gallery.form.js");
-    $buf .= html::script("lib/superfish/js/superfish.js");
+    $theme->script("lib/jquery.js");
+    $theme->script("lib/jquery.form.js");
+    $theme->script("lib/jquery-ui.js");
+    $theme->script("lib/gallery.common.js");
+    $theme->script("lib/gallery.dialog.js");
+    $theme->script("lib/gallery.form.js");
+    $theme->script("lib/superfish/js/superfish.js");
     if ($theme->page_type == 'photo') {
-      $buf .= html::script("lib/jquery.scrollTo.js");
-      $buf .= html::script("lib/jquery.localscroll.js");
-      $buf .= html::script("lib/gallery.show_full_size.js");
+      $theme->script("lib/jquery.scrollTo.js");
+      $theme->script("lib/jquery.localscroll.js");
+      $theme->script("lib/gallery.show_full_size.js");
     }
     if ($theme->page_type == 'movie') {
-      $buf .= html::script("lib/flowplayer.js");
+      $theme->script("lib/flowplayer.js");
     }
-    $buf .= html::script($theme->url("js/ui.init.js", false, true));
+    $theme->script($theme->url("js/ui.init.js", false, true));
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/debug.css") . "\" />";
@@ -45,7 +45,7 @@ class gallery_theme_Core {
         && access::can("edit", $theme->item())) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/quick.css") . "\" />";
-      $buf .= html::script("modules/gallery/js/quick.js");
+      $theme->script("modules/gallery/js/quick.js");
     }
 
     if (module::is_active("rss")) {
@@ -59,8 +59,8 @@ class gallery_theme_Core {
     if ($session->get("l10n_mode", false)) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/l10n_client.css") . "\" />";
-      $buf .= html::script("lib/jquery.cookie.js");
-      $buf .= html::script("modules/gallery/js/l10n_client.js");
+      $theme->script("lib/jquery.cookie.js");
+      $theme->script("modules/gallery/js/l10n_client.js");
     }
 
     return $buf;
@@ -95,14 +95,14 @@ class gallery_theme_Core {
   static function admin_head($theme) {
     $session = Session::instance();
     $buf = "";
-    $buf .= html::script("lib/jquery.js");
-    $buf .= html::script("lib/jquery.form.js");
-    $buf .= html::script("lib/jquery-ui.js");
-    $buf .= html::script("lib/gallery.common.js");
-    $buf .= html::script("lib/gallery.dialog.js");
-    $buf .= html::script("lib/superfish/js/superfish.js");
-    $buf .= html::script($theme->url("js/jquery.dropshadow.js", false, true));
-    $buf .= html::script($theme->url("js/ui.init.js", false, true));
+    $theme->script("lib/jquery.js");
+    $theme->script("lib/jquery.form.js");
+    $theme->script("lib/jquery-ui.js");
+    $theme->script("lib/gallery.common.js");
+    $theme->script("lib/gallery.dialog.js");
+    $theme->script("lib/superfish/js/superfish.js");
+    $theme->script($theme->url("js/jquery.dropshadow.js", false, true));
+    $theme->script($theme->url("js/ui.init.js", false, true));
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/debug.css") . "\" />";
@@ -111,8 +111,8 @@ class gallery_theme_Core {
     if ($session->get("l10n_mode", false)) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/l10n_client.css") . "\" />";
-      $buf .= html::script("lib/jquery.cookie.js");
-      $buf .= html::script("modules/gallery/js/l10n_client.js");
+      $theme->script("lib/jquery.cookie.js");
+      $theme->script("modules/gallery/js/l10n_client.js");
     }
 
     return $buf;