Changeset 5962

Timestamp:

01/24/12 23:54:36 (4 months ago)

Author:

vain

Message:

• cleanup; dropped compressionWhitelist idea

File:

• trunk/core/viewhelper/javascripts.core.php (modified) (4 diffs)

trunk/core/viewhelper/javascripts.core.php

@@ -192 +192 @@
             foreach($filenames as $filename)
             {
-                return '<script src="{$www_root_themes_core}'.$filename.'" type="text/javascript"></script>'.CR;
+                $js_file = WWW_ROOT_THEMES_CORE . 'javascript/'.$filename.'.js';
+
+                return '<script src="'.$js_file.'" type="text/javascript"></script>'.CR;
             }
         }
@@ -204 +206 @@
     public static function addJS($filename)
     {
-        $javascript = WWW_ROOT_THEMES_CORE . 'javascript/'.$filename.'.js';
-
-        if( defined('OB_GZIP') )
-        {
-            #self::addToCompressionWhitelist($javascript);
-            return '<script src="' . WWW_ROOT_THEMES_CORE . 'compress.php?js=' . $javascript . '" type="text/javascript"></script>' . CR;
-        }
-        else
-        {
-            return '<script src="'.$javascript.'" type="text/javascript"></script>'.CR;
-        }
+        $js_file = WWW_ROOT_THEMES_CORE . 'javascript/'.$filename.'.js';
+
+        return '<script src="'.$js_file.'" type="text/javascript"></script>'.CR;
     }
 
@@ -239 +233 @@
      * @params string filename of the cascading style sheet to load
      * @params boolean display the iehack css in case true, default is false
-     * 
+     *
      * @return html style type css import
      */
@@ -245 +239 @@
     {
         $html = '<style type="text/css"> @import "' . WWW_ROOT_THEMES_CORE . 'css/' . $filename . '.css"; </style>';
-        
+
         if($iehack === true)
         {