Changeset 3021:4018240bced6 for inc

Timestamp:

06/22/15 22:01:24 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Add css without cache counterpart : cssLoad
Use jsLoad and cssLoad for official plugins

File:

• inc/admin/lib.dc.page.php (modified) (11 diffs)

inc/admin/lib.dc.page.php

@@ -17 +17 @@
 {
      private static $loaded_js = array();
+     private static $loaded_css = array();
      private static $xframe_loaded = false;
      private static $N_TYPES = array(
@@ -109 +110 @@
 
           self::jsLoadIE7().
-          '  <link rel="stylesheet" href="style/default.css" type="text/css" media="screen" />'."\n";
+          self::cssLoad('style/default.css');
           if (l10n::getTextDirection($GLOBALS['_lang']) == 'rtl') {
-               echo
-               '  <link rel="stylesheet" href="style/default-rtl.css" type="text/css" media="screen" />'."\n";
+               echo self::cssLoad('style/default-rtl.css');
           }
 
@@ -119 +119 @@
           if (!$user_ui_hide_std_favicon) {
                echo
-               '<link rel="icon" type="image/png" href="images/favicon96-login.png" />'.
-               '<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />';
+               '<link rel="icon" type="image/png" href="images/favicon96-login.png" />'."\n".
+               '<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />'."\n";
           }
           echo
@@ -339 +339 @@
 
           self::jsLoadIE7().
-          '    <link rel="stylesheet" href="style/default.css" type="text/css" media="screen" />'."\n";
+          self::cssLoad('style/default.css');
           if (l10n::getTextDirection($GLOBALS['_lang']) == 'rtl') {
-               echo
-               '    <link rel="stylesheet" href="style/default-rtl.css" type="text/css" media="screen" />'."\n";
+               echo self::cssLoad('style/default-rtl.css');
           }
 
@@ -546 +545 @@
      }
 
+     public static function cssLoad($src, $media='screen')
+     {
+          $escaped_src = html::escapeHTML($src);
+          if (!isset(self::$loaded_css[$escaped_src])) {
+               self::$loaded_css[$escaped_src] = true;
+               $escaped_src = self::appendVersion($escaped_src);
+
+               return '<link rel="stylesheet" href="'.$escaped_src.'" type="text/css" media="'.$media.'" />'."\n";
+          }
+     }
+
      public static function jsLoad($src)
      {
@@ -551 +561 @@
           if (!isset(self::$loaded_js[$escaped_src])) {
                self::$loaded_js[$escaped_src] = true;
-               if (strpos($escaped_src,'?')===false) {
-                    $escaped_src .= '?v=';
-               } else {
-                    $escaped_src .= '&v=';
-               }
-
-               if (defined('DC_DEV') && DC_DEV === true) {
-                    $escaped_src .= md5(uniqid());
-               } else {
-                    $escaped_src .= DC_VERSION;
-               }
+               $escaped_src = self::appendVersion($escaped_src);
                return '<script type="text/javascript" src="'.$escaped_src.'"></script>'."\n";
           }
+     }
+
+     private static function appendVersion($src)
+     {
+          if (strpos($src,'?')===false) {
+               $src .= '?v=';
+          } else {
+               $src .= '&v=';
+          }
+
+          if (defined('DC_DEV') && DC_DEV === true) {
+               $src .= md5(uniqid());
+          } else {
+               $src .= DC_VERSION;
+          }
+
+          return $src;
      }
 
@@ -745 +762 @@
           '<!--[if lt IE 9]>'."\n".
           self::jsLoad('js/ie7/IE9.js').
-          '<link rel="stylesheet" type="text/css" href="style/iesucks.css" />'."\n".
+          self::cssLoad('style/iesucks.css').
           '<![endif]-->'."\n";
      }
@@ -799 +816 @@
      {
           return
-          '<link rel="stylesheet" type="text/css" href="style/modal/modal.css" />'."\n".
+          self::cssLoad('style/modal/modal.css').
           self::jsLoad('js/jquery/jquery.modal.js').
           '<script type="text/javascript">'."\n".
@@ -812 +829 @@
      {
           return
-          '<link rel="stylesheet" type="text/css" href="style/farbtastic/farbtastic.css" />'."\n".
+          self::cssLoad('style/farbtastic/farbtastic.css').
           self::jsLoad('js/jquery/jquery.farbtastic.js').
           self::jsLoad('js/color-picker.js');
@@ -820 +837 @@
      {
           return
-          '<link rel="stylesheet" type="text/css" href="style/date-picker.css" />'."\n".
+          self::cssLoad('style/date-picker.css').
           self::jsLoad('js/date-picker.js').
           '<script type="text/javascript">'."\n".
@@ -916 +933 @@
      {
           return
-          '<script type="text/javascript" src="js/tool-man/core.js"></script>'.
-          '<script type="text/javascript" src="js/tool-man/events.js"></script>'.
-          '<script type="text/javascript" src="js/tool-man/css.js"></script>'.
-          '<script type="text/javascript" src="js/tool-man/coordinates.js"></script>'.
-          '<script type="text/javascript" src="js/tool-man/drag.js"></script>'.
-          '<script type="text/javascript" src="js/tool-man/dragsort.js"></script>'.
-          '<script type="text/javascript" src="js/dragsort-tablerows.js"></script>';
+          self::jsLoad('js/tool-man/core.js').
+          self::jsLoad('js/tool-man/events.js').
+          self::jsLoad('js/tool-man/css.js').
+          self::jsLoad('js/tool-man/coordinates.js').
+          self::jsLoad('js/tool-man/drag.js').
+          self::jsLoad('js/tool-man/dragsort.js').
+          self::jsLoad('js/dragsort-tablerows.js');
      }
 
      public static function jsMetaEditor()
      {
-          return
-          '<script type="text/javascript" src="js/meta-editor.js"></script>';
+          return self::jsLoad('js/meta-editor.js');
      }