From 0e8edfbf33a481dcc77064972ef93254068ee977 Mon Sep 17 00:00:00 2001 From: VicDeo Date: Wed, 8 Oct 2014 20:28:59 +0300 Subject: [PATCH] Revert "Fix stylesheets loading in pipeline mode. Ref #348" --- index.php | 3 +-- js/documents.js | 14 -------------- public.php | 1 - templates/documents.php | 1 - templates/public.php | 1 - 5 files changed, 1 insertion(+), 19 deletions(-) diff --git a/index.php b/index.php index 437c21e6..c4aa2c0a 100755 --- a/index.php +++ b/index.php @@ -39,14 +39,13 @@ namespace OCA\Documents; \OCP\Util::addScript('files', 'jquery.fileupload'); - $tmpl = new \OCP\Template('documents', 'documents', 'user'); $unstable = \OCP\Config::getAppValue('documents', 'unstable', 'false'); $maxUploadFilesize = \OCP\Util::maxUploadFilesize("/"); $savePath = \OCP\Config::getUserValue(\OCP\User::getUser(), 'documents', 'save_path', '/'); -$tmpl->assign('isPipelined', \OCP\Config::getSystemValue('asset-pipeline.enabled')); + $tmpl->assign('useUnstable', $unstable); $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize); $tmpl->assign('uploadMaxHumanFilesize', \OCP\Util::humanFileSize($maxUploadFilesize)); diff --git a/js/documents.js b/js/documents.js index c6ecf2ce..dc8036a3 100644 --- a/js/documents.js +++ b/js/documents.js @@ -775,20 +775,6 @@ FileList.getCurrentDirectory = function(){ $(document).ready(function() { "use strict"; - - /* Hotfix. Pipeline mode doesn't support @import */ - if ($('#isPipelined').val()>0){ - var required = [ - '../js/3rdparty/resources/dijit/themes/claro/claro.css', - '../js/3rdparty/resources/dojox/layout/resources/ExpandoPane.css', - '../js/3rdparty/resources/dojox/widget/ColorPicker/ColorPicker.css', - 'style.css' - ]; - for (var i=0;i'); - } - } documentsMain.docs = $('.documentslist').documentGrid(); documentsMain.overlay = $('
').documentOverlay(); diff --git a/public.php b/public.php index 1415126a..91ea50f7 100644 --- a/public.php +++ b/public.php @@ -52,7 +52,6 @@ if (isset($_GET['t'])) { } else { $tmpl->assign('total', 1); } - $tmpl->assign('isPipelined', \OCP\Config::getSystemValue('asset-pipeline.enabled')); $tmpl->assign('document', $token); } } catch (\Exception $e){ diff --git a/templates/documents.php b/templates/documents.php index 92a567b2..11bca4ce 100755 --- a/templates/documents.php +++ b/templates/documents.php @@ -36,4 +36,3 @@ - diff --git a/templates/public.php b/templates/public.php index e30e750c..6f018e88 100644 --- a/templates/public.php +++ b/templates/public.php @@ -21,4 +21,3 @@
t('This link has been expired or is never existed. Please contact the person who shared it with you for details.')) ?>
- \ No newline at end of file