Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 10:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[XForms] Output element isn't refreshed in some cases Bug 310276, r=allan+smaug

Browse Source
This commit is contained in:
aaronr%us.ibm.com 2006-03-23 22:52:03 +00:00
parent c5be355a08
commit e82cf28125
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/xforms/nsXFormsModelElement.cpp
View File

@ -869,7 +869,10 @@ nsXFormsModelElement::Refresh()
nsCOMPtr<nsIDOM3Node> curChanged;
for (PRInt32 j = 0; j < mChangedNodes.Count(); ++j) {
// Checking for rebind, too. If it ever becomes true due to some
// condition below, we can stop this testing since any control that
// needs to rebind will also refresh.
for (PRInt32 j = 0; j < mChangedNodes.Count() && !rebind; ++j) {
curChanged = do_QueryInterface(mChangedNodes[j]);
// Check whether the bound node is dirty. If so, we need to refresh the

32
extensions/xforms/nsXFormsOutputElement.cpp
View File

@ -61,6 +61,7 @@
#include "nsXFormsAtoms.h"
#include "nsXFormsUtils.h"
#include "nsIXFormsUIWidget.h"
#include "nsXFormsModelElement.h"
/**
@ -106,18 +107,31 @@ nsXFormsOutputElement::Bind()
if (!mHasBinding) {
rv = mElement->HasAttribute(NS_LITERAL_STRING("bind"), &mHasBinding);
NS_ENSURE_SUCCESS(rv, rv);
if (!mHasBinding) {
// If output only has a value attribute, it can't have a bound node.
// In an effort to streamline this a bit, we'll just get mModel here and
// add output to the deferred bind list if necessary. This should be all
// that we need from the services that ProcessNodeBinding provides.
// ProcessNodeBinding is called during ::Refresh (via GetValue) so we just
// need a few things set up before ::Refresh gets called (usually right
// after ::Bind)
nsCOMPtr<nsIDOMDocument> domDoc;
mElement->GetOwnerDocument(getter_AddRefs(domDoc));
if (!nsXFormsUtils::IsDocumentReadyForBind(domDoc)) {
nsXFormsModelElement::DeferElementBind(domDoc, this);
}
mModel = nsXFormsUtils::GetModel(mElement);
return NS_OK;
}
}
nsCOMPtr<nsIDOMXPathResult> result;
if (mHasBinding) {
rv = ProcessNodeBinding(NS_LITERAL_STRING("ref"),
nsIDOMXPathResult::FIRST_ORDERED_NODE_TYPE,
getter_AddRefs(result));
} else {
rv = ProcessNodeBinding(NS_LITERAL_STRING("value"),
nsIDOMXPathResult::STRING_TYPE,
getter_AddRefs(result));
}
rv = ProcessNodeBinding(NS_LITERAL_STRING("ref"),
nsIDOMXPathResult::FIRST_ORDERED_NODE_TYPE,
getter_AddRefs(result));
if (NS_FAILED(rv)) {
nsXFormsUtils::ReportError(NS_LITERAL_STRING("controlBindError"), mElement);