Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 9cb86bf

Browse files
committed
update
1 parent 9bc9de7 commit 9cb86bf

File tree

5 files changed

+21
-19
lines changed

5 files changed

+21
-19
lines changed

‎dist/ohyeah-scroll.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vue-ohyeah-scroll",
33
"description": "prettier scroll",
4-
"version": "0.2.1",
4+
"version": "0.2.2",
55
"author": "L <https://blog.isluo.com>",
66
"license": "MIT",
77
"private": false,
@@ -29,18 +29,18 @@
2929
"vue": "^2.6.10"
3030
},
3131
"devDependencies": {
32-
"@babel/core": "^7.4.3",
33-
"@babel/preset-env": "^7.4.3",
32+
"@babel/core": "^7.4.4",
33+
"@babel/preset-env": "^7.4.4",
3434
"babel-loader": "^8.0.5",
3535
"cross-env": "^5.2.0",
3636
"css-loader": "^2.1.1",
3737
"file-loader": "^3.0.1",
38-
"node-sass": "^4.11.0",
38+
"node-sass": "^4.12.0",
3939
"sass-loader": "^7.1.0",
4040
"vue-loader": "^15.7.0",
4141
"vue-template-compiler": "^2.6.10",
42-
"webpack": "^4.30.0",
43-
"webpack-cli": "^3.3.1",
42+
"webpack": "^4.31.0",
43+
"webpack-cli": "^3.3.2",
4444
"webpack-dev-server": "^3.3.1"
4545
}
4646
}

‎src/App.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export default {
7878
},
7979
plus() {
8080
this.arr.splice(-1, 1);
81-
this.width = this.width - 100;
81+
//this.width = this.width - 100;
8282
},
8383
changeBox() {
8484
console.log("change?");

‎src/packages/ohyeah/ohyeah.vue‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ export default {
361361
362362
willStopProp(e) {
363363
if (
364+
this.realShowH &&
364365
e.deltaY &&
365366
this.barHScrollTop + e.deltaY > 0 &&
366367
this.barHScrollTop + e.deltaY < this.trickH - this.barHTall
@@ -369,6 +370,7 @@ export default {
369370
e.stopImmediatePropagation();
370371
}
371372
if (
373+
this.realShowW &&
372374
e.deltaX &&
373375
this.barWScrollLeft + e.deltaX > 0 &&
374376
this.barWScrollLeft + e.deltaX < this.trickW - this.barWTall

‎yarn.lock‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
dependencies:
1010
"@babel/highlight" "^7.0.0"
1111

12-
"@babel/core@^7.4.3":
12+
"@babel/core@^7.4.4":
1313
version "7.4.4"
1414
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.4.tgz#84055750b05fcd50f9915a826b44fa347a825250"
1515
integrity sha512-lQgGX3FPRgbz2SKmhMtYgJvVzGZrmjaF4apZ2bLwofAKiSjxU0drPh4S/VasyYXwaTs+A1gvQ45BN8SQJzHsQQ==
@@ -531,7 +531,7 @@
531531
"@babel/helper-regex" "^7.4.4"
532532
regexpu-core "^4.5.4"
533533

534-
"@babel/preset-env@^7.4.3":
534+
"@babel/preset-env@^7.4.4":
535535
version "7.4.4"
536536
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.4.tgz#b6f6825bfb27b3e1394ca3de4f926482722c1d6f"
537537
integrity sha512-FU1H+ACWqZZqfw1x2G1tgtSSYSfxJLkpaUQL37CenULFARDo+h4xJoVHzRoHbK+85ViLciuI7ME4WTIhFRBBlw==
@@ -3654,7 +3654,7 @@ node-releases@^1.1.14:
36543654
dependencies:
36553655
semver "^5.3.0"
36563656

3657-
node-sass@^4.11.0:
3657+
node-sass@^4.12.0:
36583658
version "4.12.0"
36593659
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
36603660
integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
@@ -5457,10 +5457,10 @@ wbuf@^1.1.0, wbuf@^1.7.3:
54575457
dependencies:
54585458
minimalistic-assert "^1.0.0"
54595459

5460-
webpack-cli@^3.3.1:
5461-
version "3.3.1"
5462-
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.1.tgz#98b0499c7138ba9ece8898bd99c4f007db59909d"
5463-
integrity sha512-c2inFU7SM0IttEgF7fK6AaUsbBnORRzminvbyRKS+NlbQHVZdCtzKBlavRL5359bFsywXGRAItA5di/IruC8mg==
5460+
webpack-cli@^3.3.2:
5461+
version "3.3.2"
5462+
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.2.tgz#aed2437b0db0a7faa2ad28484e166a5360014a91"
5463+
integrity sha512-FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA==
54645464
dependencies:
54655465
chalk "^2.4.1"
54665466
cross-spawn "^6.0.5"
@@ -5536,10 +5536,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0:
55365536
source-list-map "^2.0.0"
55375537
source-map "~0.6.1"
55385538

5539-
webpack@^4.30.0:
5540-
version "4.30.0"
5541-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.30.0.tgz#aca76ef75630a22c49fcc235b39b4c57591d33a9"
5542-
integrity sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==
5539+
webpack@^4.31.0:
5540+
version "4.31.0"
5541+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.31.0.tgz#ae201d45f0571336e42d1c2b5c8ab56c4d3b0c63"
5542+
integrity sha512-n6RVO3X0LbbipoE62akME9K/JI7qYrwwufs20VvgNNpqUoH4860KkaxJTbGq5bgkVZF9FqyyTG/0WPLH3PVNJA==
55435543
dependencies:
55445544
"@webassemblyjs/ast" "1.8.5"
55455545
"@webassemblyjs/helper-module-context" "1.8.5"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /