0.2.4

fuermosi777 · Nov 8, 2016 · 9fd6dae · 9fd6dae
1 parent 755edd5
commit 9fd6dae
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 11 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -122,7 +122,17 @@ module.exports = React.createClass({
     componentDidMount: function componentDidMount() {
         document.addEventListener('mousemove', this.handleHandlerMouseMove);
         document.addEventListener('mouseup', this.handleHandlerMouseUp);
-        window.onload = this.handleWindowLoad;
+        window.addEventListener('load', this.handleWindowLoad);
+
+        this.collectInfo();
+        this.updateTrackVisibilities();
+        this.handlerContainerScroll();
+        if (this.props.start.includes('bottom')) {
+            this.el.scrollTop = this.el.scrollHeight;
+        }
+        if (this.props.start.includes('right')) {
+            this.el.scrollLeft = this.el.scrollWidth;
+        }
     },
     componentWillUnmount: function componentWillUnmount() {
         document.removeEventListener('mousemove', this.handleHandlerMouseMove);
@@ -136,7 +146,6 @@ module.exports = React.createClass({
         this.collectInfo();
         this.updateTrackVisibilities();
         this.handlerContainerScroll();
-
         if (this.props.start.includes('bottom')) {
             this.el.scrollTop = this.el.scrollHeight;
         }
@@ -216,7 +225,6 @@ module.exports = React.createClass({
         var scrollHeight = el.scrollHeight,
             scrollWidth = el.scrollWidth;
         if (scrollHeight === this.lastScrollHeight && scrollWidth === this.lastScrollWidth) return;
-        console.log(scrollHeight, this.offsetHeight);
         this.setState({
             showVeriticalTrack: scrollHeight > this.offsetHeight,
             showHorizontalTrack: scrollWidth > this.offsetWidth

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-free-scrollbar",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "A react module for creating customizable scroll area",
   "main": "dist/index.js",
   "scripts": {

diff --git a/site/index.js b/site/index.js
@@ -63,7 +63,7 @@
 /******/ 	}
 
 /******/ 	var hotApplyOnUpdate = true;
-/******/ 	var hotCurrentHash = "19aa799e26772e227bea"; // eslint-disable-line no-unused-vars
+/******/ 	var hotCurrentHash = "09de511f647a59c9729a"; // eslint-disable-line no-unused-vars
 /******/ 	var hotCurrentModuleData = {};
 /******/ 	var hotCurrentParents = []; // eslint-disable-line no-unused-vars
 
@@ -22760,7 +22760,17 @@
 	    componentDidMount: function componentDidMount() {
 	        document.addEventListener('mousemove', this.handleHandlerMouseMove);
 	        document.addEventListener('mouseup', this.handleHandlerMouseUp);
-	        window.onload = this.handleWindowLoad;
+	        window.addEventListener('load', this.handleWindowLoad);
+
+	        this.collectInfo();
+	        this.updateTrackVisibilities();
+	        this.handlerContainerScroll();
+	        if (this.props.start.includes('bottom')) {
+	            this.el.scrollTop = this.el.scrollHeight;
+	        }
+	        if (this.props.start.includes('right')) {
+	            this.el.scrollLeft = this.el.scrollWidth;
+	        }
 	    },
 	    componentWillUnmount: function componentWillUnmount() {
 	        document.removeEventListener('mousemove', this.handleHandlerMouseMove);
@@ -22774,7 +22784,6 @@
 	        this.collectInfo();
 	        this.updateTrackVisibilities();
 	        this.handlerContainerScroll();
-
 	        if (this.props.start.includes('bottom')) {
 	            this.el.scrollTop = this.el.scrollHeight;
 	        }
@@ -22854,7 +22863,6 @@
 	        var scrollHeight = el.scrollHeight,
 	            scrollWidth = el.scrollWidth;
 	        if (scrollHeight === this.lastScrollHeight && scrollWidth === this.lastScrollWidth) return;
-	        console.log(scrollHeight, this.offsetHeight);
 	        this.setState({
 	            showVeriticalTrack: scrollHeight > this.offsetHeight,
 	            showHorizontalTrack: scrollWidth > this.offsetWidth

diff --git a/src/index.jsx b/src/index.jsx
@@ -118,7 +118,17 @@ module.exports = React.createClass({
     componentDidMount() {
         document.addEventListener('mousemove', this.handleHandlerMouseMove);
         document.addEventListener('mouseup', this.handleHandlerMouseUp);
-        window.onload = this.handleWindowLoad;
+        window.addEventListener('load', this.handleWindowLoad);
+
+        this.collectInfo();
+        this.updateTrackVisibilities();  
+        this.handlerContainerScroll(); 
+        if (this.props.start.includes('bottom')) {
+            this.el.scrollTop = this.el.scrollHeight; 
+        }
+        if (this.props.start.includes('right')) {
+            this.el.scrollLeft = this.el.scrollWidth; 
+        }
     },
 
     componentWillUnmount() {
@@ -135,7 +145,6 @@ module.exports = React.createClass({
         this.collectInfo();
         this.updateTrackVisibilities();  
         this.handlerContainerScroll();  
-
         if (this.props.start.includes('bottom')) {
             this.el.scrollTop = this.el.scrollHeight; 
         }
@@ -216,7 +225,6 @@ module.exports = React.createClass({
         var el = this.el;
         var scrollHeight = el.scrollHeight, scrollWidth = el.scrollWidth;
         if (scrollHeight === this.lastScrollHeight && scrollWidth === this.lastScrollWidth) return;
-        console.log(scrollHeight, this.offsetHeight);
         this.setState({
             showVeriticalTrack: scrollHeight > this.offsetHeight,
             showHorizontalTrack: scrollWidth > this.offsetWidth