diff --git a/cocos2d/core/components/CCScrollBar.js b/cocos2d/core/components/CCScrollBar.js index 4f5da41e32..ff46963aeb 100644 --- a/cocos2d/core/components/CCScrollBar.js +++ b/cocos2d/core/components/CCScrollBar.js @@ -333,7 +333,7 @@ var Scrollbar = cc.Class({ }, show: function() { - this._autoHideRemainingTime = 0; + this._autoHideRemainingTime = this.autoHideTime; this._setOpacity(this._opacity); }, diff --git a/cocos2d/core/components/CCScrollView.js b/cocos2d/core/components/CCScrollView.js index 4d1602b29d..e389942140 100644 --- a/cocos2d/core/components/CCScrollView.js +++ b/cocos2d/core/components/CCScrollView.js @@ -1328,11 +1328,25 @@ var ScrollView = cc.Class({ } }, - onDisable: function() { + _showScrollbar: function () { + if (this.horizontalScrollBar) { + this.horizontalScrollBar.show(); + } + + if (this.verticalScrollBar) { + this.verticalScrollBar.show(); + } + }, + + onDisable: function () { this._hideScrollbar(); this.stopAutoScroll(); }, + onEnable: function () { + this._showScrollbar(); + }, + update: function(dt) { if (this._autoScrolling) { this._processAutoScrolling(dt);