Skip to content

Commit 4a0913c

Browse files
committed
build: release v4.2.2
q
1 parent 6250c2b commit 4a0913c

File tree

12 files changed

+127
-30
lines changed

12 files changed

+127
-30
lines changed

README-ZH.md

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,79 @@ var vm = new Vue({
7777
```
7878
## 修改日志
7979

80-
* Integrate with the future releases of Vue.js
80+
## Change Logs
81+
---
82+
### v4.2.2
83+
#### Features
84+
* Allow to change global options **root** property #8
85+
---
86+
### V4.1
87+
#### Features
88+
* Push-Load has been supported
89+
##### Usage:
90+
```javascript
91+
ops: {
92+
vuescroll: {
93+
pushLoad: {
94+
enable: true
95+
}
96+
}
97+
}
98+
```
99+
* Allow to diable scrollingX or scrollingY #11
100+
101+
##### Usage:
102+
```javascript
103+
ops: {
104+
scrollPanel: {
105+
scrollingX: true,// false to diable
106+
scrollingY: true // false to diable
107+
}
108+
}
109+
```
110+
111+
#### Sweaks
112+
* Redefine pull-refresh tips from `Array` to `Object`
113+
##### Before
114+
```javascript
115+
ops: {
116+
vuescroll: {
117+
pushRefreshTips: ['XX', 'XX']
118+
}
119+
}
120+
```
121+
###### Now
122+
```javascript
123+
ops: {
124+
vuescroll: {
125+
pushRefresh: {
126+
tips: {
127+
start: "",
128+
active: "",
129+
deActive: "",
130+
beforeActive: ""
131+
}
132+
}
133+
}
134+
}
135+
```
136+
---
137+
### V4.0
138+
#### Features
139+
* Add a **vuescroll** option in ops. Now, you can choose two modes for vuescroll. **slide**mode or **native** mode.
140+
```javascript
141+
ops: {
142+
vuescroll: [
143+
mode: 'native' // native or slide
144+
}
145+
// other options...
146+
}
147+
```
148+
* Pull-refresh supported (Only for slide mode)
149+
![](https://github.com/wangyi7099/pictureCdn/blob/master/allPic/vuescroll/vuescroll-pull-refresh.gif?raw=true)
150+
151+
#### Bug Fix
152+
* Can't hide native scrollbar in FireFox.#10
81153

82154
## 受以下的项目启发
83155

README.md

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,15 @@ var vm = new Vue({
7575
})
7676
```
7777
## Change Logs
78-
7978
---
80-
V4.1
81-
## Features
79+
### v4.2.2
80+
#### Features
81+
* Allow to change global options **root** property #8
82+
---
83+
### V4.1
84+
#### Features
8285
* Push-Load has been supported
83-
### Usage:
86+
##### Usage:
8487
```javascript
8588
ops: {
8689
vuescroll: {
@@ -92,7 +95,7 @@ V4.1
9295
```
9396
* Allow to diable scrollingX or scrollingY #11
9497

95-
### Usage:
98+
##### Usage:
9699
```javascript
97100
ops: {
98101
scrollPanel: {
@@ -102,17 +105,17 @@ V4.1
102105
}
103106
```
104107

105-
## Sweaks
108+
#### Sweaks
106109
* Redefine pull-refresh tips from `Array` to `Object`
107-
### Before
110+
##### Before
108111
```javascript
109112
ops: {
110113
vuescroll: {
111114
pushRefreshTips: ['XX', 'XX']
112115
}
113116
}
114117
```
115-
### Now
118+
###### Now
116119
```javascript
117120
ops: {
118121
vuescroll: {
@@ -127,8 +130,9 @@ V4.1
127130
}
128131
}
129132
```
130-
V4.0
131-
## Features
133+
---
134+
### V4.0
135+
#### Features
132136
* Add a **vuescroll** option in ops. Now, you can choose two modes for vuescroll. **slide**mode or **native** mode.
133137
```javascript
134138
ops: {
@@ -141,7 +145,7 @@ V4.0
141145
* Pull-refresh supported (Only for slide mode)
142146
![](https://github.com/wangyi7099/pictureCdn/blob/master/allPic/vuescroll/vuescroll-pull-refresh.gif?raw=true)
143147

144-
## Bug Fix
148+
#### Bug Fix
145149
* Can't hide native scrollbar in FireFox.#10
146150

147151
## Inspire

dist/demo/index.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,16 @@
136136
</div>
137137
</div>
138138
<script>
139+
Vue.prototype.$vuescrollConfig = {
140+
hBar: {
141+
height: '5px',
142+
pos: 'bottom',
143+
background: 'red',
144+
keepShow: false,
145+
opacity: 1,
146+
hover: false
147+
}
148+
}
139149
var easings = [
140150
'easeInQuad',
141151
'easeOutQuad',

dist/vuescroll.common.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* @name: vuescroll 4.1.1
2+
* @name: vuescroll 4.2.2
33
* @author: (c) 2018-2018 wangyi7099
44
* @description: A reactive virtual scrollbar based on vue.js 2.X
55
* @license: MIT
@@ -440,7 +440,8 @@ function validateOptions(ops) {
440440
function hackPropsData() {
441441
var vm = this;
442442
if (vm.$options.name === "vueScroll") {
443-
var ops = deepMerge(GCF, {});
443+
var _gfc = deepMerge(vm.$vuescrollConfig, {});
444+
var ops = deepMerge(GCF, _gfc);
444445
vm.$options.propsData.ops = vm.$options.propsData.ops || {};
445446
Object.keys(vm.$options.propsData.ops).forEach(function (key) {
446447
{
@@ -3479,7 +3480,8 @@ var scroll = {
34793480
Vue$$1.component(vuescroll.name, vuescroll);
34803481

34813482
// registry the globe setting
3482-
Vue$$1.prototype.$vuescrollConfig = GCF;
3483+
// feat: #8
3484+
Vue$$1.prototype.$vuescrollConfig = deepMerge(GCF, {});
34833485

34843486
scroll.isInstalled = true;
34853487
}

dist/vuescroll.common.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vuescroll.esm.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* @name: vuescroll 4.1.1
2+
* @name: vuescroll 4.2.2
33
* @author: (c) 2018-2018 wangyi7099
44
* @description: A reactive virtual scrollbar based on vue.js 2.X
55
* @license: MIT
@@ -436,7 +436,8 @@ function validateOptions(ops) {
436436
function hackPropsData() {
437437
var vm = this;
438438
if (vm.$options.name === "vueScroll") {
439-
var ops = deepMerge(GCF, {});
439+
var _gfc = deepMerge(vm.$vuescrollConfig, {});
440+
var ops = deepMerge(GCF, _gfc);
440441
vm.$options.propsData.ops = vm.$options.propsData.ops || {};
441442
Object.keys(vm.$options.propsData.ops).forEach(function (key) {
442443
{
@@ -3475,7 +3476,8 @@ var scroll = {
34753476
Vue$$1.component(vuescroll.name, vuescroll);
34763477

34773478
// registry the globe setting
3478-
Vue$$1.prototype.$vuescrollConfig = GCF;
3479+
// feat: #8
3480+
Vue$$1.prototype.$vuescrollConfig = deepMerge(GCF, {});
34793481

34803482
scroll.isInstalled = true;
34813483
}

dist/vuescroll.esm.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vuescroll.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* @name: vuescroll 4.1.1
2+
* @name: vuescroll 4.2.2
33
* @author: (c) 2018-2018 wangyi7099
44
* @description: A reactive virtual scrollbar based on vue.js 2.X
55
* @license: MIT
@@ -442,7 +442,8 @@ function validateOptions(ops) {
442442
function hackPropsData() {
443443
var vm = this;
444444
if (vm.$options.name === "vueScroll") {
445-
var ops = deepMerge(GCF, {});
445+
var _gfc = deepMerge(vm.$vuescrollConfig, {});
446+
var ops = deepMerge(GCF, _gfc);
446447
vm.$options.propsData.ops = vm.$options.propsData.ops || {};
447448
Object.keys(vm.$options.propsData.ops).forEach(function (key) {
448449
{
@@ -3481,7 +3482,8 @@ var scroll = {
34813482
Vue$$1.component(vuescroll.name, vuescroll);
34823483

34833484
// registry the globe setting
3484-
Vue$$1.prototype.$vuescrollConfig = GCF;
3485+
// feat: #8
3486+
Vue$$1.prototype.$vuescrollConfig = deepMerge(GCF, {});
34853487

34863488
scroll.isInstalled = true;
34873489
}

dist/vuescroll.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"test:cover": "karma start test/karma.conf.js",
3434
"report-coverage": "codecov"
3535
},
36-
"version": "4.1.2",
36+
"version": "4.2.2",
3737
"devDependencies": {
3838
"babel-core": "^6.26.0",
3939
"babel-helper-vue-jsx-merge-props": "^2.0.3",

0 commit comments

Comments
 (0)