Use closure for navigation. Fixes #486

pull/1/head
Victor Dubiniuk 9 years ago
parent 1bacd68708
commit a5ae82e870

@ -21,61 +21,72 @@
* *
*/ */
OCP\App::register(array('order' => 70, 'id' => 'documents', 'name' => 'Documents')); namespace OCA\Documents\AppInfo;
//OCP\App::registerAdmin('documents', 'settings');
use OCA\Documents\Filter\Office;
use OCA\Documents\Config;
$app = new Application();
$c = $app->getContainer();
\OCP\App::register(['order' => 70, 'id' => 'documents', 'name' => 'Documents']);
//\OCP\App::registerAdmin('documents', 'settings');
\OCP\App::registerAdmin('documents', 'admin'); \OCP\App::registerAdmin('documents', 'admin');
OCP\App::registerPersonal('documents', 'personal'); \OCP\App::registerPersonal('documents', 'personal');
OCP\App::addNavigationEntry(array( $navigationEntry = function () use ($c) {
'id' => 'documents_index', return [
'order' => 2, 'id' => 'documents_index',
'href' => OCP\Util::linkTo('documents/', 'index.php'), 'order' => 2,
'icon' => OCP\Util::imagePath('documents', 'documents.svg'), 'href' => \OCP\Util::linkTo('documents/', 'index.php'),
'name' => OCA\Documents\Config::getL10n()->t('Documents')) 'icon' => \OCP\Util::imagePath('documents', 'documents.svg'),
); 'name' => $c->query('L10N')->t('Documents')
];
};
$c->getServer()->getNavigationManager()->add($navigationEntry);
//Script for registering file actions //Script for registering file actions
$url = OC::$server->getRequest()->server['REQUEST_URI']; $url = \OC::$server->getRequest()->server['REQUEST_URI'];
if (preg_match('%index.php/apps/files(/.*)?%', $url)) { if (preg_match('%index.php/apps/files(/.*)?%', $url)) {
OCP\Util::addScript('documents', 'viewer/viewer'); \OCP\Util::addScript('documents', 'viewer/viewer');
} }
if (OCA\Documents\Config::getConverter() !== 'off'){ if (Config::getConverter() !== 'off'){
$docFilter = new OCA\Documents\Filter\Office( $docFilter = new Office(
array( [
'read' => 'read' =>
array ( [
'target' => 'application/vnd.oasis.opendocument.text', 'target' => 'application/vnd.oasis.opendocument.text',
'format' => 'odt:writer8', 'format' => 'odt:writer8',
'extension' => 'odt' 'extension' => 'odt'
), ],
'write' => 'write' =>
array ( [
'target' => 'application/msword', 'target' => 'application/msword',
'format' => 'doc', 'format' => 'doc',
'extension' => 'doc' 'extension' => 'doc'
) ]
) ]
); );
$docxFilter = new OCA\Documents\Filter\Office( $docxFilter = new Office(
array ( [
'read' => 'read' =>
array ( [
'target' => 'application/vnd.oasis.opendocument.text', 'target' => 'application/vnd.oasis.opendocument.text',
'format' => 'odt:writer8', 'format' => 'odt:writer8',
'extension' => 'odt' 'extension' => 'odt'
), ],
'write' => 'write' =>
array ( [
'target' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'target' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
'format' => 'docx', 'format' => 'docx',
'extension' => 'docx' 'extension' => 'docx'
) ]
) ]
); );
} }
//Listen to delete file signal //Listen to delete file signal
OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Documents\Storage", "onDelete"); \OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Documents\Storage", "onDelete");

Loading…
Cancel
Save