Merge pull request 'develop' (#156) from develop into master
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #156
This commit is contained in:
commit
6198a2abc2
|
@ -39,6 +39,7 @@
|
|||
|
||||
#header .side-menu-opener {
|
||||
margin-left: 0px;
|
||||
margin-top: -1px;
|
||||
}
|
||||
|
||||
.side-menu-settings {
|
||||
|
|
|
@ -60,6 +60,7 @@ import CloserButton from './CloserButton'
|
|||
import SettingsButton from './SettingsButton'
|
||||
import Loader from './Loader'
|
||||
import SideMenuBigApp from './SideMenuBigApp'
|
||||
import { loadState } from '@nextcloud/initial-state'
|
||||
|
||||
export default {
|
||||
name: 'SideMenuBig',
|
||||
|
@ -100,8 +101,13 @@ export default {
|
|||
},
|
||||
|
||||
retrieveActiveApp() {
|
||||
let activeAppLink = document.querySelector('#appmenu a.active')
|
||||
this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
|
||||
const ncApps = loadState('core', 'apps', {})
|
||||
|
||||
for (let id in ncApps) {
|
||||
if (ncApps[id].active) {
|
||||
this.activeApp = id
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
retrieveConfig() {
|
||||
|
|
|
@ -54,17 +54,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
<script>
|
||||
import axios from 'axios'
|
||||
import OpenerButton from './OpenerButton'
|
||||
import CloserButton from './CloserButton'
|
||||
import SettingsButton from './SettingsButton'
|
||||
import Loader from './Loader'
|
||||
import SideMenuBigApp from './SideMenuBigApp'
|
||||
import { loadState } from '@nextcloud/initial-state'
|
||||
|
||||
export default {
|
||||
name: 'SideMenuWithCategories',
|
||||
components: {
|
||||
SettingsButton,
|
||||
OpenerButton,
|
||||
CloserButton,
|
||||
Loader,
|
||||
SideMenuBigApp,
|
||||
},
|
||||
|
@ -98,8 +97,13 @@ export default {
|
|||
},
|
||||
|
||||
retrieveActiveApp() {
|
||||
let activeAppLink = document.querySelector('#appmenu a.active')
|
||||
this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
|
||||
const ncApps = loadState('core', 'apps', {})
|
||||
|
||||
for (let id in ncApps) {
|
||||
if (ncApps[id].active) {
|
||||
this.activeApp = id
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
retrieveConfig() {
|
||||
|
|
Loading…
Reference in a new issue