wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19424 from owncloud/use-jsqueeze

Browse source 
Use jsqueeze
This commit is contained in:
Thomas Müller 2015-09-29 13:44:26 +02:00
commit c2dd0f80ec
3 changed files with 4 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit 5ce8de19b67296cc03957d4483ae8ddacc1d4f82
Subproject commit e2a142cf866b30318c0bd71a78e9aa659deccadf

57
lib/private/assetic/separatorfilter.php
View file

@ -1,57 +0,0 @@
<?php
/**
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin McCorkell <rmccorkell@karoshi.org.uk>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program 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, version 3,
* along with this program. 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
lib/private/templatelayout.php
View file

@ -38,8 +38,8 @@ use Assetic\AssetWriter;
use Assetic\Filter\CssImportFilter;
use Assetic\Filter\CssMinFilter;
use Assetic\Filter\CssRewriteFilter;
use Assetic\Filter\JSMinFilter;
use OC\Assetic\SeparatorFilter; // waiting on upstream
use Assetic\Filter\JSqueezeFilter;
use Assetic\Filter\SeparatorFilter;
/**
* Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
@ -225,7 +225,7 @@ class OC_TemplateLayout extends OC_Template {
), $root, $file);
}
return new FileAsset($root . '/' . $file, array(
new JSMinFilter(),
new JSqueezeFilter(),
new SeparatorFilter(';')
), $root, $file);
}, $jsFiles);