Use TemplateLayout functions for finding js and css files in minimizer
This commit is contained in:
parent
3000e8f9d5
commit
2f00384b51
|
@ -5,11 +5,11 @@ OC_App::loadApps();
|
||||||
|
|
||||||
if ($service == 'core.css'){
|
if ($service == 'core.css'){
|
||||||
$minimizer = new OC_Minimizer_CSS();
|
$minimizer = new OC_Minimizer_CSS();
|
||||||
$files = $minimizer->findFiles(OC_Util::$core_styles);
|
$files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$core_styles);
|
||||||
$minimizer->output($files, $service);
|
$minimizer->output($files, $service);
|
||||||
}
|
}
|
||||||
else if ($service == 'core.js'){
|
else if ($service == 'core.js'){
|
||||||
$minimizer = new OC_Minimizer_JS();
|
$minimizer = new OC_Minimizer_JS();
|
||||||
$files = $minimizer->findFiles(OC_Util::$core_scripts);
|
$files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$core_scripts);
|
||||||
$minimizer->output($files, $service);
|
$minimizer->output($files, $service);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
abstract class OC_Minimizer
|
abstract class OC_Minimizer {
|
||||||
{
|
|
||||||
protected $files = array();
|
|
||||||
|
|
||||||
protected function appendIfExist($root, $webroot, $file) {
|
|
||||||
if (is_file($root.'/'.$file)) {
|
|
||||||
$this->files[] = array($root, $webroot, $file);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getLastModified($files) {
|
public function getLastModified($files) {
|
||||||
$last_modified = 0;
|
$last_modified = 0;
|
||||||
foreach($files as $file_info) {
|
foreach($files as $file_info) {
|
||||||
|
|
|
@ -6,50 +6,6 @@ class OC_Minimizer_CSS extends OC_Minimizer
|
||||||
{
|
{
|
||||||
protected $contentType = 'text/css';
|
protected $contentType = 'text/css';
|
||||||
|
|
||||||
public function findFiles($styles) {
|
|
||||||
// Read the selected theme from the config file
|
|
||||||
$theme=OC_Config::getValue( "theme" );
|
|
||||||
|
|
||||||
// Read the detected formfactor and use the right file name.
|
|
||||||
$fext = OC_Template::getFormFactorExtension();
|
|
||||||
foreach($styles as $style){
|
|
||||||
// is it in 3rdparty?
|
|
||||||
if($this->appendIfExist(OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
|
|
||||||
|
|
||||||
// or in apps?
|
|
||||||
}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style$fext.css" )) {
|
|
||||||
}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style.css" )) {
|
|
||||||
|
|
||||||
// or in the owncloud root?
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style.css" )) {
|
|
||||||
|
|
||||||
// or in core ?
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$style$fext.css" )) {
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
|
|
||||||
|
|
||||||
}else{
|
|
||||||
echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
|
|
||||||
die();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Add the theme css files. you can override the default values here
|
|
||||||
if(!empty($theme)) {
|
|
||||||
foreach($styles as $style){
|
|
||||||
if($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style$fext.css" )) {
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style.css" )) {
|
|
||||||
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style$fext.css" )) {
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style.css" )) {
|
|
||||||
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style$fext.css" )) {
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style.css" )) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return $this->files;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function minimizeFiles($files) {
|
public function minimizeFiles($files) {
|
||||||
$css_out = '';
|
$css_out = '';
|
||||||
$appswebroot = (string) OC::$APPSWEBROOT;
|
$appswebroot = (string) OC::$APPSWEBROOT;
|
||||||
|
|
|
@ -6,49 +6,6 @@ class OC_Minimizer_JS extends OC_Minimizer
|
||||||
{
|
{
|
||||||
protected $contentType = 'application/javascript';
|
protected $contentType = 'application/javascript';
|
||||||
|
|
||||||
public function findFiles($scripts) {
|
|
||||||
// Read the selected theme from the config file
|
|
||||||
$theme=OC_Config::getValue( "theme" );
|
|
||||||
|
|
||||||
// Read the detected formfactor and use the right file name.
|
|
||||||
$fext = OC_Template::getFormFactorExtension();
|
|
||||||
// Add the core js files or the js files provided by the selected theme
|
|
||||||
foreach($scripts as $script){
|
|
||||||
// Is it in 3rd party?
|
|
||||||
if($this->appendIfExist(OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
|
|
||||||
|
|
||||||
// Is it in apps and overwritten by the theme?
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
|
|
||||||
|
|
||||||
// Is it part of an app?
|
|
||||||
}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script$fext.js" )) {
|
|
||||||
}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script.js" )) {
|
|
||||||
|
|
||||||
// Is it in the owncloud root but overwritten by the theme?
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
|
|
||||||
|
|
||||||
// Is it in the owncloud root ?
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$script$fext.js" )) {
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$script.js" )) {
|
|
||||||
|
|
||||||
// Is in core but overwritten by a theme?
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script$fext.js" )) {
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script.js" )) {
|
|
||||||
|
|
||||||
// Is it in core?
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$script$fext.js" )) {
|
|
||||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
|
|
||||||
|
|
||||||
}else{
|
|
||||||
echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
|
|
||||||
die();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return $this->files;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function minimizeFiles($files) {
|
public function minimizeFiles($files) {
|
||||||
$js_out = '';
|
$js_out = '';
|
||||||
foreach($files as $file_info) {
|
foreach($files as $file_info) {
|
||||||
|
|
Loading…
Reference in New Issue