Skip to content

Commit a162827

Browse files
Merge remote-tracking branch 'origin/dev'
* origin/dev: (72 commits) docs: add ie polyfills (vuematerial#1342) fix(MdTooltip): `mdActive` never updated to true using `.sync` modifier chore: new component script (vuematerial#1455) fix(MdTabs): fix indicator (vuematerial#1448) fix(MdSelect): Reactive options (vuematerial#1447) fix(MdTooltip): overlaying in dialog (vuematerial#1446) fix(MdTabs): correct indicator position while alignment changed (vuematerial#1442) fix(MdProgressSpinner): undefined navigator on SSR (vuematerial#1441) docs(MdTabs): add missing md-icon prop (vuematerial#1439) fix(MdRipple): clear ripples if called programatically (vuematerial#1431) feat(MdListItemExpand): reactive expansion (vuematerial#1435) feat(MdDatepicker): emit date without confirming (vuematerial#1426) feat(MdDatepicker): add dateformat (vuematerial#1436) feat(MdRipple): multiple waves (vuematerial#1419) feat(MdDatepicker): custom first day of a week (vuematerial#1409) feat(MdDatepicker): remove fixed label position (vuematerial#1417) docs(MdDialog): add note about scrollable content (vuematerial#1416) Update sponsorship links (vuematerial#1427) fix(MdAutocomplete): prevent show options twice (vuematerial#1410) fix(MdField): Consider number `0` as hasValue (vuematerial#1407) ...
2 parents 4308762 + daf58da commit a162827

File tree

118 files changed

+1216
-639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+1216
-639
lines changed

.codeclimate.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ exclude_paths:
2323
plugins:
2424
eslint:
2525
enabled: false
26-
27-
scss-lint:
28-
enabled: true
29-
26+
3027
duplication:
3128
enabled: true
3229
config:

.github/ISSUE_TEMPLATE.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ Reporting a bug?
44
================
55
66
- Always search for your issue first. It may have already been answered, planned or fixed in some branch.
7+
- Open one issue per subject. Cluttered issues will be closed.
78
- Make sure to only create issues for the newest version.
89
- Create a declarative title and describe clearly the steps necessary to reproduce the issue. If an issue labeled "need repro" receives no further input from the issue author for more than 3 days, it will be closed.
9-
- If you want to show your code please use [Codepen](http://codepen.io/pen/) or [JSFiddle](https://jsfiddle.net/). You could start with [this template](http://codepen.io/vue-material/pen/WGavBE).
10-
- In case you found a solution by yourself, it could be helpful to explain how you fixed it.
10+
- If you want to show your code, please use [Codepen](http://codepen.io/pen/) or [JSFiddle](https://jsfiddle.net/). You can start with [this template](https://codepen.io/vue-material/pen/RxGmyb).
11+
- In case you found a solution by yourself, it could be helpful to explain how you have fixed it.
1112
- For bugs that involves build setups, you can create a reproduction repository with steps in the README.
12-
- If your issue is resolved but still open, don’t hesitate to close it. In case you found a solution by yourself, it could be helpful to explain how you fixed it.
13+
- If your issue is resolved but still open, don’t hesitate to close it.
1314
1415
Have a feature request?
1516
=======================

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ Build well-designed apps that can fit on every screen with support to all modern
3030

3131
## Sponsorship
3232

33-
Vue Material is proudly sponsored by [Rollbar](https://cs.berry.sh/c/c0597778-f465-4788-abe3-8711cc087774
34-
). They provide real-time error monitoring, alerting, and analytics for developers.
33+
Vue Material is proudly sponsored by [Rollbar](https://codesponsor.io/t/c/93172542ee6813a9372c08c459fd1e5a/
34+
). They provide real-time JavaScript error monitoring, alerting, and analytics for developers. :rocket:
3535

36-
You can try Rollbar for free at [https://rollbar.com](https://cs.berry.sh/c/c0597778-f465-4788-abe3-8711cc087774
37-
) <img src="https://cs.berry.sh/l/c0597778-f465-4788-abe3-8711cc087774/pixel.png" />
36+
You can try Rollbar for free at [https://rollbar.com](https://codesponsor.io/t/c/93172542ee6813a9372c08c459fd1e5a/
37+
) <img src="https://codesponsor.io/t/l/93172542ee6813a9372c08c459fd1e5a/pixel.png" />
3838

3939
## Demo and Documentation
4040

build/docs/webpack.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ const componentExampleLoader = require.resolve('../loaders/component-example-loa
2929
const webpackConfig = {
3030
entry: {
3131
app: [
32+
'babel-polyfill',
3233
'./docs/app/index.js',
3334
'./build/docs/offline.js'
3435
]

build/loaders/component-example-loader.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ const pretty = require('pretty')
33
const prettier = require('prettier')
44
const path = require('path')
55
const compiler = require('vue-template-compiler')
6-
const transpile = require('vue-template-es2015-compiler')
76
const { resolvePath } = require('../config')
7+
const { transform } = require('babel-core')
8+
const transpile = code => transform(code, {extends: resolvePath('.babelrc')}).code
89
const { getIndentedSource } = require('../../docs/app/mixins/codeSource')
910

1011
function camelCaseToDash (str) {

build/local/webpack.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export default {
1212
devtool: 'cheap-module-eval-source-map',
1313
entry: {
1414
docs: [
15+
'babel-polyfill',
1516
'./docs/app/index.js',
1617
'./build/local/client'
1718
]

build/new-component.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ export default Vue => {
8080

8181
function getDocsFile (name) {
8282
const singleName = name.replace('Md', '')
83+
const docName = name.replace('Md', 'Doc')
8384

8485
return `<example src="./examples/Example.vue" />
8586
@@ -105,7 +106,7 @@ function getDocsFile (name) {
105106
import examples from 'docs-mixins/docsExample'
106107
107108
export default {
108-
name: '${singleName}',
109+
name: '${docName}',
109110
mixins: [examples]
110111
}
111112
</script>
@@ -155,7 +156,7 @@ const rootDir = join(__dirname, '..')
155156
const componentsPath = 'src/components/' + name
156157
const componentIndex = 'src/components/index.js'
157158
const themePath = 'src/theme/all.scss'
158-
const docsPath = 'docs/app/pages/components/' + singleName
159+
const docsPath = 'docs/app/pages/Components/' + singleName
159160
const docsRoutePath = 'docs/app/routes.js'
160161
const navPath = 'docs/app/template/MainNavContent.vue'
161162

docs/app/config.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Vue from 'vue'
22
import Axios from 'axios'
33
import VueRouter from 'vue-router'
44
import Vuei18n from 'vue-i18n'
5-
import enUS from './i18n/en-US'
5+
import i18nLocales from './i18n'
66
import { routes } from './routes'
77
import createRoute from './routes'
88

@@ -18,12 +18,10 @@ const mappedRoutes = routes.map(route => ({
1818
component: () => import(`./pages/${route.page}`)
1919
}))
2020

21-
export const currentLang = enUS
21+
export const currentLang = i18nLocales.enUS
2222
export const i18n = new Vuei18n({
23-
locale: 'en-US',
24-
messages: {
25-
'en-US': enUS
26-
}
23+
locale: 'enUS',
24+
messages: i18nLocales
2725
})
2826

2927
export const router = new VueRouter({

docs/app/i18n/en-US.js

Lines changed: 0 additions & 265 deletions
This file was deleted.

docs/app/i18n/en-US/components.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export default {
2+
code: {
3+
copyMessage: 'Code copied!',
4+
copy: 'Copy'
5+
}
6+
}

0 commit comments

Comments
 (0)