Skip to content

Commit 3b593d5

Browse files
committed
Merge remote-tracking branch 'origin' into docs/add-ads
* origin: docs: fix 2 wrong property names with autocomplete docs (#2006) fix(MdTable): undefined table sorting #1906 (#2012) docs: fix dynamic tooltip text to show bottom instead of top (#2013) refactor(MdDatepicker): upgrade date-fns (#2037) fix(MdDatepicker): positioning when used inside flex container (#2036) fix(MdSelect): infinite loop error, when no v-model provided (#2035) fix(MdApp): normalized component's tag before checking to match slot … (#1994) chore: some misspellings in config.js (#1986) fixFixed non unique ids on MdSelect (#2001) fix(MdInput): invert password on-off icons (#2008) test: fix test selectors for checkbox and switch (#2009) docs: add default theme as a suggestion (#2043) Fixed md-wave transition (#2034) fix(MdRipple): fixed missing ripple effect (#2059)
2 parents f8e98bb + 76274e8 commit 3b593d5

File tree

20 files changed

+11235
-46
lines changed

20 files changed

+11235
-46
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ coverage/
77
yarn-debug.log
88
npm-debug.log
99
.vscode
10+
.idea

build/config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ export const resolvePath = (...args) => {
88
}
99

1010
export const getRandomInt = (min, max) => {
11-
const minNotAlowed = 8080
12-
const maxNotAlowed = 8090
11+
const minNotAllowed = 8080
12+
const maxNotAllowed = 8090
1313
const generated = Math.floor(Math.random() * (max - min + 1)) + min
1414

15-
if (generated >= minNotAlowed && generated <= maxNotAlowed) {
15+
if (generated >= minNotAllowed && generated <= maxNotAllowed) {
1616
return getRandomInt(min, max)
1717
}
1818

docs/app/pages/Components/Autocomplete/examples/AutocompleteSearch.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<template>
22
<div>
33
<strong>Fuzzy Search:</strong>
4-
<md-autocomplete v-model="selectedCountry" :md-options="employees">
4+
<md-autocomplete v-model="selectedEmployee" :md-options="employees">
55
<label>Manager</label>
66

77
<template slot="md-autocomplete-item" slot-scope="{ item, term }">
88
<md-highlight-text :md-term="term">{{ item }}</md-highlight-text>
99
</template>
1010

1111
<template slot="md-autocomplete-empty" slot-scope="{ term }">
12-
No countries matching "{{ term }}" were found. <a @click="noop()">Create a new</a> one!
12+
No employees matching "{{ term }}" were found. <a @click="noop()">Create a new</a> one!
1313
</template>
1414
</md-autocomplete>
1515

1616
<strong>Normal Search:</strong>
17-
<md-autocomplete v-model="selectedEmployee" :md-options="countries" :md-fuzzy-search="false">
17+
<md-autocomplete v-model="selectedCountry" :md-options="countries" :md-fuzzy-search="false">
1818
<label>Country</label>
1919

2020
<template slot="md-autocomplete-item" slot-scope="{ item, term }">
@@ -32,8 +32,8 @@
3232
export default {
3333
name: 'AutocompleteSearch',
3434
data: () => ({
35-
selectedCountry: null,
3635
selectedEmployee: null,
36+
selectedCountry: null,
3737
countries: [
3838
'Algeria',
3939
'Argentina',

docs/app/pages/Components/Datepicker/examples/BasicDatepicker.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<md-field>
1313
<label for="movie">Date format</label>
1414
<md-select v-model="dateFormat">
15-
<md-option value="YYYY-MM-DD">default</md-option>
16-
<md-option value="YYYY/MM/DD">YYYY/MM/DD</md-option>
17-
<md-option value="DD/MM/YYYY">DD/MM/YYYY</md-option>
18-
<md-option value="MM/DD/YYYY">MM/DD/YYYY</md-option>
15+
<md-option value="yyyy-MM-dd">default</md-option>
16+
<md-option value="yyyy/MM/dd">yyyy/MM/dd</md-option>
17+
<md-option value="dd/MM/yyyy">dd/MM/yyyy</md-option>
18+
<md-option value="MM/dd/yyyy">MM/dd/yyyy</md-option>
1919
</md-select>
2020
<span class="md-helper-text">This config is global.</span>
2121
</md-field>

docs/app/pages/Components/Datepicker/examples/MultiTypesDatepicker.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
export default {
4747
name: 'MultiTypesDatepicker',
4848
data () {
49-
let dateFormat = this.$material.locale.dateFormat || 'YYYY-MM-DD'
49+
let dateFormat = this.$material.locale.dateFormat || 'yyyy-MM-dd'
5050
let now = new Date()
5151
5252
return {
@@ -82,7 +82,7 @@
8282
}
8383
},
8484
dateFormat () {
85-
return this.$material.locale.dateFormat || 'YYYY-MM-DD'
85+
return this.$material.locale.dateFormat || 'yyyy-MM-dd'
8686
},
8787
mdType () {
8888
switch (this.mdTypeValue) {

docs/app/pages/Components/Tooltip/examples/Dynamically.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div>
33
<md-avatar>
44
<img src="/assets/examples/avatar.png" alt="Avatar">
5-
<md-tooltip :md-active.sync="tooltipActive">Top</md-tooltip>
5+
<md-tooltip :md-active.sync="tooltipActive">Bottom</md-tooltip>
66
</md-avatar>
77

88
<md-button class="md-raised md-primary" @click="tooltipActive = !tooltipActive">Toggle Tooltip</md-button>

docs/app/pages/Configuration.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
import Vue from 'vue'
99

1010
// change single option
11-
Vue.material.locale.dateFormat = 'DD/MM/YYYY'
11+
Vue.material.locale.dateFormat = 'dd/MM/yyyy'
1212

1313
// change multiple options
1414
Vue.material = {
1515
...Vue.material,
1616
locale: {
1717
...Vue.material.locale,
18-
dateFormat: 'DD/MM/YYYY',
18+
dateFormat: 'dd/MM/yyyy',
1919
firstDayOfAWeek: 1
2020
}
2121
}
@@ -51,7 +51,7 @@
5151
endYear: 2099,
5252

5353
// date format for date picker
54-
dateFormat: 'YYYY-MM-DD',
54+
dateFormat: 'yyyy-MM-dd',
5555

5656
// i18n strings
5757
days: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],

docs/app/pages/GettingStarted.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import Vue from 'vue'
3535
import { MdButton, MdContent, MdTabs } from 'vue-material/dist/components'
3636
import 'vue-material/dist/vue-material.min.css'
37+
import 'vue-material/dist/theme/default.css'
3738

3839
Vue.use(MdButton)
3940
Vue.use(MdContent)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"css-loader": "^0.28.11",
6767
"css-mqpacker": "^6.0.2",
6868
"cz-conventional-changelog": "^2.1.0",
69-
"date-fns": "^2.0.0-alpha.7",
69+
"date-fns": "^2.0.0-alpha.27",
7070
"deepmerge": "^3.2.0",
7171
"eslint": "^4.19.1",
7272
"eslint-config-standard": "^11.0.0",

src/components/MdApp/MdApp.vue

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@
1010
'md-app-content'
1111
]
1212
13+
function normilizeTagName (tagName) {
14+
return tagName.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase()
15+
}
16+
1317
function isValidChild (componentOptions) {
14-
return componentOptions && componentTypes.includes(componentOptions.tag)
18+
return componentOptions && componentTypes.includes(normilizeTagName(componentOptions.tag))
1519
}
1620
1721
function isRightDrawer (propsData) {
@@ -42,7 +46,7 @@
4246
const componentOptions = child.componentOptions
4347
4448
if (shouldRenderSlot(data, componentOptions)) {
45-
const slotName = data.slot || componentOptions.tag
49+
const slotName = data.slot || normilizeTagName(componentOptions.tag)
4650
child.data.slot = slotName
4751
4852
if (slotName === 'md-app-drawer') {
@@ -79,7 +83,7 @@
7983
8084
function getDrawers (children) {
8185
const drawerVnodes = children.filter(child => {
82-
const tag = child.data.slot || child.componentOptions.tag
86+
const tag = child.data.slot || normilizeTagName(child.componentOptions.tag)
8387
return tag === 'md-app-drawer'
8488
})
8589
return drawerVnodes.length ? drawerVnodes : []

0 commit comments

Comments
 (0)