зеркало из https://github.com/mozilla/gecko-dev.git
merge
This commit is contained in:
Коммит
9d94d6ecd4
|
@ -44,7 +44,6 @@
|
|||
<implementation>
|
||||
<destructor><![CDATA[
|
||||
this._stopSmoothScroll();
|
||||
this._scrollTarget = null;
|
||||
]]></destructor>
|
||||
|
||||
<field name="_scrollbox">
|
||||
|
@ -242,10 +241,8 @@
|
|||
}
|
||||
|
||||
self.scrollByPixels(distance);
|
||||
if (!scrollAmounts.length) {
|
||||
if (!scrollAmounts.length)
|
||||
self._stopSmoothScroll();
|
||||
self._scrollTarget = null;
|
||||
}
|
||||
}
|
||||
|
||||
// amountToScroll: total distance to scroll
|
||||
|
@ -392,11 +389,8 @@
|
|||
|
||||
<method name="_stopSmoothScroll">
|
||||
<body><![CDATA[
|
||||
if (this._smoothScrollTimer) {
|
||||
clearInterval(this._smoothScrollTimer);
|
||||
this._smoothScrollTimer = 0;
|
||||
}
|
||||
if (this._isScrolling) {
|
||||
clearInterval(this._smoothScrollTimer);
|
||||
this._isScrolling = 0;
|
||||
this._scrollTarget = null;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче