Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 160162: MARQUEE loop property not supported, patch by Martijn Wargers <martijn.martijn@gmail.com>, r=doron, sr=jst

Browse Source
This commit is contained in:
gavin%gavinsharp.com 2006-01-12 01:15:42 +00:00
parent d5a3092f79
commit 3a50594ddf
1 changed files with 73 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
layout/style/xbl-marquee/xbl-marquee.xml
View File

@ -55,9 +55,9 @@
<property name="scrollAmount">
<getter>
<![CDATA[
var val = this.getAttribute("scrollamount");
var val = parseInt(this.getAttribute("scrollamount"));
if (val <= 0 || isNaN(val) || val == null)
if (val <= 0 || isNaN(val))
return this._scrollAmount;
return val;
@ -72,9 +72,9 @@
<property name="scrollDelay">
<getter>
<![CDATA[
var val = this.getAttribute("scrolldelay");
var val = parseInt(this.getAttribute("scrolldelay"));
if (val <= 0 || isNaN(val) || val == null)
if (val <= 0 || isNaN(val))
return this._scrollDelay;
return val;
@ -126,6 +126,24 @@
<field name="_behavior">"scroll"</field>
<property name="loop">
<getter>
<![CDATA[
var val = parseInt(this.getAttribute('loop'));
if (val < -1 || isNaN(val))
return this._loop;
return val;
]]>
</getter>
<setter>
this.setAttribute("loop", val);
</setter>
</property>
<field name="_loop">-1</field>
<field name="dirsign">1</field>
<field name="startAt">0</field>
<field name="stopAt">0</field>
@ -222,6 +240,22 @@
</body>
</method>
<method name="_set_loop">
<parameter name="aValue"/>
<body>
<![CDATA[
if (!aValue || isNaN(aValue))
return false;
if (aValue < -1)
aValue = -1;
this._loop = aValue;
return true;
]]>
</body>
</method>
<method name="start">
<body>
<![CDATA[
@ -323,14 +357,33 @@
break;
case 'slide':
if (this.newPosition == this.stopAt)
return;
this.newPosition = this.stopAt;
if (this._loop > 1) {
this.newPosition = this.startAt;
}
else {
if ((this._direction == "up") || (this._direction == "down"))
this.outerDiv.scrollTop = this.stopAt;
else
this.outerDiv.scrollLeft = this.stopAt;
this.stop();
return;
}
break;
default:
this.newPosition = this.startAt;
}
if (this._loop > 1)
this._loop--;
else if (this._loop == 1) {
if ((this._direction == "up") || (this._direction == "down"))
this.outerDiv.scrollTop = this.stopAt;
else
this.outerDiv.scrollLeft = this.stopAt;
this.stop();
return;
}
}
if (!this.startNewDirection) {
@ -368,7 +421,8 @@
this._set_direction(this.getAttribute('direction'));
this._set_behavior(this.getAttribute('behavior'));
this._set_scrollDelay(this.getAttribute('scrolldelay'));
this._set_scrollAmount(this.getAttribute('scrollamount'))
this._set_scrollAmount(this.getAttribute('scrollamount'));
this._set_loop(this.getAttribute('loop'));
this.startNewDirection = true;
// init needs to be run after the page has loaded in order to calculate
@ -393,7 +447,17 @@
if (oldValue != newValue) {
switch (attrName) {
case "loop":
//XXX needs implementing
if (!this._set_loop(newValue)) {
if (attributeRemoval) {
this._loop = -1;
if (!this.runId)
this.start();
}
else
throw new Error("Invalid argument for Marquee::loop");
}
if (!this.rundId)
this.start();
break;
case "scrollamount":
if (!this._set_scrollAmount(newValue)) {