fix: typo of setting style of scrollPanel

YvesCoding · Apr 17, 2018 · 1cb3ecb · 1cb3ecb
1 parent b338791
commit 1cb3ecb
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/dist/demo/index.html b/dist/demo/index.html
@@ -155,7 +155,7 @@
         data: {
             ops: {
               vuescroll: {
-                mode: "slide",
+                mode: "native",
                 pullRefresh: {
                     tips: {
                         beforeDeactive: "Refresh Successfully!"
@@ -180,7 +180,7 @@
                   background: "#000"
               }
             },
-            dataNums: 500,
+            dataNums: 100,
             reRender: 1,
             easings
         },

diff --git a/dist/vuescroll.common.js b/dist/vuescroll.common.js
@@ -1,5 +1,5 @@
 /*
-    * @name: vuescroll 4.1.0
+    * @name: vuescroll 4.1.1
     * @author: (c) 2018-2018 wangyi7099
     * @description: A reactive virtual scrollbar based on vue.js 2.X
     * @license: MIT
@@ -2785,7 +2785,7 @@ function createPanel(h, vm) {
     } else {
       scrollPanelData.style["overflowY"] = vm.vBar.state.size ? "hidden" : "inherit";
     }
-    if (vm.mergedOptions.scrollPanel.scrollinX) {
+    if (vm.mergedOptions.scrollPanel.scrollingX) {
       scrollPanelData.style["overflowX"] = vm.vBar.state.size ? "scroll" : "inherit";
     } else {
       scrollPanelData.style["overflowX"] = vm.vBar.state.size ? "hidden" : "inherit";
@@ -2803,7 +2803,7 @@ function createPanel(h, vm) {
       // because just hide system bar doesn't work 
       // for firefox. #10
       scrollPanelData.style.marginRight = "-" + gutter + "px";
-      scrollPanelData.style.marginBottom = "-" + gutter + "px";
+      // scrollPanelData.style.marginBottom = `-${gutter}px`;
       scrollPanelData.style.height = "calc(100% + " + gutter + "px)";
     }
     // clear legency styles of slide mode...

diff --git a/dist/vuescroll.common.min.js b/dist/vuescroll.common.min.js
diff --git a/dist/vuescroll.esm.js b/dist/vuescroll.esm.js
@@ -1,5 +1,5 @@
 /*
-    * @name: vuescroll 4.1.0
+    * @name: vuescroll 4.1.1
     * @author: (c) 2018-2018 wangyi7099
     * @description: A reactive virtual scrollbar based on vue.js 2.X
     * @license: MIT
@@ -2781,7 +2781,7 @@ function createPanel(h, vm) {
     } else {
       scrollPanelData.style["overflowY"] = vm.vBar.state.size ? "hidden" : "inherit";
     }
-    if (vm.mergedOptions.scrollPanel.scrollinX) {
+    if (vm.mergedOptions.scrollPanel.scrollingX) {
       scrollPanelData.style["overflowX"] = vm.vBar.state.size ? "scroll" : "inherit";
     } else {
       scrollPanelData.style["overflowX"] = vm.vBar.state.size ? "hidden" : "inherit";
@@ -2799,7 +2799,7 @@ function createPanel(h, vm) {
       // because just hide system bar doesn't work 
       // for firefox. #10
       scrollPanelData.style.marginRight = "-" + gutter + "px";
-      scrollPanelData.style.marginBottom = "-" + gutter + "px";
+      // scrollPanelData.style.marginBottom = `-${gutter}px`;
       scrollPanelData.style.height = "calc(100% + " + gutter + "px)";
     }
     // clear legency styles of slide mode...

diff --git a/dist/vuescroll.esm.min.js b/dist/vuescroll.esm.min.js
diff --git a/dist/vuescroll.js b/dist/vuescroll.js
@@ -1,5 +1,5 @@
 /*
-    * @name: vuescroll 4.1.0
+    * @name: vuescroll 4.1.1
     * @author: (c) 2018-2018 wangyi7099
     * @description: A reactive virtual scrollbar based on vue.js 2.X
     * @license: MIT
@@ -2787,7 +2787,7 @@ function createPanel(h, vm) {
     } else {
       scrollPanelData.style["overflowY"] = vm.vBar.state.size ? "hidden" : "inherit";
     }
-    if (vm.mergedOptions.scrollPanel.scrollinX) {
+    if (vm.mergedOptions.scrollPanel.scrollingX) {
       scrollPanelData.style["overflowX"] = vm.vBar.state.size ? "scroll" : "inherit";
     } else {
       scrollPanelData.style["overflowX"] = vm.vBar.state.size ? "hidden" : "inherit";
@@ -2805,7 +2805,7 @@ function createPanel(h, vm) {
       // because just hide system bar doesn't work 
       // for firefox. #10
       scrollPanelData.style.marginRight = "-" + gutter + "px";
-      scrollPanelData.style.marginBottom = "-" + gutter + "px";
+      // scrollPanelData.style.marginBottom = `-${gutter}px`;
       scrollPanelData.style.height = "calc(100% + " + gutter + "px)";
     }
     // clear legency styles of slide mode...

diff --git a/dist/vuescroll.min.js b/dist/vuescroll.min.js
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "test:cover": "karma start test/karma.conf.js",
     "report-coverage": "codecov"
   },
-  "version": "4.1.0",
+  "version": "4.1.1",
   "devDependencies": {
     "babel-core": "^6.26.0",
     "babel-helper-vue-jsx-merge-props": "^2.0.3",

diff --git a/src/components/vuescroll.js b/src/components/vuescroll.js
@@ -60,7 +60,7 @@ function createPanel(h, vm) {
     } else {
       scrollPanelData.style["overflowY"] = vm.vBar.state.size?"hidden":"inherit";
     }
-    if(vm.mergedOptions.scrollPanel.scrollinX) {
+    if(vm.mergedOptions.scrollPanel.scrollingX) {
       scrollPanelData.style["overflowX"] = vm.vBar.state.size?"scroll":"inherit";
     } else  {
       scrollPanelData.style["overflowX"] = vm.vBar.state.size?"hidden":"inherit";
@@ -78,7 +78,7 @@ function createPanel(h, vm) {
       // because just hide system bar doesn't work 
       // for firefox. #10
       scrollPanelData.style.marginRight = `-${gutter}px`;
-      scrollPanelData.style.marginBottom = `-${gutter}px`;
+      // scrollPanelData.style.marginBottom = `-${gutter}px`;
       scrollPanelData.style.height = `calc(100% + ${gutter}px)`;
     }
     // clear legency styles of slide mode...