зеркало из https://github.com/mozilla/pjs.git
Родитель
f9d6390067
Коммит
a5a22f8218
|
@ -417,9 +417,9 @@ nsHTMLButtonElement::HandleDOMEvent(nsIPresContext* aPresContext,
|
|||
NS_ENSURE_ARG_POINTER(aEventStatus);
|
||||
|
||||
// Do not process any DOM events if the element is disabled
|
||||
PRBool disabled;
|
||||
nsresult rv = GetDisabled(&disabled);
|
||||
if (NS_FAILED(rv) || disabled) {
|
||||
PRBool bDisabled;
|
||||
nsresult rv = GetDisabled(&bDisabled);
|
||||
if (NS_FAILED(rv) || bDisabled) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
|
@ -657,7 +657,7 @@ nsHTMLInputElement::HandleDOMEvent(nsIPresContext* aPresContext,
|
|||
case NS_FOCUS_CONTENT:
|
||||
{
|
||||
nsIFormControlFrame* formControlFrame = nsnull;
|
||||
nsresult rv = nsGenericHTMLElement::GetPrimaryFrame(this, formControlFrame);
|
||||
rv = nsGenericHTMLElement::GetPrimaryFrame(this, formControlFrame);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
mSkipFocusEvent = PR_TRUE;
|
||||
formControlFrame->SetFocus(PR_TRUE, PR_TRUE);
|
||||
|
|
|
@ -307,7 +307,7 @@ nsHTMLOptionElement::SetLabel(const nsString& aValue)
|
|||
nsresult result = mInner.SetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::label, aValue, PR_TRUE);
|
||||
if (NS_SUCCEEDED(result)) {
|
||||
nsIFormControlFrame* fcFrame = nsnull;
|
||||
nsresult result = GetPrimaryFrame(fcFrame);
|
||||
result = GetPrimaryFrame(fcFrame);
|
||||
if (NS_SUCCEEDED(result) && (nsnull != fcFrame)) {
|
||||
nsIComboboxControlFrame* selectFrame = nsnull;
|
||||
result = fcFrame->QueryInterface(nsIComboboxControlFrame::GetIID(),(void **) &selectFrame);
|
||||
|
|
|
@ -417,9 +417,9 @@ nsHTMLButtonElement::HandleDOMEvent(nsIPresContext* aPresContext,
|
|||
NS_ENSURE_ARG_POINTER(aEventStatus);
|
||||
|
||||
// Do not process any DOM events if the element is disabled
|
||||
PRBool disabled;
|
||||
nsresult rv = GetDisabled(&disabled);
|
||||
if (NS_FAILED(rv) || disabled) {
|
||||
PRBool bDisabled;
|
||||
nsresult rv = GetDisabled(&bDisabled);
|
||||
if (NS_FAILED(rv) || bDisabled) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
|
@ -657,7 +657,7 @@ nsHTMLInputElement::HandleDOMEvent(nsIPresContext* aPresContext,
|
|||
case NS_FOCUS_CONTENT:
|
||||
{
|
||||
nsIFormControlFrame* formControlFrame = nsnull;
|
||||
nsresult rv = nsGenericHTMLElement::GetPrimaryFrame(this, formControlFrame);
|
||||
rv = nsGenericHTMLElement::GetPrimaryFrame(this, formControlFrame);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
mSkipFocusEvent = PR_TRUE;
|
||||
formControlFrame->SetFocus(PR_TRUE, PR_TRUE);
|
||||
|
|
|
@ -307,7 +307,7 @@ nsHTMLOptionElement::SetLabel(const nsString& aValue)
|
|||
nsresult result = mInner.SetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::label, aValue, PR_TRUE);
|
||||
if (NS_SUCCEEDED(result)) {
|
||||
nsIFormControlFrame* fcFrame = nsnull;
|
||||
nsresult result = GetPrimaryFrame(fcFrame);
|
||||
result = GetPrimaryFrame(fcFrame);
|
||||
if (NS_SUCCEEDED(result) && (nsnull != fcFrame)) {
|
||||
nsIComboboxControlFrame* selectFrame = nsnull;
|
||||
result = fcFrame->QueryInterface(nsIComboboxControlFrame::GetIID(),(void **) &selectFrame);
|
||||
|
|
Загрузка…
Ссылка в новой задаче