Revert "Fix stylesheets loading in pipeline mode. Ref #348"
This commit is contained in:
Родитель
9271aa08d0
Коммит
0e8edfbf33
|
@ -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));
|
||||
|
|
|
@ -776,20 +776,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<required.length;i++){
|
||||
var styleUrl = OC.filePath('documents','css', required[i]).replace('/index\.php\//', '');
|
||||
$('head').append('<link rel="stylesheet" type="text/css" href="'+ styleUrl +'"/>');
|
||||
}
|
||||
}
|
||||
|
||||
documentsMain.docs = $('.documentslist').documentGrid();
|
||||
documentsMain.overlay = $('<div id="documents-overlay" class="icon-loading"></div><div id="documents-overlay-below" class="icon-loading-dark"></div>').documentOverlay();
|
||||
documentsMain.toolbar = $('<div id="odf-toolbar" class="dijitToolbar"></div>').documentToolbar();
|
||||
|
|
|
@ -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){
|
||||
|
|
|
@ -36,4 +36,3 @@
|
|||
</div>
|
||||
<input type="hidden" id="webodf-unstable" value="<?php p($_['useUnstable']) ?>" />
|
||||
<input type="hidden" name="allowShareWithLink" id="allowShareWithLink" value="<?php p($_['allowShareWithLink']) ?>" />
|
||||
<input type="hidden" id="isPipelined" value="<?php p($_['isPipelined']) ?>" />
|
||||
|
|
|
@ -21,4 +21,3 @@
|
|||
<div class="warning"><?php p($l->t('This link has been expired or is never existed. Please contact the person who shared it with you for details.')) ?></div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<input type="hidden" id="isPipelined" value="<?php p($_['isPipelined']) ?>" />
|
Загрузка…
Ссылка в новой задаче