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

[XForms] generate xforms-link-error for help, hint, alert and message elements. Bug 300255, r=smaug+allan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@192790 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
aaronr%us.ibm.com
2006-03-22 18:05:49 +00:00
parent 8d81bda849
commit 0d627e8dde
9 changed files with 495 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/extensions/xforms/nsXFormsLabelElement.cpp
View File

@@ -233,12 +233,11 @@ nsXFormsLabelElement::LoadExternalLabel(const nsAString& aSrc)
// URI doesn't exist; report error.
mChannel = nsnull;
// XXX Passing |mElement| as |aContext| param to ReportError leads
// to an infinite loop. Avoid for now.
const nsPromiseFlatString& flat = PromiseFlatString(aSrc);
const PRUnichar *strings[] = { flat.get() };
nsXFormsUtils::ReportError(NS_LITERAL_STRING("labelLink1Error"),
strings, 1, mElement, nsnull);
const PRUnichar *strings[] = { flat.get(),
NS_LITERAL_STRING("label").get() };
nsXFormsUtils::ReportError(NS_LITERAL_STRING("externalLink1Error"),
strings, 2, mElement, mElement);
nsCOMPtr<nsIModelElementPrivate> modelPriv =
nsXFormsUtils::GetModel(mElement);
@@ -247,8 +246,9 @@ nsXFormsLabelElement::LoadExternalLabel(const nsAString& aSrc)
}
}
} else {
nsXFormsUtils::ReportError(NS_LITERAL_STRING("labelLinkLoadOrigin"),
domDoc);
const PRUnichar *strings[] = { NS_LITERAL_STRING("label").get() };
nsXFormsUtils::ReportError(NS_LITERAL_STRING("externalLinkLoadOrigin"),
strings, 1, mElement, mElement);
}
}
}
@@ -378,13 +378,12 @@ nsXFormsLabelElement::OnStopRequest(nsIRequest *aRequest,
if (aStatusCode == NS_BINDING_ABORTED)
return NS_OK;
// XXX Passing |mElement| as |aContext| param to ReportError leads
// to an infinite loop. Avoid for now.
nsAutoString src;
mElement->GetAttribute(NS_LITERAL_STRING("src"), src);
const PRUnichar *strings[] = { src.get() };
nsXFormsUtils::ReportError(NS_LITERAL_STRING("labelLink2Error"),
strings, 1, mElement, nsnull);
const PRUnichar *strings[] = { NS_LITERAL_STRING("label").get(),
src.get() };
nsXFormsUtils::ReportError(NS_LITERAL_STRING("externalLink2Error"),
strings, 2, mElement, mElement);
nsCOMPtr<nsIModelElementPrivate> modelPriv =
nsXFormsUtils::GetModel(mElement);