Skip to content

Commit

Permalink
4.6.9
Browse files Browse the repository at this point in the history
  • Loading branch information
wangyi7099 committed Jun 24, 2018
1 parent 2c09a85 commit 06016f8
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion dist/vuescroll.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions dist/vuescroll.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Vuescroll v4.6.8
* Vuescroll v4.6.9
* (c) 2018-2018 Yi(Yves) Wang
* Released under the MIT License
* Github Link: https://github.com/YvesCoding/vuescroll
Expand Down Expand Up @@ -3079,6 +3079,7 @@ function createPanel(h, vm) {
};
// set overflow only if the in native mode
if (vm.mode == 'native') {
scrollPanelData.class.push('__native');
// dynamic set overflow scroll
// feat: #11
if (vm.mergedOptions.scrollPanel.scrollingY) {
Expand Down Expand Up @@ -3121,7 +3122,7 @@ function createPanel(h, vm) {
scrollPanelData['display'] = 'inline-block';
}
} else if (vm.mode == 'pure-native') {
scrollPanelData.style['width'] = '100%';
scrollPanelData.class.push('__pure-native');
if (vm.mergedOptions.scrollPanel.scrollingY) {
scrollPanelData.style['overflowY'] = 'auto';
} else {
Expand Down Expand Up @@ -3733,7 +3734,7 @@ var Vuescroll = {
Vue$$1.prototype.$vuescrollConfig = deepMerge(GCF, {});
},

version: '4.6.8',
version: '4.6.9',
refreshAll: refreshAll
};

Expand Down
2 changes: 1 addition & 1 deletion dist/vuescroll.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vuescroll.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"report-coverage": "codecov",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
},
"version": "4.6.8",
"version": "4.6.9",
"devDependencies": {
"babel-core": "^6.26.0",
"babel-eslint": "^8.2.5",
Expand Down
3 changes: 2 additions & 1 deletion src/components/child-components/vuescroll-panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export function createPanel(h, vm) {
};
// set overflow only if the in native mode
if (vm.mode == 'native') {
scrollPanelData.class.push('__native');
// dynamic set overflow scroll
// feat: #11
if (vm.mergedOptions.scrollPanel.scrollingY) {
Expand Down Expand Up @@ -118,7 +119,7 @@ export function createPanel(h, vm) {
scrollPanelData['display'] = 'inline-block';
}
} else if (vm.mode == 'pure-native') {
scrollPanelData.style['width'] = '100%';
scrollPanelData.class.push('__pure-native');
if (vm.mergedOptions.scrollPanel.scrollingY) {
scrollPanelData.style['overflowY'] = 'auto';
} else {
Expand Down
7 changes: 7 additions & 0 deletions src/style/vuescroll.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,19 @@
width: 0;
height: 0;
}
&.__native {
height: 100%;
}
&.__slide {
transform-origin: left top 0px;
user-select: none;
min-width: 100%;
min-height: 100%;
}
&.__pure-native {
width: 100%;
height: 100%;
}
}

&-content {
Expand Down

0 comments on commit 06016f8

Please sign in to comment.