Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 156979

Browse Source 
supporting marquee tag.
few new files are added and makefile.xxx are modified.
/r=timeless, dveditz /sr=jst, /a=jaime


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_0_BRANCH@125676 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
yokoyama%netscape.com
2002-07-24 04:48:34 +00:00
parent 74cab2329e
commit 95d0d37196
17 changed files with 538 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/build/mac/build_scripts/MozillaBuildList.pm
View File

@@ -583,6 +583,7 @@ sub ProcessJarManifests()
CreateJarFromManifest(":mozilla:intl:uconv:src:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:htmlparser:src:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:layout:html:forms:resources:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:layout:html:document:src:xbl-marquee:resources:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:layout:html:forms:src:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:layout:html:base:src:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:mailnews:jar.mn", $chrome_dir, \%jars);

5
mozilla/embedding/config/embed-jar.mn
View File

@@ -45,3 +45,8 @@ locale/XXXX/pippki, XXXX/locale/XXXX/pippki
# Wallet stuff
locale/XXXX/communicator/wallet, XXXX/locale/XXXX/communicator/wallet
# Marquee stuff
content/xbl-marquee, comm/content/xbl-marquee

2
mozilla/embedding/config/makefile.win
View File

@@ -45,6 +45,8 @@ embed_chrome: embed-jar.mn
unzip -d $(DIST)\Embed\tmpchrome\en-unix $(DIST)\bin\chrome\en-unix.jar
nsinstall -D $(DIST)\Embed\tmpchrome\en-win
unzip -d $(DIST)\Embed\tmpchrome\en-win $(DIST)\bin\chrome\en-win.jar
nsinstall -D $(DIST)\Embed\tmpchrome\comm
unzip -d $(DIST)\Embed\tmpchrome\comm $(DIST)\bin\chrome\comm.jar
!if !defined(DISABLE_MAILNEWS)
nsinstall -D $(DIST)\Embed\tmpchrome\messenger
unzip -d $(DIST)\Embed\tmpchrome\messenger $(DIST)\bin\chrome\messenger.jar

2
mozilla/layout/html/document/src/Makefile.in
View File

@@ -26,6 +26,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = xbl-marquee
MODULE = layout
LIBRARY_NAME = gkhtmldoc_s
REQUIRES = xpcom \

12
mozilla/layout/html/document/src/html.css
View File

@@ -557,3 +557,15 @@ noembed, noscript, param {
}
}
/* emulation of non-standard HTML <marquee> tag */
marquee {
-moz-binding: url('chrome://xbl-marquee/content/xbl-marquee.xml#marquee-horizontal');
}
marquee[direction="up"], marquee[direction="down"] {
-moz-binding: url('chrome://xbl-marquee/content/xbl-marquee.xml#marquee-vertical');
}
@media print {
marquee { -moz-binding: none; }
}

2
mozilla/layout/html/document/src/makefile.win
View File

@@ -21,6 +21,8 @@
DEPTH=..\..\..\..
DIRS = xbl-marquee
LIBRARY_NAME=layouthtmldoc_s
MODULE=layout
REQUIRES = xpcom \

48
mozilla/layout/html/document/src/xbl-marquee/Makefile.in Normal file
View File

@@ -0,0 +1,48 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is Netscape's XBL Marquee Emulation code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 2002
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = resources
include $(topsrcdir)/config/rules.mk

42
mozilla/layout/html/document/src/xbl-marquee/makefile.win Normal file
View File

@@ -0,0 +1,42 @@
#!nmake
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is Netscape's XBL Marquee Emulation code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 2002
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH=..\..\..\..\..
DIRS = resources
include <$(DEPTH)/config/rules.mak>

46
mozilla/layout/html/document/src/xbl-marquee/resources/Makefile.in Normal file
View File

@@ -0,0 +1,46 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is Netscape's XBL Marquee Emulation code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 2002
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk

15
mozilla/layout/html/document/src/xbl-marquee/resources/content/contents.rdf Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<RDF:Seq about="urn:mozilla:package:root">
<RDF:li resource="urn:mozilla:package:xbl-marquee"/>
</RDF:Seq>
<RDF:Description about="urn:mozilla:package:xbl-marquee"
chrome:displayName="XBL Marquee Emulation"
chrome:author="Netscape Communications Corporation"
chrome:name="xbl-marquee">
</RDF:Description>
</RDF:RDF>

