From aa89c908a70dddabb39ea7d0a166e147e31d3f5d Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 7 Dec 2016 01:01:01 +0100 Subject: [PATCH] Remove unrequired route Signed-off-by: Lukas Reschke --- appinfo/routes.php | 1 - js/viewer/viewer.js | 11 +++-------- lib/Controller/SettingsController.php | 12 ------------ 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/appinfo/routes.php b/appinfo/routes.php index 67dfc3fa..07a5068c 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -25,6 +25,5 @@ return [ //settings ['name' => 'settings#setSettings', 'url' => 'ajax/admin.php', 'verb' => 'POST'], - ['name' => 'settings#getSettings', 'url' => 'ajax/settings.php', 'verb' => 'GET'], ] ]; diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js index 3ade286b..590801fe 100644 --- a/js/viewer/viewer.js +++ b/js/viewer/viewer.js @@ -131,8 +131,8 @@ var odfViewer = { $('#richdocumentsframe').remove(); }, - registerFilesMenu: function(response) { - var ooxml = response.doc_format === 'ooxml'; + registerFilesMenu: function() { + var ooxml = false; var docExt, spreadsheetExt, presentationExt; var docMime, spreadsheetMime, presentationMime; @@ -220,12 +220,7 @@ $(document).ready(function() { && typeof OCA.Files.fileActions !== 'undefined' ) { odfViewer.register(); - - $.get( - OC.filePath('richdocuments', 'ajax', 'settings.php'), - {}, - odfViewer.registerFilesMenu - ); + odfViewer.registerFilesMenu(); } }); diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php index 69b28084..60d5edc2 100644 --- a/lib/Controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -52,18 +52,6 @@ class SettingsController extends Controller{ ); } - /** - * @NoAdminRequired - * - * @return JSONResponse - */ - public function getSettings() { - return new JSONResponse([ - 'doc_format' => $this->appConfig->getAppValue('doc_format'), - 'wopi_url' => $this->appConfig->getAppValue('wopi_url'), - ]); - } - /** * @param string $wopi_url * @param string $doc_format