зеркало из https://github.com/mozilla/pjs.git
Bug 386470 - <marquee contentEditable> should stop, r=peterv, sr=bzbarsky
This commit is contained in:
Родитель
e3421eba8a
Коммит
09456c5cbd
|
@ -113,6 +113,15 @@ isindex:-moz-read-write[prompt]
|
|||
-moz-user-focus: none !important;
|
||||
}
|
||||
|
||||
/* emulation of non-standard HTML <marquee> tag */
|
||||
marquee:-moz-read-write {
|
||||
-moz-binding: url('chrome://xbl-marquee/content/xbl-marquee.xml#marquee-horizontal-editable');
|
||||
}
|
||||
|
||||
marquee[direction="up"]:-moz-read-write, marquee[direction="down"]:-moz-read-write {
|
||||
-moz-binding: url('chrome://xbl-marquee/content/xbl-marquee.xml#marquee-vertical-editable');
|
||||
}
|
||||
|
||||
:-moz-read-write > input[type="hidden"],
|
||||
input[contenteditable="true"][type="hidden"] {
|
||||
border: 1px solid black !important;
|
||||
|
|
|
@ -523,6 +523,9 @@
|
|||
<body>
|
||||
<![CDATA[
|
||||
this.stop();
|
||||
// hack needed to fix js error, see bug 386470
|
||||
if (!this.innerDiv)
|
||||
return;
|
||||
// store the original height before we add padding
|
||||
this.innerDiv.style.padding = 0;
|
||||
this.originalHeight = this.innerDiv.offsetHeight;
|
||||
|
@ -684,4 +687,35 @@
|
|||
|
||||
</binding>
|
||||
|
||||
<!-- use -moz-margin-end to force large intrinsic width -->
|
||||
<binding id="marquee-horizontal-editable"
|
||||
inheritstyle="false">
|
||||
|
||||
<!-- White-space isn't allowed because a marquee could be
|
||||
inside 'white-space: pre' -->
|
||||
<content>
|
||||
<html:div style="overflow: auto; width: 100%; -moz-margin-end: 100%"
|
||||
><html:div style="display: -moz-box;"
|
||||
><html:div
|
||||
><children
|
||||
/></html:div
|
||||
></html:div
|
||||
></html:div>
|
||||
</content>
|
||||
|
||||
</binding>
|
||||
|
||||
<!-- use -moz-margin-end to force large intrinsic width -->
|
||||
<binding id="marquee-vertical-editable"
|
||||
inheritstyle="false">
|
||||
|
||||
<!-- White-space isn't allowed because a marquee could be
|
||||
inside 'white-space: pre' -->
|
||||
<content>
|
||||
<html:div style="overflow: auto; height: inherit; width: 100%; -moz-margin-end: 100%"
|
||||
><children/></html:div>
|
||||
</content>
|
||||
|
||||
</binding>
|
||||
|
||||
</bindings>
|
||||
|
|
Загрузка…
Ссылка в новой задаче