311
mozilla/layout/html/document/src/xbl-marquee/resources/content/xbl-marquee.xml Normal file
View File

@@ -0,0 +1,311 @@
<?xml version="1.0"?>
<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Netscape's XBL Marquee Emulation code.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 2002
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Doron Rosenberg <doron@netscape.com>
- L. David Baron <dbaron@fas.harvard.edu>
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the LGPL or the GPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<bindings id="marqueeBindings"
xmlns="http://www.mozilla.org/xbl"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="marquee">
<implementation>
<property name="scrollAmount">
<getter>
if (this.hasAttribute("scrollamount"))
return this.getAttribute("scrollamount");
return 6; //default value is 6 pixels
</getter>
<setter>
this.setAttribute("scrollamount", val);
</setter>
</property>
<property name="scrollDelay">
<getter>
<![CDATA[
if (!this.hasAttribute("scrolldelay"))
return 85; //default value is 85 ms
var myScrollDelay = this.getAttribute('scrolldelay');
//marquee doesn't allow anything shorter than 40 ms
if (myScrollDelay < 40)
return 40;
return myScrollDelay;
]]>
</getter>
</property>
<property name="direction">
<getter>
if (this.hasAttribute("direction"))
return this.getAttribute("direction");
return "left"; //default value is "left"
</getter>
</property>
<property name="behavior">
<getter>
if (this.hasAttribute("behavior"))
return this.getAttribute("behavior");
return "scroll"; //default value is "scroll"
</getter>
</property>
<field name="dirsign">1</field>
<field name="startAt">0</field>
<field name="stopAt">0</field>
<field name="newPosition">0</field>
<field name="runId">0</field>
<field name="scrollStarted">0</field>
<property name="outerDiv"
onget="return document.getAnonymousNodes(this)[0]"
/>
<property name="height"
onget="return this.getAttribute('height');"
/>
<property name="width">
<getter>
<![CDATA[
if (this.hasAttribute("width"))
return this.getAttribute("width");
else if (this.parentNode.offsetWidth > 0)
return this.parentNode.offsetWidth;
else if (this.parentNode.parentNode.offsetWidth > 0)
return this.parentNode.parentNode.offsetWidth;
else
return 1;
]]>
</getter>
</property>
<!-- For sniffing purposes -->
<field name="nsMarqueeVersion">"0.9.6"</field>
<method name="start">
<body>
<![CDATA[
this.stop();
if (this.scrollStarted == 0)
{
this.scrollStarted = 1; //we only want this to run once
switch (this.direction)
{
case "up":
this.dirsign = 1;
this.startAt = 0;
this.stopAt = this.innerDiv.offsetHeight -
parseInt(this.outerDiv.style.height);
break;
case "down":
this.dirsign = -1;
this.startAt = this.innerDiv.offsetHeight -
parseInt(this.outerDiv.style.height);
this.stopAt = 0;
break;
case "left":
this.dirsign = 1;
this.startAt = this.innerDiv.offsetLeft - this.outerDiv.offsetWidth;
this.stopAt = this.outerDiv.offsetWidth + this.innerDiv.offsetWidth + this.startAt;
break;
case "right":
default:
this.dirsign = -1;
this.stopAt = this.innerDiv.offsetLeft - this.outerDiv.offsetWidth;
this.startAt = this.outerDiv.offsetWidth + this.innerDiv.offsetWidth + this.stopAt;
break;
}
this.newPosition = this.startAt;
} //end if
this.newPosition = parseInt(this.newPosition) + (this.dirsign * this.scrollAmount);
if ((this.dirsign == 1 && this.newPosition > this.stopAt) ||
(this.dirsign == -1 && this.newPosition < this.stopAt))
{
if (this.behavior == "alternate")
{
this.dirsign = -1 * this.dirsign;
var temp = this.stopAt;
this.stopAt = this.startAt;
this.startAt = temp;
}
else
{
this.newPosition = this.startAt;
}
}
switch(this.direction)
{
case "up":
case "down":
this.outerDiv.scrollTop = this.newPosition;
break;
case "left":
case "right":
default:
this.outerDiv.scrollLeft = this.newPosition;
break;
}
var myThis = this;
var myTimeOut = function myTimeOutFunction(){myThis.start();}
this.runId = window.setTimeout(myTimeOut, this.scrollDelay);
]]>
</body>
</method>
<method name="stop">
<body>
<![CDATA[
if (this.runId != 0)
clearTimeout(this.runId);
this.runId = 0;
]]>
</body>
</method>
<method name="init">
<body>
<![CDATA[
var height;
if ((this.direction == "up") || (this.direction == "down")) {
height = "200px";
this.outerDiv.style.height = height;
}
else {
this.innerDiv.style.whiteSpace = "nowrap";
}
if (this.hasAttribute('height')) {
height = this.getAttribute('height');
this.outerDiv.style.height = height;
}
this.outerDiv.style.width = this.width;
if ((this.direction == "up") || (this.direction == "down")) {
this.innerDiv.style.padding = height + " 0";
}
// Some sites access the element via the evil IE way of elementID.foo()
if (this.hasAttribute('id'))
window[this.getAttribute('id')] = this;
this.start();
]]>
</body>
</method>
<constructor>
<![CDATA[
var myThis = this;
var lambda = function myScopeFunction() { myThis.init(); }
//init needs to be run after the page has loaded in order to calculate the correct
//height/width
window.addEventListener("load", lambda, false);
]]>
</constructor>
</implementation>
</binding>
<binding id="marquee-horizontal"
extends="chrome://xbl-marquee/content/xbl-marquee.xml#marquee">
<implementation>
<property name="innerDiv"
onget="return document.getAnonymousNodes(this)[0].firstChild.firstChild"
/>
</implementation>
<content>
<html:div xbl:inherits="" style="overflow: -moz-scrollbars-none">
<xul:hbox style="margin: 0 100%;">
<html:div>
<children/>
</html:div>
</xul:hbox>
</html:div>
</content>
</binding>
<binding id="marquee-vertical"
extends="chrome://xbl-marquee/content/xbl-marquee.xml#marquee">
<implementation>
<property name="innerDiv"
onget="return document.getAnonymousNodes(this)[0].firstChild"
/>
</implementation>
<content>
<html:div xbl:inherits="" style="overflow: -moz-scrollbars-none">
<html:div>
<children/>
</html:div>
</html:div>
</content>
</binding>
</bindings>

