Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 07180cd

Browse filesBrowse files
authored
Merge pull request coreui#9 from coreui/dev-vnext
v2.0.0-rc.0
2 parents 4304cdb + a052bdb commit 07180cd
Copy full SHA for 07180cd

File tree

Expand file treeCollapse file tree

5 files changed

+34
-32
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+34
-32
lines changed

‎package.json

Copy file name to clipboardExpand all lines: package.json
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@coreui/vue",
33
"description": "CoreUI Vue Bootstrap 4 layout components",
4-
"version": "2.0.0-beta.2",
4+
"version": "2.0.0-rc.0",
55
"license": "MIT",
66
"main": "dist/coreui-vue.common.js",
77
"module": "dist/coreui-vue.esm.js",
@@ -100,7 +100,9 @@
100100
"vue": "^2.5.16",
101101
"vue-jest": "^2.6.0",
102102
"vue-loader": "^14.2.2",
103-
"vue-template-compiler": "^2.5.16"
103+
"vue-server-renderer": "^2.5.16",
104+
"vue-template-compiler": "^2.5.16",
105+
"vue-test-utils": "^1.0.0-beta.11"
104106
},
105107
"lint-staged": {
106108
"*.{js,vue}": [

‎src/components/Aside/AsideToggler.vue

Copy file name to clipboardExpand all lines: src/components/Aside/AsideToggler.vue
+8-9Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,34 @@ import toggleClasses from '../../shared/toggle-classes'
1616
export default {
1717
name: 'AsideToggler',
1818
props: {
19-
mobile: {
19+
defaultOpen: {
2020
type: Boolean,
2121
default: false
2222
},
2323
display: {
2424
type: String,
2525
default: ''
26-
}
26+
},
27+
mobile: {
28+
type: Boolean,
29+
default: false
30+
},
2731
},
2832
computed: {
2933
classList () {
3034
return [
3135
'navbar-toggler'
32-
// 'd-none',
33-
// 'd-lg-inline-block'
3436
]
3537
}
3638
},
37-
mounted: function () {
38-
// this.toggle()
39-
},
4039
methods: {
41-
toggle () {
40+
toggle (force) {
4241
const [display, mobile] = [this.display, this.mobile]
4342
let cssClass = asideMenuCssClasses[0]
4443
if (!mobile && display && checkBreakpoint(display, validBreakpoints)) {
4544
cssClass = `aside-menu-${display}-show`
4645
}
47-
toggleClasses(cssClass, asideMenuCssClasses)
46+
toggleClasses(cssClass, asideMenuCssClasses, force)
4847
},
4948
asideToggle (e) {
5049
e.preventDefault()

‎src/components/Breadcrumb/Breadcrumb.vue

Copy file name to clipboardExpand all lines: src/components/Breadcrumb/Breadcrumb.vue
+11-12Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
22
<ol class="breadcrumb">
3-
<li class="breadcrumb-item" :key="index" v-for="(item, index) in list">
4-
<span class="active" v-if="isLast(index)">{{ showName(item) }}</span>
5-
<router-link :to="item" v-else>{{ showName(item) }}</router-link>
3+
<li class="breadcrumb-item" :key="index" v-for="(routeObject, index) in routeRecords">
4+
<span class="active" v-if="isLast(index)">{{ getName(routeObject) }}</span>
5+
<router-link :to="routeObject" v-else>{{ getName(routeObject) }}</router-link>
66
</li>
77
</ol>
88
</template>
@@ -17,17 +17,16 @@ export default {
1717
}
1818
},
1919
methods: {
20+
getName (item) {
21+
return item.meta && item.meta.label ? item.meta.label : item.name || null
22+
},
2023
isLast (index) {
2124
return index === this.list.length - 1
22-
},
23-
showName (item) {
24-
if (item.meta && item.meta.label) {
25-
item = item.meta && item.meta.label
26-
}
27-
if (item.name) {
28-
item = item.name
29-
}
30-
return item
25+
}
26+
},
27+
computed: {
28+
routeRecords: function () {
29+
return this.list.filter((route) => route.name || route.meta.label)
3130
}
3231
}
3332
}

‎src/components/Sidebar/SidebarToggler.vue

Copy file name to clipboardExpand all lines: src/components/Sidebar/SidebarToggler.vue
+9-7Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,37 @@ import toggleClasses from '../../shared/toggle-classes'
1616
export default {
1717
name: 'SidebarToggler',
1818
props: {
19-
mobile: {
19+
defaultOpen: {
2020
type: Boolean,
21-
default: false
21+
default: true
2222
},
2323
display: {
2424
type: String,
2525
default: 'lg'
26+
},
27+
mobile: {
28+
type: Boolean,
29+
default: false
2630
}
2731
},
2832
computed: {
2933
classList () {
3034
return [
3135
'navbar-toggler'
32-
// 'd-none',
33-
// 'd-lg-inline-block'
3436
]
3537
}
3638
},
3739
mounted: function () {
38-
this.toggle()
40+
this.toggle(this.defaultOpen)
3941
},
4042
methods: {
41-
toggle () {
43+
toggle (force) {
4244
const [display, mobile] = [this.display, this.mobile]
4345
let cssClass = sidebarCssClasses[0]
4446
if (!mobile && display && checkBreakpoint(display, validBreakpoints)) {
4547
cssClass = `sidebar-${display}-show`
4648
}
47-
toggleClasses(cssClass, sidebarCssClasses)
49+
toggleClasses(cssClass, sidebarCssClasses, force)
4850
},
4951
sidebarToggle (e) {
5052
e.preventDefault()

‎src/shared/toggle-classes.js

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
export default function toggleClasses (toggleClass, classList) {
1+
export default function toggleClasses (toggleClass, classList, force) {
22
const level = classList.indexOf(toggleClass)
33
const removeClassList = classList.slice(0, level)
44
removeClassList.map((className) => document.body.classList.remove(className))
5-
document.body.classList.toggle(toggleClass)
5+
document.body.classList.toggle(toggleClass, force)
66
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.