Changeset 27412 for extensions/modus/themeconf.inc.php

Timestamp:

Feb 19, 2014, 6:14:59 AM (10 years ago)

Author:

rvelices

Message:

modus js optims

File:

• extensions/modus/themeconf.inc.php (modified) (5 diffs)

extensions/modus/themeconf.inc.php

@@ -69 +69 @@
 
         if ( ($pos=strpos($source, '<ul class="categoryActions">'))!==false || ($pos=strpos($source, '<ul class=categoryActions>'))!==false){
-                if ( ($pos2=strpos($source, '</ul>', $pos))!==false 
+                if ( ($pos2=strpos($source, '</ul>', $pos))!==false
                         && (substr_count($source, '<li>', $pos, $pos2-$pos) > 2) )
                         $source = substr_replace($source, '<a id=albumActionsSwitcher class=pwg-button><span class="pwg-icon pwg-icon-ellipsis"></span></a>{combine_script version=1 id=\'modus.async\' path="themes/`$themeconf.id`/js/modus.async.js" load=\'async\'}', $pos, 0);
@@ -146 +146 @@
 function modus_css_resolution($params)
 {
-  $base = @$params['base'];
-  $min = @$params['min'];
-  $max = @$params['max'];
-  
-  $rules = array();
-  if (!empty($base))
-    $rules[] = $base;
-  foreach(array('min','max') as $type)
-  {
-    if (!empty($$type))
-      $rules[] = '(-webkit-'.$type.'-device-pixel-ratio:'.$$type.')';
-  }
-  $res = implode(' and ', $rules);
-
-  $rules = array();
-  if (!empty($base))
-    $rules[] = $base;
-  foreach(array('min','max') as $type)
-  {
-    if (!empty($$type))
-      $rules[] = '('.$type.'-resolution:'.round(96*$$type,1).'dpi)';
-  }
-  $res .= ','.implode(' and ', $rules);
-
-  return $res;
+        $base = @$params['base'];
+        $min = @$params['min'];
+        $max = @$params['max'];
+
+        $rules = array();
+        if (!empty($base))
+                $rules[] = $base;
+        foreach(array('min','max') as $type)
+        {
+                if (!empty($$type))
+                        $rules[] = '(-webkit-'.$type.'-device-pixel-ratio:'.$$type.')';
+        }
+        $res = implode(' and ', $rules);
+
+        $rules = array();
+        if (!empty($base))
+                $rules[] = $base;
+        foreach(array('min','max') as $type)
+        {
+                if (!empty($$type))
+                        $rules[] = '('.$type.'-resolution:'.round(96*$$type,1).'dpi)';
+        }
+        $res .= ','.implode(' and ', $rules);
+
+        return $res;
 }
 
@@ -184 +184 @@
         $device = get_device();
         $container_margin = 5;
-        
+
         if ('mobile'==$device)
         {
@@ -224 +224 @@
                 }
                 while($csize[1]<$row_height-2 && $idx<count($candidates));
-                
+
                 if ($do_pop && $idx<count($candidates))
                 {
@@ -254 +254 @@
 
         $my_base_name = basename(dirname(__FILE__));
-  // not async to avoid visible flickering reflow
-  $template->scriptLoader->add('modus.arange', 1, array('jquery'), 'themes/'.$my_base_name."/js/thumb.arrange.min.js", 0);
+        // not async to avoid visible flickering reflow
+        $template->scriptLoader->add('modus.arange', 1, array('jquery'), 'themes/'.$my_base_name."/js/thumb.arrange.min.js", 0);
         if ($do_pop)
                 $template->scriptLoader->add('modus.pop', 2, array('jquery'), 'themes/'.$my_base_name."/js/thumb.pop.js", 0);