3
mozilla/layout/html/document/src/xbl-marquee/resources/jar.mn Normal file
View File

@@ -0,0 +1,3 @@
comm.jar:
content/xbl-marquee/contents.rdf (content/contents.rdf)
content/xbl-marquee/xbl-marquee.xml (content/xbl-marquee.xml)

39
mozilla/layout/html/document/src/xbl-marquee/resources/makefile.win Normal file
View File

@@ -0,0 +1,39 @@
#!nmake
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is Netscape's XBL Marquee Emulation code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 2002
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH=..\..\..\..\..\..
include <$(DEPTH)/config/rules.mak>

7
mozilla/profile/defaults/chrome/userContent-example.css
View File

@@ -22,6 +22,13 @@
* table { border: 2px solid; }
*/
/*
* example: turn off "marquee" element
*
* marquee { -moz-binding: none; }
*
*/
/*
* For more examples see http://www.mozilla.org/unix/customizing.html
*/

1
mozilla/xpinstall/packager/mac/browser.jst
View File

@@ -70,6 +70,7 @@ if (verifyDiskSpace(fProgram, srDest))
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"help.jar"),"content/help/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"pippki.jar"), "content/pippki/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"pipnss.jar"), "content/pipnss/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/xbl-marquee/");
// make an alias to the browser on the desktop
var desktopFolder = getFolder("Mac Desktop");

1
mozilla/xpinstall/packager/unix/browser.jst
View File

@@ -73,6 +73,7 @@ if (verifyDiskSpace(communicatorFolder, srDest))
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/messenger/");
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/navigator/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"help.jar"),"content/help/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/xbl-marquee/");
if (err==SUCCESS)
{

1
mozilla/xpinstall/packager/windows/browser.jst
View File

@@ -487,6 +487,7 @@ if(verifyDiskSpace(fProgram, srDest))
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/messenger/");
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/navigator/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","help.jar"),"content/help/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/xbl-marquee/");
/* Log files that are created after the installer is done, so they can be uninstalled */
logComment("Installing: " + fProgram + "Xpcs Registry.dat");