Skip to content

Commit 176a628

Browse files
committed
update to v1.2.2
1 parent 6a200eb commit 176a628

File tree

8 files changed

+44
-37
lines changed

8 files changed

+44
-37
lines changed

.eslintrc.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
"error",
3434
"never"
3535
],
36+
"no-console": 0,
37+
"linebreak-styl":0,
3638
"no-unused-vars": ["error", { "vars": "all", "args": "none" }],
3739
"no-mixed-spaces-and-tabs": [0, "smart-tabs"]
3840
}

History.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
1.2.2 / 2016-05-07
2+
==================
3+
4+
* 修复消息提示组件
5+
* 更新依赖包
6+
7+
18
1.2.1 / 2016-04-08
29
==================
310

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $ cd jackblog-vue
1919
$ npm install
2020
$ gulp serve
2121
```
22-
在浏览器中自动打开 http://localhost:5100
22+
在浏览器中自动打开 http://localhost:3000
2323

2424
## 调试
2525
- 默认开启 vue-devtools [chrome浏览器扩展](https://github.com/vuejs/vue-devtools), 生产环境自动关闭, 手动开启方式:

gulpfile.babel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import gulpSequence from 'gulp-sequence'
99
import nodemon from 'gulp-nodemon'
1010
import open from 'open'
1111

12-
const DEV_PORT = 5100,PROD_PORT = 8400
12+
const DEV_PORT = 3000,PROD_PORT = 8400
1313
gulp.task('serve', cb =>{
1414
let webpackConfig = require('./webpack.config')
1515
let myConfig = Object.create(webpackConfig)

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jackblog-vue",
3-
"version": "1.2.0",
3+
"version": "1.2.2",
44
"description": "Jackblog vue 版",
55
"scripts": {
66
"start": "gulp serve",
@@ -23,14 +23,14 @@
2323
},
2424
"homepage": "https://github.com/jackhutu/jackblog-vue#readme",
2525
"devDependencies": {
26-
"babel-core": "^6.7.2",
26+
"babel-core": "^6.8.0",
2727
"babel-loader": "^6.2.4",
28-
"babel-plugin-add-module-exports": "^0.1.2",
29-
"babel-plugin-transform-runtime": "^6.6.0",
28+
"babel-plugin-add-module-exports": "^0.2.0",
29+
"babel-plugin-transform-runtime": "^6.8.0",
3030
"babel-preset-es2015": "^6.6.0",
3131
"babel-preset-stage-0": "^6.5.0",
32-
"babel-register": "^6.7.2",
33-
"babel-runtime": "5.8.35",
32+
"babel-register": "^6.8.0",
33+
"babel-runtime": "^6.6.1",
3434
"bootstrap": "^3.3.6",
3535
"css-loader": "^0.23.1",
3636
"del": "^2.2.0",
@@ -55,12 +55,12 @@
5555
"vue": "^1.0.21",
5656
"vue-hot-reload-api": "^1.3.2",
5757
"vue-html-loader": "^1.2.2",
58-
"vue-loader": "^8.2.2",
58+
"vue-loader": "^8.3.1",
5959
"vue-resource": "^0.7.0",
6060
"vue-router": "^0.7.13",
6161
"vue-strap": "^1.0.7",
6262
"vue-style-loader": "^1.0.0",
63-
"vue-toastr": "^1.0.3",
63+
"vue-toast": "^2.0.2",
6464
"vue-validator": "^2.1.1",
6565
"vuex": "^0.6.3",
6666
"vuex-router-sync": "^1.0.0",

process.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"apps" : [
3-
{
4-
"name" : "jackblog-vue",
5-
"script" : "./server.js",
6-
"log_date_format" : "YYYY-MM-DD HH:mm Z",
7-
"out_file" : "./logs/pm2-out.log",
8-
"error_file" : "./logs/pm2-err.log",
9-
"pid_file" : "./logs/jackblog-vue.pid",
10-
"ignoreWatch" : ["[\\/\\\\]\\./", "node_modules"],
11-
"watch" : "false",
12-
"exec_mode" : "fork_mode", //cluster_mode
13-
"env": {
14-
"NODE_ENV": "production"
15-
}
16-
}
17-
]
3+
{
4+
"name" : "jackblog-vue",
5+
"script" : "./server.js",
6+
"log_date_format" : "YYYY-MM-DD HH:mm Z",
7+
"out_file" : "./logs/pm2-out.log",
8+
"error_file" : "./logs/pm2-err.log",
9+
"pid_file" : "./logs/jackblog-vue.pid",
10+
"ignoreWatch" : ["[\\/\\\\]\\./", "node_modules"],
11+
"watch" : "false",
12+
"exec_mode" : "fork_mode", //cluster_mode
13+
"env": {
14+
"NODE_ENV": "production"
15+
}
16+
}
17+
]
1818
}

src/components/Toaster/index.vue

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<template>
2-
<vue-toastr v-ref:toastr></vue-toastr>
2+
<vue-toast v-ref:toast></vue-toast>
33
</template>
44

55
<script>
6-
import vueToastr from 'vue-toastr'
6+
import vueToast from 'vue-toast'
77
import { showMsg,hideMsg } from '../../vuex/actions'
88
99
export default {
10-
components: { vueToastr },
10+
components: { vueToast },
1111
vuex:{
1212
getters:{
1313
msg: ({showmsg}) => showmsg.message
@@ -28,14 +28,12 @@ export default {
2828
}
2929
},
3030
methods:{
31-
showToastr(content,type='error',position='toast-top-right'){
32-
this.$refs.toastr.Add({
33-
msg: content,
34-
title: '',
35-
clickClose: true,
36-
timeout: 3000,
37-
type: type,
38-
position: position
31+
showToastr(content,type='error',position='top right'){
32+
this.$refs.toast.setOptions({ maxToasts:3, position: position })
33+
this.$refs.toast.showToast(content, {
34+
theme: type,
35+
timeLife: 2000,
36+
closeBtn: false
3937
})
4038
}
4139
}

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import App from './components/App.vue'
99
import 'font-awesome/css/font-awesome.css'
1010
import 'bootstrap/dist/css/bootstrap.css'
1111
import 'jackblog-sass/dist/index.css'
12-
import 'vue-toastr/dist/vue-toastr.css'
12+
import 'vue-toast/dist/vue-toast.min.css'
1313
import './assets/styles/index.css'
1414

1515
Vue.use(VueRouter)

0 commit comments

Comments
 (0)