This commit is contained in:
Dennis Eichhorn 2018-02-03 13:09:09 +01:00
parent 8246941d98
commit 16580ac0e7
5 changed files with 8 additions and 8 deletions

View File

@ -19,7 +19,6 @@ use phpOMS\Module\UpdateAbstract;
use phpOMS\System\File\Directory;
use phpOMS\Module\InfoManager;
/**
* Navigation class.
*

View File

@ -46,7 +46,7 @@
*/
jsOMS.Modules.Navigation.prototype.bind = function (id)
{
const e = typeof id === 'undefined' ? document.getElementsByClassName('nav') : [document.getElementById(id)],
const e = typeof id === 'undefined' ? document.getElementsByClassName('nav') : [document.getElementById(id)],
length = e.length;
for (let i = 0; i < length; i++) {
@ -72,13 +72,13 @@
}
const extend = e.querySelectorAll('li label'),
self = this;
self = this;
this.navigation[e.id] = new jsOMS.Modules.Navigation.Models.Navigation(this.rawNavData[e.id]);
// On load
const open = this.navigation[e.id].getOpen();
let ele = null;
let ele = null;
for (let key in open) {
if (open.hasOwnProperty(key) && (ele = document.getElementById(key)) !== null) {

View File

@ -120,7 +120,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function getView(RequestAbstract $request, ResponseAbstract $response)
{
$navObj = \Modules\Navigation\Models\Navigation::getInstance($request, $this->app->dbPool);
$nav = new \Modules\Navigation\Views\NavigationView($this->app, $request, $response);
$nav = new \Modules\Navigation\Views\NavigationView($this->app, $request, $response);
$nav->setNav($navObj->getNav());
$nav->setLanguage($request->getHeader()->getL11n()->getLanguage());
$unread = [];
@ -134,7 +134,8 @@ class Controller extends ModuleAbstract implements WebInterface
return $nav;
}
public function loadLanguage(RequestAbstract $request, ResponseAbstract $response) {
public function loadLanguage(RequestAbstract $request, ResponseAbstract $response)
{
$languages = $this->app->moduleManager->getLanguageFiles($request);
foreach ($languages as $path) {

View File

@ -28,7 +28,7 @@
this.visible = true;
this.openCategories = {};
} else {
this.scrollPosition = typeof data.scrollPosition === 'undefined' ? {x: 0, y: 0} : data.scrollPosition;
this.scrollPosition = typeof data.scrollPosition === 'undefined' ? {x : 0, y : 0} : data.scrollPosition;
this.activeLinks = typeof data.activeLinks === 'undefined' ? {} : data.activeLinks;
this.visible = typeof data.visible === 'undefined' ? true : data.visible;
this.openCategories = typeof data.openCategories === 'undefined' ? {} : data.openCategories;

View File

@ -10,4 +10,4 @@
* @version 1.0.0
* @link http://website.orange-management.de
*/
return ['Navigation' => []];
return ['Navigation' => []];