stonewareslord/treestyletab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't stop delayed smooth scroll by itself

Browse Source
This commit is contained in:
Piro / SHIMODA Hiroshi 2012-08-06 04:28:04 +09:00
parent be216aec1f
commit ceb4e7da77
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/browser.js
View File

@ -2671,7 +2671,7 @@ TreeStyleTabBrowser.prototype = {
this.lastScrollY = y.value; this.lastScrollY = y.value;
}, },
cancelPerformingAutoScroll : function TSTBrowser_cancelPerformingAutoScroll() cancelPerformingAutoScroll : function TSTBrowser_cancelPerformingAutoScroll(aOnlyCancel)
{ {
if (this.smoothScrollTask) { if (this.smoothScrollTask) {
this.animationManager.removeTask(this.smoothScrollTask); this.animationManager.removeTask(this.smoothScrollTask);
@ -2679,13 +2679,19 @@ TreeStyleTabBrowser.prototype = {
} }
this.clearLastScrollPosition(); this.clearLastScrollPosition();
if (this.deferredTasks['cancelPerformingAutoScroll']) if (this.deferredTasks['cancelPerformingAutoScroll']) {
this.deferredTasks['cancelPerformingAutoScroll'].cancel(); this.deferredTasks['cancelPerformingAutoScroll'].cancel();
delete this.deferredTasks['cancelPerformingAutoScroll'];
}
if (aOnlyCancel)
return;
var self = this; var self = this;
(this.deferredTasks['cancelPerformingAutoScroll'] = this.Deferred.wait(0.3).next(function() { (this.deferredTasks['cancelPerformingAutoScroll'] = this.Deferred.wait(0.3))
.next(function() {
delete self.deferredTasks['cancelPerformingAutoScroll']; delete self.deferredTasks['cancelPerformingAutoScroll'];
})).error(this.defaultDeferredErrorHandler); }).error(this.defaultDeferredErrorHandler);
}, },
shouldCancelEnsureElementIsVisible : function TSTBRowser_shouldCancelEnsureElementIsVisible() shouldCancelEnsureElementIsVisible : function TSTBRowser_shouldCancelEnsureElementIsVisible()
@ -5934,7 +5940,7 @@ TreeStyleTabBrowser.prototype = {
smoothScrollTo : function TSTBrowser_smoothScrollTo(aEndX, aEndY, aDuration) smoothScrollTo : function TSTBrowser_smoothScrollTo(aEndX, aEndY, aDuration)
{ {
this.cancelPerformingAutoScroll(); this.cancelPerformingAutoScroll(true);
var b = this.mTabBrowser; var b = this.mTabBrowser;
var scrollBoxObject = this.scrollBoxObject; var scrollBoxObject = this.scrollBoxObject;