Merge pull request #13116 from owncloud/fix_assets
Fix JS asset generation
This commit is contained in:
commit
20886d8151
|
@ -0,0 +1,57 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ownCloud
|
||||||
|
*
|
||||||
|
* Copyright (C) 2014 Robin McCorkell <rmccorkell@karoshi.org.uk>
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public
|
||||||
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OC\Assetic;
|
||||||
|
|
||||||
|
use Assetic\Filter\FilterInterface;
|
||||||
|
use Assetic\Asset\AssetInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Inserts a separator between assets to prevent merge failures
|
||||||
|
* e.g. missing semicolon at the end of a JS file
|
||||||
|
*/
|
||||||
|
class SeparatorFilter implements FilterInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
private $separator;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor.
|
||||||
|
*
|
||||||
|
* @param string $separator Separator to use between assets
|
||||||
|
*/
|
||||||
|
public function __construct($separator = ';')
|
||||||
|
{
|
||||||
|
$this->separator = $separator;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function filterLoad(AssetInterface $asset)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public function filterDump(AssetInterface $asset)
|
||||||
|
{
|
||||||
|
$asset->setContent($asset->getContent() . $this->separator);
|
||||||
|
}
|
||||||
|
}
|
|
@ -6,6 +6,7 @@ use Assetic\Filter\CssImportFilter;
|
||||||
use Assetic\Filter\CssMinFilter;
|
use Assetic\Filter\CssMinFilter;
|
||||||
use Assetic\Filter\CssRewriteFilter;
|
use Assetic\Filter\CssRewriteFilter;
|
||||||
use Assetic\Filter\JSMinFilter;
|
use Assetic\Filter\JSMinFilter;
|
||||||
|
use OC\Assetic\SeparatorFilter; // waiting on upstream
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
|
* Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
|
||||||
|
@ -163,10 +164,13 @@ class OC_TemplateLayout extends OC_Template {
|
||||||
$file = $item[2];
|
$file = $item[2];
|
||||||
// no need to minifiy minified files
|
// no need to minifiy minified files
|
||||||
if (substr($file, -strlen('.min.js')) === '.min.js') {
|
if (substr($file, -strlen('.min.js')) === '.min.js') {
|
||||||
return new FileAsset($root . '/' . $file, array(), $root, $file);
|
return new FileAsset($root . '/' . $file, array(
|
||||||
|
new SeparatorFilter(';')
|
||||||
|
), $root, $file);
|
||||||
}
|
}
|
||||||
return new FileAsset($root . '/' . $file, array(
|
return new FileAsset($root . '/' . $file, array(
|
||||||
new JSMinFilter()
|
new JSMinFilter(),
|
||||||
|
new SeparatorFilter(';')
|
||||||
), $root, $file);
|
), $root, $file);
|
||||||
}, $jsFiles);
|
}, $jsFiles);
|
||||||
$jsCollection = new AssetCollection($jsFiles);
|
$jsCollection = new AssetCollection($jsFiles);
|
||||||
|
|
Loading…
Reference in New Issue