wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Dão Gottwald 2009-04-23 11:47:40 +02:00
commit 42e3ba910b
10 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/browser.css
View File

@ -38,7 +38,7 @@ toolbar[printpreview="true"] {
#urlbar[pageproxystate="invalid"] > #urlbar-icons > :not(#go-button) ,
#urlbar[pageproxystate="valid"] > #urlbar-icons > #go-button ,
#urlbar[isempty="true"] > #urlbar-icons > #go-button {
#urlbar[empty="true"] > #urlbar-icons > #go-button {
visibility: collapse;
}

2
browser/themes/pinstripe/browser/browser.css
View File

@ -1352,7 +1352,7 @@ richlistitem[selected="true"][current="true"] > hbox > .ac-result-type-bookmark,
color: inherit;
}
#editBMPanel_tagsField[isempty="true"] {
#editBMPanel_tagsField[empty="true"] {
color: #bbb !important;
}

4
browser/themes/pinstripe/browser/searchbar.css
View File

@ -138,6 +138,10 @@
background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite-rtl.png");
}
#searchbar[empty="true"] .search-go-button {
visibility: hidden;
}
.search-go-button {
padding: 1px;
list-style-image: url("chrome://browser/skin/Search.png");

4
toolkit/content/tests/widgets/test_textbox_emptytext.xul
View File

@ -29,7 +29,7 @@ function doTests() {
var t1 = $("t1");
t1.emptyText = 1;
ok(t1.hasAttribute("isempty"), "emptyText but no value => 'isempty' attribute is present");
ok(t1.hasAttribute("empty"), "emptyText but no value => 'empty' attribute is present");
ok("1" === t1.label, "emptyText exposed as label");
ok("" === t1.value, "emptyText not exposed as value");
@ -38,7 +38,7 @@ function doTests() {
ok("1" === t1.emptyText, "emptyText persists after setting label");
t1.value = 3;
ok(!t1.hasAttribute("isempty"), "value present => 'isempty' attribute not present");
ok(!t1.hasAttribute("empty"), "value present => 'empty' attribute not present");
ok("3" === t1.value, "value setter/getter works while emptyText is present");
ok("1" === t1.emptyText, "emptyText persists after setting value");

12
toolkit/content/textbox.css
View File

@ -12,20 +12,20 @@ html|*.textbox-textarea {
text-shadow: inherit;
}
textbox[isempty="true"] html|*.textbox-input ,
textbox[isempty="true"] html|*.textbox-textarea {
textbox[empty="true"] html|*.textbox-input ,
textbox[empty="true"] html|*.textbox-textarea {
text-align: left;
direction: ltr;
}
textbox[isempty="true"][chromedir="rtl"] html|*.textbox-input ,
textbox[isempty="true"][chromedir="rtl"] html|*.textbox-textarea {
textbox[empty="true"][chromedir="rtl"] html|*.textbox-input ,
textbox[empty="true"][chromedir="rtl"] html|*.textbox-textarea {
text-align: right;
direction: rtl;
}
textbox[isempty="true"] html|*.textbox-input[emptytextdelay="true"] ,
textbox[isempty="true"] html|*.textbox-textarea[emptytextdelay="true"] {
textbox[empty="true"] html|*.textbox-input[emptytextdelay="true"] ,
textbox[empty="true"] html|*.textbox-textarea[emptytextdelay="true"] {
color: transparent !important;
}

16
toolkit/content/widgets/textbox.xml
View File

@ -55,7 +55,7 @@
</property>
<property name="value"
onget="return this.hasAttribute('isempty') ? '' : this.inputField.value;">
onget="return this.hasAttribute('empty') ? '' : this.inputField.value;">
<setter><![CDATA[
if (val) {
// clear the emptyText _before_ setting a new non-empty value
@ -129,7 +129,7 @@
<property name="controllers" readonly="true" onget="return this.inputField.controllers"/>
<property name="textLength" readonly="true"
onget="return this.hasAttribute('isempty') ?
onget="return this.hasAttribute('empty') ?
0 : this.inputField.textLength;"/>
<property name="selectionStart" onset="this.inputField.selectionStart = val; return val;"
onget="return this.inputField.selectionStart;"/>
@ -168,8 +168,8 @@
!this.value &&
this.emptyText) {
if (!this.hasAttribute("isempty")) {
this.setAttribute("isempty", "true");
if (!this.hasAttribute("empty")) {
this.setAttribute("empty", "true");
// Hide the emptytext for a bit, in case the textbox will be focused subsequently
this.inputField.setAttribute("emptytextdelay", "true");
@ -189,7 +189,7 @@
<method name="_clearEmptyText">
<body><![CDATA[
if (this.hasAttribute("isempty")) {
if (this.hasAttribute("empty")) {
this.inputField.value = "";
try {
var transactionManager = this.editor.transactionManager;
@ -200,7 +200,7 @@
transactionManager.numberOfRedoItems == 0)
transactionManager.clear();
} catch (e) {}
this.removeAttribute("isempty");
this.removeAttribute("empty");
}
]]></body>
</method>
@ -323,7 +323,7 @@
onset="this.setAttribute('timeout', val); return val;"
onget="return parseInt(this.getAttribute('timeout')) || 0;"/>
<property name="value"
onget="return this.hasAttribute('isempty') ? '' : this.inputField.value;">
onget="return this.hasAttribute('empty') ? '' : this.inputField.value;">
<setter><![CDATA[
if (val) {
// clear the emptyText _before_ setting a new non-empty value
@ -408,7 +408,7 @@
]]></setter>
</property>
<property name="value"
onget="return this.hasAttribute('isempty') ? '' : this.inputField.value;">
onget="return this.hasAttribute('empty') ? '' : this.inputField.value;">
<setter><![CDATA[
if (val) {
// clear the emptyText _before_ setting a new non-empty value

2
toolkit/themes/gnomestripe/global/textbox.css
View File

@ -60,7 +60,7 @@ textbox {
color: -moz-FieldText;
}
textbox[isempty="true"] {
textbox[empty="true"] {
color: GrayText;
}

2
toolkit/themes/pinstripe/global/textbox.css
View File

@ -64,7 +64,7 @@ textbox {
color: -moz-FieldText;
}
textbox[isempty="true"] {
textbox[empty="true"] {
color: GrayText;
}

2
toolkit/themes/winstripe/global/textbox-aero.css
View File

@ -1,5 +1,5 @@
%include textbox.css
textbox[isempty="true"]:-moz-system-metric(windows-default-theme) {
textbox[empty="true"]:-moz-system-metric(windows-default-theme) {
font-style: italic;
}

2
toolkit/themes/winstripe/global/textbox.css
View File

@ -60,7 +60,7 @@ textbox {
color: -moz-FieldText;
}
textbox[isempty="true"] {
textbox[empty="true"] {
color: GrayText;
}