Changeset 10617 for branches/2.2

Timestamp:

Apr 25, 2011, 9:08:43 PM (13 years ago)

Author:

rvelices

Message:

merge -r10516 from trunk combine_script - more checks and warnings...

File:

• branches/2.2/include/template.class.php (modified) (9 diffs)

branches/2.2/include/template.class.php

@@ -923 +923 @@
   private $did_head;
   private $head_done_scripts;
+  private $did_footer;
 
   private static $known_paths = array(
@@ -947 +948 @@
     $this->inline_scripts = array();
     $this->head_done_scripts = array();
-    $this->did_head = false;
+    $this->did_head = $this->did_footer = false;
   }
 
@@ -957 +958 @@
   function add_inline($code, $require)
   {
+    !$this->did_footer || trigger_error("Attempt to add inline script but the footer has been written", E_USER_WARNING);
     if(!empty($require))
     {
@@ -973 +975 @@
   function add($id, $load_mode, $require, $path, $version=0)
   {
-    if ($this->did_head && $load_mode==0 )
-    {
-      trigger_error("Attempt to add a new script $id but the head has been written", E_USER_WARNING);
+    if ($this->did_head && $load_mode==0)
+    {
+      trigger_error("Attempt to add script $id but the head has been written", E_USER_WARNING);
+    }
+    elseif ($this->did_footer)
+    {
+      trigger_error("Attempt to add script $id but the footer has been written", E_USER_WARNING);
     }
     if (! isset( $this->registered_scripts[$id] ) )
@@ -982 +988 @@
       self::fill_well_known($id, $script);
       $this->registered_scripts[$id] = $script;
+
+      // Load or modify all UI core files
+      if ($id == 'jquery.ui' and $script->path == self::$known_paths['jquery.ui'])
+      {
+        foreach (self::$ui_core_dependencies as $script_id => $required_ids)
+          $this->add($script_id, $load_mode, $required_ids, null, $version);
+      }
+
+      // Try to load undefined required script
+      foreach ($script->precedents as $script_id)
+      {
+        if (! isset( $this->registered_scripts[$script_id] ) )
+          $this->load_known_required_script($script_id, $load_mode);
+      }
     }
     else
     {
-      $script = & $this->registered_scripts[$id];
+      $script = $this->registered_scripts[$id];
       if (count($require))
       {
@@ -996 +1016 @@
         $script->load_mode = $load_mode;
     }
-    // Load or modify all UI core files
-    if ($id == 'jquery.ui' and $script->path == self::$known_paths['jquery.ui'])
-    {
-      foreach (self::$ui_core_dependencies as $script_id => $required_ids)
-        $this->add($script_id, $load_mode, $required_ids, null, $version);
-    }
-
-    // Try to load undefined required script
-    foreach ($script->precedents as $script_id)
-    {
-      if (! isset( $this->registered_scripts[$script_id] ) )
-        $this->load_known_required_script($script_id, $load_mode);
-    }
+
   }
 
@@ -1041 +1049 @@
   function get_footer_scripts()
   {
+    $this->did_head || trigger_error("Footer scripts before header scripts ?", E_USER_WARNING);
+    $this->did_footer = true;
     $todo = array();
     foreach( $this->registered_scripts as $id => $script)
@@ -1102 +1112 @@
       {
         $load = $script->load_mode;
-        /*if ($load==0)
-          continue;*/
         foreach( $script->precedents as $precedent)
         {
@@ -1177 +1185 @@
     }
     $recursion_limiter<5 or fatal_error("combined script circular dependency");
-    $script = & $this->registered_scripts[$script_id];
+    $script = $this->registered_scripts[$script_id];
     if (isset($script->extra['order']))
       return $script->extra['order'];