mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Changing XUL template syntax to use <textnode> for wrapped text creation rather 

than <text>, which is now a genuine XUL element.
This commit is contained in:
hyatt%netscape.com 2000-03-22 21:57:35 +00:00
Родитель 1d13ff8814
Коммит 11ec7eda8a
7 изменённых файлов: 23 добавлений и 25 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
chrome/src/nsChromeRegistry.cpp
Просмотреть файл

@ -491,7 +491,7 @@ NS_IMETHODIMP nsChromeRegistry::GetOverlayDataSource(nsIURI *aChromeURL, nsIRDFD
nsCAutoString overlayFile;
// Retrieve the mInner data source.
overlayFile = "resource:/chrome/";
overlayFile = mInstallRoot;
overlayFile += package;
overlayFile += "/";
overlayFile += provider;
@ -830,8 +830,7 @@ NS_IMETHODIMP nsChromeRegistry::ReallyRemoveOverlayFromDataSource(const PRUnicha
return NS_OK;
nsCOMPtr<nsIRDFResource> resource;
rv = GetResource(aDocURI,
getter_AddRefs(resource));
rv = GetResource(aDocURI, getter_AddRefs(resource));
if (NS_FAILED(rv))
return NS_OK;

4
content/xul/content/src/nsXULElement.cpp
Просмотреть файл

@ -3130,8 +3130,8 @@ nsXULElement::HandleDOMEvent(nsIPresContext* aPresContext,
aEvent->message == NS_MENU_DESTROY || aEvent->message == NS_FORM_SELECTED ||
aEvent->message == NS_XUL_BROADCAST || aEvent->message == NS_XUL_COMMAND_UPDATE ||
aEvent->message == NS_DRAGDROP_GESTURE ||
tagName == "menu" || tagName == "menuitem" ||
tagName == "menubar" || tagName == "key" || tagName == "keyset") {
tagName == "menu" || tagName == "menuitem" || tagName == "menulist" ||
tagName == "menubar" || tagName == "menupopup" || tagName == "key" || tagName == "keyset") {
nsCOMPtr<nsIEventListenerManager> listenerManager;
if (NS_FAILED(ret = GetListenerManager(getter_AddRefs(listenerManager)))) {
NS_ERROR("Unable to instantiate a listener manager on this event.");

10
content/xul/templates/src/nsXULTemplateBuilder.cpp
Просмотреть файл

@ -347,7 +347,7 @@ protected:
static nsIAtom* kResourceAtom;
static nsIAtom* kRuleAtom;
static nsIAtom* kTemplateAtom;
static nsIAtom* kTextAtom;
static nsIAtom* kTextNodeAtom;
static nsIAtom* kTreeAtom;
static nsIAtom* kTreeChildrenAtom;
static nsIAtom* kTreeItemAtom;
@ -394,7 +394,7 @@ nsIAtom* RDFGenericBuilderImpl::kPropertyAtom;
nsIAtom* RDFGenericBuilderImpl::kResourceAtom;
nsIAtom* RDFGenericBuilderImpl::kRuleAtom;
nsIAtom* RDFGenericBuilderImpl::kTemplateAtom;
nsIAtom* RDFGenericBuilderImpl::kTextAtom;
nsIAtom* RDFGenericBuilderImpl::kTextNodeAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeChildrenAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeItemAtom;
@ -484,7 +484,7 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
NS_IF_RELEASE(kResourceAtom);
NS_IF_RELEASE(kRuleAtom);
NS_IF_RELEASE(kTemplateAtom);
NS_IF_RELEASE(kTextAtom);
NS_IF_RELEASE(kTextNodeAtom);
NS_IF_RELEASE(kTreeAtom);
NS_IF_RELEASE(kTreeChildrenAtom);
NS_IF_RELEASE(kTreeItemAtom);
@ -547,7 +547,7 @@ RDFGenericBuilderImpl::Init()
kResourceAtom = NS_NewAtom("resource");
kRuleAtom = NS_NewAtom("rule");
kTemplateAtom = NS_NewAtom("template");
kTextAtom = NS_NewAtom("text");
kTextNodeAtom = NS_NewAtom("textnode");
kTreeAtom = NS_NewAtom("tree");
kTreeChildrenAtom = NS_NewAtom("treechildren");
kTreeItemAtom = NS_NewAtom("treeitem");
@ -1976,7 +1976,7 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
if (NS_FAILED(rv)) return rv;
}
}
else if ((tag.get() == kTextAtom) && (nameSpaceID == kNameSpaceID_XUL)) {
else if ((tag.get() == kTextNodeAtom) && (nameSpaceID == kNameSpaceID_XUL)) {
// <xul:text value="..."> is replaced by text of the
// actual value of the 'rdf:resource' attribute for the
// given node.

5
rdf/chrome/src/nsChromeRegistry.cpp
Просмотреть файл

@ -491,7 +491,7 @@ NS_IMETHODIMP nsChromeRegistry::GetOverlayDataSource(nsIURI *aChromeURL, nsIRDFD
nsCAutoString overlayFile;
// Retrieve the mInner data source.
overlayFile = "resource:/chrome/";
overlayFile = mInstallRoot;
overlayFile += package;
overlayFile += "/";
overlayFile += provider;
@ -830,8 +830,7 @@ NS_IMETHODIMP nsChromeRegistry::ReallyRemoveOverlayFromDataSource(const PRUnicha
return NS_OK;
nsCOMPtr<nsIRDFResource> resource;
rv = GetResource(aDocURI,
getter_AddRefs(resource));
rv = GetResource(aDocURI, getter_AddRefs(resource));
if (NS_FAILED(rv))
return NS_OK;

10
rdf/content/src/nsRDFGenericBuilder.cpp
Просмотреть файл

@ -347,7 +347,7 @@ protected:
static nsIAtom* kResourceAtom;
static nsIAtom* kRuleAtom;
static nsIAtom* kTemplateAtom;
static nsIAtom* kTextAtom;
static nsIAtom* kTextNodeAtom;
static nsIAtom* kTreeAtom;
static nsIAtom* kTreeChildrenAtom;
static nsIAtom* kTreeItemAtom;
@ -394,7 +394,7 @@ nsIAtom* RDFGenericBuilderImpl::kPropertyAtom;
nsIAtom* RDFGenericBuilderImpl::kResourceAtom;
nsIAtom* RDFGenericBuilderImpl::kRuleAtom;
nsIAtom* RDFGenericBuilderImpl::kTemplateAtom;
nsIAtom* RDFGenericBuilderImpl::kTextAtom;
nsIAtom* RDFGenericBuilderImpl::kTextNodeAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeChildrenAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeItemAtom;
@ -484,7 +484,7 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
NS_IF_RELEASE(kResourceAtom);
NS_IF_RELEASE(kRuleAtom);
NS_IF_RELEASE(kTemplateAtom);
NS_IF_RELEASE(kTextAtom);
NS_IF_RELEASE(kTextNodeAtom);
NS_IF_RELEASE(kTreeAtom);
NS_IF_RELEASE(kTreeChildrenAtom);
NS_IF_RELEASE(kTreeItemAtom);
@ -547,7 +547,7 @@ RDFGenericBuilderImpl::Init()
kResourceAtom = NS_NewAtom("resource");
kRuleAtom = NS_NewAtom("rule");
kTemplateAtom = NS_NewAtom("template");
kTextAtom = NS_NewAtom("text");
kTextNodeAtom = NS_NewAtom("textnode");
kTreeAtom = NS_NewAtom("tree");
kTreeChildrenAtom = NS_NewAtom("treechildren");
kTreeItemAtom = NS_NewAtom("treeitem");
@ -1976,7 +1976,7 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
if (NS_FAILED(rv)) return rv;
}
}
else if ((tag.get() == kTextAtom) && (nameSpaceID == kNameSpaceID_XUL)) {
else if ((tag.get() == kTextNodeAtom) && (nameSpaceID == kNameSpaceID_XUL)) {
// <xul:text value="..."> is replaced by text of the
// actual value of the 'rdf:resource' attribute for the
// given node.

4
rdf/content/src/nsXULElement.cpp
Просмотреть файл

@ -3130,8 +3130,8 @@ nsXULElement::HandleDOMEvent(nsIPresContext* aPresContext,
aEvent->message == NS_MENU_DESTROY || aEvent->message == NS_FORM_SELECTED ||
aEvent->message == NS_XUL_BROADCAST || aEvent->message == NS_XUL_COMMAND_UPDATE ||
aEvent->message == NS_DRAGDROP_GESTURE ||
tagName == "menu" || tagName == "menuitem" ||
tagName == "menubar" || tagName == "key" || tagName == "keyset") {
tagName == "menu" || tagName == "menuitem" || tagName == "menulist" ||
tagName == "menubar" || tagName == "menupopup" || tagName == "key" || tagName == "keyset") {
nsCOMPtr<nsIEventListenerManager> listenerManager;
if (NS_FAILED(ret = GetListenerManager(getter_AddRefs(listenerManager)))) {
NS_ERROR("Unable to instantiate a listener manager on this event.");

10
rdf/content/src/nsXULTemplateBuilder.cpp
Просмотреть файл

@ -347,7 +347,7 @@ protected:
static nsIAtom* kResourceAtom;
static nsIAtom* kRuleAtom;
static nsIAtom* kTemplateAtom;
static nsIAtom* kTextAtom;
static nsIAtom* kTextNodeAtom;
static nsIAtom* kTreeAtom;
static nsIAtom* kTreeChildrenAtom;
static nsIAtom* kTreeItemAtom;
@ -394,7 +394,7 @@ nsIAtom* RDFGenericBuilderImpl::kPropertyAtom;
nsIAtom* RDFGenericBuilderImpl::kResourceAtom;
nsIAtom* RDFGenericBuilderImpl::kRuleAtom;
nsIAtom* RDFGenericBuilderImpl::kTemplateAtom;
nsIAtom* RDFGenericBuilderImpl::kTextAtom;
nsIAtom* RDFGenericBuilderImpl::kTextNodeAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeChildrenAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeItemAtom;
@ -484,7 +484,7 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
NS_IF_RELEASE(kResourceAtom);
NS_IF_RELEASE(kRuleAtom);
NS_IF_RELEASE(kTemplateAtom);
NS_IF_RELEASE(kTextAtom);
NS_IF_RELEASE(kTextNodeAtom);
NS_IF_RELEASE(kTreeAtom);
NS_IF_RELEASE(kTreeChildrenAtom);
NS_IF_RELEASE(kTreeItemAtom);
@ -547,7 +547,7 @@ RDFGenericBuilderImpl::Init()
kResourceAtom = NS_NewAtom("resource");
kRuleAtom = NS_NewAtom("rule");
kTemplateAtom = NS_NewAtom("template");
kTextAtom = NS_NewAtom("text");
kTextNodeAtom = NS_NewAtom("textnode");
kTreeAtom = NS_NewAtom("tree");
kTreeChildrenAtom = NS_NewAtom("treechildren");
kTreeItemAtom = NS_NewAtom("treeitem");
@ -1976,7 +1976,7 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
if (NS_FAILED(rv)) return rv;
}
}
else if ((tag.get() == kTextAtom) && (nameSpaceID == kNameSpaceID_XUL)) {
else if ((tag.get() == kTextNodeAtom) && (nameSpaceID == kNameSpaceID_XUL)) {
// <xul:text value="..."> is replaced by text of the
// actual value of the 'rdf:resource' attribute for the
// given node.