mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

toGlyph() speed optimization and fixes for custom glyphs set by theme.xml

Browse Source
This commit is contained in:
Cameron 2017-11-03 18:52:49 -07:00
parent ad485cd198
commit 6947cedf88
3 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/e107_class.php
View File

@ -1244,6 +1244,11 @@ class e107
} }
$arr[] = $glyphConfig; $arr[] = $glyphConfig;
if(E107_DBG_INCLUDES)
{
e107::getDebug()->log("Loading Glyph Icons: ".print_a($glyphConfig,true));
}
} }
} }

55
e107_handlers/e_parse_class.php
View File

@ -3883,8 +3883,8 @@ class e_parser
} }
// Get Glyph names. // Get Glyph names.
$bs3 = e107::getMedia()->getGlyphs('bs3',''); // $bs3 = e107::getMedia()->getGlyphs('bs3','');
$fa4 = e107::getMedia()->getGlyphs('fa4',''); // $fa4 = e107::getMedia()->getGlyphs('fa4','');
@ -3893,19 +3893,21 @@ class e_parser
// return $cls; // return $cls;
$removePrefix = array('glyphicon-','icon-','fa-'); // $removePrefix = array('glyphicon-','icon-','fa-');
$id = str_replace($removePrefix, "", $cls); // $id = str_replace($removePrefix, "", $cls);
$id = $cls;
$spin = null; $spin = null;
$rotate = null; $rotate = null;
$fixedW = null; $fixedW = null;
$prefix = null; $prefix = 'fa fa-'; // fallback
$size = null; $size = null;
$tag = 'span'; $tag = 'span';
// return print_r($fa4,true); // return print_r($fa4,true);
/*
if(deftrue('FONTAWESOME') && in_array($id ,$fa4)) // Contains FontAwesome 3 set also. if(deftrue('FONTAWESOME') && in_array($id ,$fa4)) // Contains FontAwesome 3 set also.
{ {
$prefix = 'fa fa-'; $prefix = 'fa fa-';
@ -3931,6 +3933,45 @@ class e_parser
$size = ''; $size = '';
} }
*/
if(strpos($text, 'fa-') === 0) // Font-Awesome
{
$prefix = 'fa ';
$size = (vartrue($parm['size'])) ? ' fa-'.$parm['size'] : '';
$tag = 'i';
$spin = !empty($parm['spin']) ? ' fa-spin' : '';
$rotate = !empty($parm['rotate']) ? ' fa-rotate-'.intval($parm['rotate']) : '';
$fixedW = !empty($parm['fw']) ? ' fa-fw' : "";
}
elseif(strpos($text, 'glyphicon-') === 0) // Bootstrap 3
{
$prefix = 'glyphicon ';
$tag = 'span';
}
elseif(strpos($text, 'icon-') === 0) // Bootstrap 2
{
$prefix = '';
$tag = 'i';
}
elseif($custom = e107::getThemeGlyphs()) // Custom Glyphs
{
foreach($custom as $glyphConfig)
{
if(strpos($text, $glyphConfig['prefix']) === 0)
{
$prefix = $glyphConfig['class'] . " ";
$tag = $glyphConfig['tag'];
continue;
}
}
}
$idAtt = (!empty($parm['id'])) ? "id='".$parm['id']."' " : ''; $idAtt = (!empty($parm['id'])) ? "id='".$parm['id']."' " : '';
$style = (!empty($parm['style'])) ? "style='".$parm['style']."' " : ''; $style = (!empty($parm['style'])) ? "style='".$parm['style']."' " : '';
@ -3942,8 +3983,6 @@ class e_parser
return $text; return $text;
//$text = preg_replace('/\[(i_[\w]*)\]/',"<i class='$1'></i>", $text);
// return $text;
} }

1
e107_handlers/theme_handler.php
View File

@ -736,6 +736,7 @@ class e_theme
'name' => $val['@attributes']['name'], 'name' => $val['@attributes']['name'],
'pattern' => $val['@attributes']['pattern'], 'pattern' => $val['@attributes']['pattern'],
'path' => $val['@attributes']['path'], 'path' => $val['@attributes']['path'],
'class' => $val['@attributes']['class'],
'prefix' => $val['@attributes']['prefix'], 'prefix' => $val['@attributes']['prefix'],
'tag' => $val['@attributes']['tag'], 'tag' => $val['@attributes']['tag'],
); );