From d40867d8551b3ce9630a107617df64780f744e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 28 Sep 2015 22:51:43 +0200 Subject: [PATCH 1/3] Suer JSqueezeFilter instead of JSMinFilter --- lib/private/templatelayout.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index ae3c1093b20..30f75761d05 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -38,7 +38,7 @@ use Assetic\AssetWriter; use Assetic\Filter\CssImportFilter; use Assetic\Filter\CssMinFilter; use Assetic\Filter\CssRewriteFilter; -use Assetic\Filter\JSMinFilter; +use Assetic\Filter\JSqueezeFilter; use OC\Assetic\SeparatorFilter; // waiting on upstream /** @@ -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); From 766b69a0c8c99757c89cb567f77b90a531010087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 28 Sep 2015 22:52:45 +0200 Subject: [PATCH 2/3] User upstream class SeparatorFilter --- lib/private/assetic/separatorfilter.php | 57 ------------------------- lib/private/templatelayout.php | 2 +- 2 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 lib/private/assetic/separatorfilter.php diff --git a/lib/private/assetic/separatorfilter.php b/lib/private/assetic/separatorfilter.php deleted file mode 100644 index ee6d5c11c20..00000000000 --- a/lib/private/assetic/separatorfilter.php +++ /dev/null @@ -1,57 +0,0 @@ - - * @author Robin McCorkell - * - * @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 - * - */ - -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); - } -} diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index 30f75761d05..43c83dea815 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -39,7 +39,7 @@ use Assetic\Filter\CssImportFilter; use Assetic\Filter\CssMinFilter; use Assetic\Filter\CssRewriteFilter; use Assetic\Filter\JSqueezeFilter; -use OC\Assetic\SeparatorFilter; // waiting on upstream +use Assetic\Filter\SeparatorFilter; /** * Copyright (c) 2012 Bart Visscher From 4cc0f5bf8e06c87cc125e0b593dd672fedd15ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 28 Sep 2015 22:54:20 +0200 Subject: [PATCH 3/3] Update 3rdparty submodule --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index 5ce8de19b67..e2a142cf866 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 5ce8de19b67296cc03957d4483ae8ddacc1d4f82 +Subproject commit e2a142cf866b30318c0bd71a78e9aa659deccadf