Changeset 201 for trunk/trax/vendor/trax/action_view

Timestamp:

05/25/06 02:58:10 (6 years ago)

Author:

john

Message:

Major changes to environment added boot.php and Trax class to hold framwork config

Location:

trunk/trax/vendor/trax/action_view

Files:

• helpers.php (modified) (4 diffs)
• helpers/asset_tag_helper.php (modified) (5 diffs)

trunk/trax/vendor/trax/action_view/helpers.php

@@ -57 +57 @@
      *  Current controller object
      *
-     *  Local copy of $GLOBALS['current_controller_object']<br />
+     *  Local copy of Trax::$current_controller_object<br />
      *  <b>NB:</b> {@link object()} faults if this does not contain a
      *  valid instance of ActionController.
@@ -67 +67 @@
      *  Current controller name
      *
-     *  Local copy of $GLOBALS['current_controller_name']
+     *  Local copy of Trax::$current_controller_name
      *  @var string
      */
@@ -75 +75 @@
      *  Current controller path
      *
-     *  Local copy of $GLOBALS['current_controller_path']
+     *  Local copy of Trax::$current_controller_path
      *  @var string
      */
@@ -105 +105 @@
         //  Copy controller information from $GLOBALS
         $this->controller_name =
-            (array_key_exists('current_controller_name',$GLOBALS)
-             && $GLOBALS['current_controller_name'])
-            ? $GLOBALS['current_controller_name'] : null;
+            !is_null(Trax::$current_controller_name)           
+            ? Trax::$current_controller_name : null;
         $this->controller_path =
-            (array_key_exists('current_controller_path', $GLOBALS)
-             && $GLOBALS['current_controller_path'])
-            ? $GLOBALS['current_controller_path'] : null;
+            !is_null(Trax::$current_controller_path)
+            ? Trax::$current_controller_path : null;
         $this->controller_object =
-            (array_key_exists('current_controller_object', $GLOBALS)
-             && $GLOBALS['current_controller_object'])
-            ? $GLOBALS['current_controller_object'] : null;
+            (!is_null(Trax::$current_controller_object) 
+            && is_object(Trax::$current_controller_object))
+            ? Trax::$current_controller_object : null;
         if($auto_index) {
             $object = $this->object();

trunk/trax/vendor/trax/action_view/helpers/asset_tag_helper.php

@@ -82 +82 @@
 
             //  If TRAX_URL_PREFIX non-null, prefix it to path
-            if(!is_null(TRAX_URL_PREFIX)) {
-                $prefix = TRAX_URL_PREFIX;
+            if(!is_null(Trax::$url_prefix)) {
+                $prefix = Trax::$url_prefix;
                 if($prefix{0} != "/") {
                     $prefix = "/$prefix";
@@ -150 +150 @@
                                            $sources);    
                 }                  
-                if(file_exists(TRAX_PUBLIC. "/javascripts/application.js")) {
+                if(file_exists(Trax::$public_path. "/javascripts/application.js")) {
                     $sources[] = 'application';
                 }
@@ -331 +331 @@
     $asset_helper = new AssetTagHelper();
     $args = func_get_args();
-    return call_user_func_array(array($asset_helper,
-                                      'auto_discovery_link_tag'), $args);
+    return call_user_func_array(array($asset_helper, 'auto_discovery_link_tag'), $args);
 }
 
@@ -352 +351 @@
     $asset_helper = new AssetTagHelper();
     $args = func_get_args();
-    return call_user_func_array(array($asset_helper,
-                                      'stylesheet_link_tag'), $args);
+    return call_user_func_array(array($asset_helper, 'stylesheet_link_tag'), $args);
 }
 
@@ -363 +361 @@
     $asset_helper = new AssetTagHelper();
     $args = func_get_args();
-    return call_user_func_array(array($asset_helper,
-                                      'javascript_include_tag'), $args);
+    return call_user_func_array(array($asset_helper, 'javascript_include_tag'), $args);
 }