Skip to content

Commit 7b97699

Browse files
wangyi7099wangyi7099
committed
build: release 4.2.3
1 parent 9062ac0 commit 7b97699

File tree

12 files changed

+132
-178
lines changed

12 files changed

+132
-178
lines changed

‎CHANGELOG.MD‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
## Change
2+
---
3+
### v4.2.3
4+
#### Bug Fix
5+
* Can not drag scrollBar in IE/edge #14
6+
* Remove gutter when disabel scrollingX or scrollingY #15
7+
---
8+
### v4.2.2
9+
#### Features
10+
* Allow to change global options **root** property #8
11+
---
12+
### V4.1
13+
#### Features
14+
* Push-Load has been supported
15+
##### Usage:
16+
```javascript
17+
ops: {
18+
vuescroll: {
19+
pushLoad: {
20+
enable: true
21+
}
22+
}
23+
}
24+
```
25+
* Allow to diable scrollingX or scrollingY #11
26+
27+
##### Usage:
28+
```javascript
29+
ops: {
30+
scrollPanel: {
31+
scrollingX: true,// false to disable
32+
scrollingY: true // false to disable
33+
}
34+
}
35+
```
36+
37+
#### Sweaks
38+
* Redefine pull-refresh tips from `Array` to `Object`
39+
##### Before
40+
```javascript
41+
ops: {
42+
vuescroll: {
43+
pushRefreshTips: ['XX', 'XX']
44+
}
45+
}
46+
```
47+
###### Now
48+
```javascript
49+
ops: {
50+
vuescroll: {
51+
pushRefresh: {
52+
tips: {
53+
start: "",
54+
active: "",
55+
deActive: "",
56+
beforeActive: ""
57+
}
58+
}
59+
}
60+
}
61+
```
62+
---
63+
### V4.0
64+
#### Features
65+
* Add a **vuescroll** option in ops. Now, you can choose two modes for vuescroll. **slide**mode or **native** mode.
66+
```javascript
67+
ops: {
68+
vuescroll: [
69+
mode: 'native' // native or slide
70+
}
71+
// other options...
72+
}
73+
```
74+
* Pull-refresh supported (Only for slide mode)
75+
![](https://github.com/wangyi7099/pictureCdn/blob/master/allPic/vuescroll/vuescroll-pull-refresh.gif?raw=true)
76+
77+
#### Bug Fix
78+
* Can't hide native scrollbar in FireFox.#10

‎README-ZH.md‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -75,82 +75,6 @@ var vm = new Vue({
7575
}
7676
})
7777
```
78-
## 修改日志
79-
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
153-
15478
## 受以下的项目启发
15579

15680
jquery [slimscroll](https://github.com/rochal/jQuery-slimScroll) [element-ui](https://github.com/ElemeFE/element/tree/dev/packages/scrollbar/src) [scroller](https://github.com/pbakaus/scroller)

‎README.md‎

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

15178
## Inspiration
15279

‎dist/vuescroll.common.js‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* @name: vuescroll 4.2.2
2+
* @name: vuescroll 4.2.3
33
* @author: (c) 2018-2018 wangyi7099
44
* @description: A reactive virtual scrollbar based on vue.js 2.X
55
* @license: MIT
@@ -516,7 +516,8 @@ var vuescrollApi = {
516516
if (animate) {
517517
goScrolling(this.$refs["scrollPanel"].$el, x - this.$refs["scrollPanel"].$el.scrollLeft, y - this.$refs["scrollPanel"].$el.scrollTop, this.mergedOptions.scrollPanel.speed, this.mergedOptions.scrollPanel.easing);
518518
} else {
519-
this.$refs["scrollPanel"].$el.scrollTo(x, y);
519+
this.$refs["scrollPanel"].$el.scrollTop = y;
520+
this.$refs["scrollPanel"].$el.scrollLeft = x;
520521
}
521522
}
522523
// for non-native we use scroller's scorllTo
@@ -2803,9 +2804,15 @@ function createPanel(h, vm) {
28032804
// for panel and overflow hidden for parent elm,
28042805
// because just hide system bar doesn't work
28052806
// for firefox. #10
2806-
scrollPanelData.style.marginRight = "-" + gutter + "px";
2807-
// scrollPanelData.style.marginBottom = `-${gutter}px`;
2808-
scrollPanelData.style.height = "calc(100% + " + gutter + "px)";
2807+
// gutter should be 0 whhen manually disable scrollingX #14
2808+
if (vm.mergedOptions.scrollPanel.scrollingY) {
2809+
scrollPanelData.style.marginRight = "-" + gutter + "px";
2810+
}
2811+
if (!vm.mergedOptions.scrollPanel.scrollingX) {
2812+
scrollPanelData.style.height = "100%";
2813+
} else {
2814+
scrollPanelData.style.height = "calc(100% + " + gutter + "px)";
2815+
}
28092816
}
28102817
// clear legency styles of slide mode...
28112818
scrollPanelData.style.transformOrigin = "";

‎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: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* @name: vuescroll 4.2.2
2+
* @name: vuescroll 4.2.3
33
* @author: (c) 2018-2018 wangyi7099
44
* @description: A reactive virtual scrollbar based on vue.js 2.X
55
* @license: MIT
@@ -512,7 +512,8 @@ var vuescrollApi = {
512512
if (animate) {
513513
goScrolling(this.$refs["scrollPanel"].$el, x - this.$refs["scrollPanel"].$el.scrollLeft, y - this.$refs["scrollPanel"].$el.scrollTop, this.mergedOptions.scrollPanel.speed, this.mergedOptions.scrollPanel.easing);
514514
} else {
515-
this.$refs["scrollPanel"].$el.scrollTo(x, y);
515+
this.$refs["scrollPanel"].$el.scrollTop = y;
516+
this.$refs["scrollPanel"].$el.scrollLeft = x;
516517
}
517518
}
518519
// for non-native we use scroller's scorllTo
@@ -2799,9 +2800,15 @@ function createPanel(h, vm) {
27992800
// for panel and overflow hidden for parent elm,
28002801
// because just hide system bar doesn't work
28012802
// for firefox. #10
2802-
scrollPanelData.style.marginRight = "-" + gutter + "px";
2803-
// scrollPanelData.style.marginBottom = `-${gutter}px`;
2804-
scrollPanelData.style.height = "calc(100% + " + gutter + "px)";
2803+
// gutter should be 0 whhen manually disable scrollingX #14
2804+
if (vm.mergedOptions.scrollPanel.scrollingY) {
2805+
scrollPanelData.style.marginRight = "-" + gutter + "px";
2806+
}
2807+
if (!vm.mergedOptions.scrollPanel.scrollingX) {
2808+
scrollPanelData.style.height = "100%";
2809+
} else {
2810+
scrollPanelData.style.height = "calc(100% + " + gutter + "px)";
2811+
}
28052812
}
28062813
// clear legency styles of slide mode...
28072814
scrollPanelData.style.transformOrigin = "";

‎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: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* @name: vuescroll 4.2.2
2+
* @name: vuescroll 4.2.3
33
* @author: (c) 2018-2018 wangyi7099
44
* @description: A reactive virtual scrollbar based on vue.js 2.X
55
* @license: MIT
@@ -518,7 +518,8 @@ var vuescrollApi = {
518518
if (animate) {
519519
goScrolling(this.$refs["scrollPanel"].$el, x - this.$refs["scrollPanel"].$el.scrollLeft, y - this.$refs["scrollPanel"].$el.scrollTop, this.mergedOptions.scrollPanel.speed, this.mergedOptions.scrollPanel.easing);
520520
} else {
521-
this.$refs["scrollPanel"].$el.scrollTo(x, y);
521+
this.$refs["scrollPanel"].$el.scrollTop = y;
522+
this.$refs["scrollPanel"].$el.scrollLeft = x;
522523
}
523524
}
524525
// for non-native we use scroller's scorllTo
@@ -2805,9 +2806,15 @@ function createPanel(h, vm) {
28052806
// for panel and overflow hidden for parent elm,
28062807
// because just hide system bar doesn't work
28072808
// for firefox. #10
2808-
scrollPanelData.style.marginRight = "-" + gutter + "px";
2809-
// scrollPanelData.style.marginBottom = `-${gutter}px`;
2810-
scrollPanelData.style.height = "calc(100% + " + gutter + "px)";
2809+
// gutter should be 0 whhen manually disable scrollingX #14
2810+
if (vm.mergedOptions.scrollPanel.scrollingY) {
2811+
scrollPanelData.style.marginRight = "-" + gutter + "px";
2812+
}
2813+
if (!vm.mergedOptions.scrollPanel.scrollingX) {
2814+
scrollPanelData.style.height = "100%";
2815+
} else {
2816+
scrollPanelData.style.height = "calc(100% + " + gutter + "px)";
2817+
}
28112818
}
28122819
// clear legency styles of slide mode...
28132820
scrollPanelData.style.transformOrigin = "";

‎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.2.2",
36+
"version": "4.2.3",
3737
"devDependencies": {
3838
"babel-core": "^6.26.0",
3939
"babel-helper-vue-jsx-merge-props": "^2.0.3",

0 commit comments

Comments
 (0)