r1664 - in branches/bxe_2_0: js relaxng
[email protected] Thu, 3 May 2007 16:22:55 +0200 (CEST)
| Newsgroups | gmane.editors.bitflux.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: chregu
Date: Thu May 3 16:22:55 2007
New Revision: 1664
Log:
replace some xmlnode.nodeType with xmlnode._node.nodeType
Modified:
branches/bxe_2_0/js/bxeFunctions.js
branches/bxe_2_0/js/bxeNodeElements.js
branches/bxe_2_0/js/bxeXMLNode.js
branches/bxe_2_0/js/widget.js
branches/bxe_2_0/relaxng/ElementVAL.js
branches/bxe_2_0/relaxng/ElementVDOM.js
branches/bxe_2_0/relaxng/NodeVAL.js
branches/bxe_2_0/relaxng/RelaxNG.js
Modified: branches/bxe_2_0/js/bxeFunctions.js
==============================================================================
--- branches/bxe_2_0/js/bxeFunctions.js (original)
+++ branches/bxe_2_0/js/bxeFunctions.js Thu May 3 16:22:55 2007
@@ -655,7 +655,7 @@
if (node.xmlBridge) {
return
}
- if (node.nodeType == Node.ATTRIBUTE_NODE) {
+ if (node._node.nodeType == Node.ATTRIBUTE_NODE) {
node = node.parentNode;
}
@@ -1339,7 +1339,7 @@
return true;
}
- if (node.XMLNode.nodeType != Node.ATTRIBUTE_NODE && node.XMLNode.vdom.bxeNoteditable) {
+ if (node.XMLNode._node.nodeType != Node.ATTRIBUTE_NODE && node.XMLNode.vdom.bxeNoteditable) {
return false;
}
Modified: branches/bxe_2_0/js/bxeNodeElements.js
==============================================================================
--- branches/bxe_2_0/js/bxeNodeElements.js (original)
+++ branches/bxe_2_0/js/bxeNodeElements.js Thu May 3 16:22:55 2007
@@ -316,7 +316,7 @@
if (node.nodeType == 1) {
var nodeX = node.XMLNode;
if (nodeX) {
- if (nodeX.nodeType == Node.ATTRIBUTE_NODE) {
+ if (nodeX._node.nodeType == Node.ATTRIBUTE_NODE) {
return node;
}
Modified: branches/bxe_2_0/js/bxeXMLNode.js
==============================================================================
--- branches/bxe_2_0/js/bxeXMLNode.js (original)
+++ branches/bxe_2_0/js/bxeXMLNode.js Thu May 3 16:22:55 2007
@@ -114,7 +114,7 @@
"isWhitespaceOnly",
function()
{
- if (this.nodeType == 3) {
+ if (this._node.nodeType == 3) {
if(/\S+/.test(this._node.nodeValue)) // any non white space visible characters
return false;
Modified: branches/bxe_2_0/js/widget.js
==============================================================================
--- branches/bxe_2_0/js/widget.js (original)
+++ branches/bxe_2_0/js/widget.js Thu May 3 16:22:55 2007
@@ -686,7 +686,7 @@
}
node = node.XMLNode;
- if (node && node.nodeType == Node.ATTRIBUTE_NODE) {
+ if (node && node._node && node._node.nodeType == Node.ATTRIBUTE_NODE) {
node = node.parentNode;
}
this.node.removeAllChildren();
@@ -695,7 +695,7 @@
/*dump (node._node.getAttribute("__bxe_id") + "\n");
dump (node + "\n");
*/
- while(node && node.nodeType == 1) {
+ while(node && node._node && node._node.nodeType == 1) {
var rootNode = document.createElement("span");
try {
@@ -794,7 +794,7 @@
this.Popup.removeAllMenuItems();
- if (node.XMLNode.nodeType == Node.ATTRIBUTE_NODE) {
+ if (node.XMLNode._node.nodeType == Node.ATTRIBUTE_NODE) {
var nodeX = node.XMLNode.parentNode;
} else {
var nodeX = node.XMLNode;
@@ -839,7 +839,7 @@
node = nodeX;
//parent nodes
- while(node && node.nodeType == 1) {
+ while(node && node._node && node._node.nodeType == 1) {
//if (node.isInHTMLDocument && node.isInHTMLDocument() && node._node != cssr.top) {
if (node.vdom.bxeHelptext) {
Modified: branches/bxe_2_0/relaxng/ElementVAL.js
==============================================================================
--- branches/bxe_2_0/relaxng/ElementVAL.js (original)
+++ branches/bxe_2_0/relaxng/ElementVAL.js Thu May 3 16:22:55 2007
@@ -69,14 +69,15 @@
do {
- if (ctxt.node.nodeType == "3" && ctxt.node.isWhitespaceOnly) {
+ var nodeType = ctxt.node._node.nodeType;
+ if (nodeType == "3" && ctxt.node.isWhitespaceOnly) {
continue;
}
- if (ctxt.node.nodeType == Node.COMMENT_NODE) {
+ if (nodeType == Node.COMMENT_NODE) {
continue;
}
//FIXME: check CDATA_SECTIONS AS WELL
- if (ctxt.node.nodeType == Node.CDATA_SECTION_NODE) {
+ if (nodeType == Node.CDATA_SECTION_NODE) {
continue;
}
var _vdom = ctxt.vdom;
@@ -110,7 +111,7 @@
var _par = this._node.parentNode.XMLNode;
// if parent is document...
- if(_par.nodeType == 9 ) {
+ if(_par._node.nodeType == 9 ) {
return new Array();
}
var ctxt = new ContextVDOM(_par,_par.vdom);
Modified: branches/bxe_2_0/relaxng/ElementVDOM.js
==============================================================================
--- branches/bxe_2_0/relaxng/ElementVDOM.js (original)
+++ branches/bxe_2_0/relaxng/ElementVDOM.js Thu May 3 16:22:55 2007
@@ -108,7 +108,7 @@
ElementVDOM.prototype.isValid = function(ctxt) {
- if (ctxt.node.localName == this.localName && ctxt.node.namespaceURI == this.namespaceURI) {
+ if (ctxt.node._node.localName == this.localName && ctxt.node.namespaceURI == this.namespaceURI) {
var _attr = this.attributes;
Modified: branches/bxe_2_0/relaxng/NodeVAL.js
==============================================================================
--- branches/bxe_2_0/relaxng/NodeVAL.js (original)
+++ branches/bxe_2_0/relaxng/NodeVAL.js Thu May 3 16:22:55 2007
@@ -155,7 +155,7 @@
if (this.node.nextSibling) {
this.node = this.node.nextSibling;
- if (this.node.nodeType == 3 ) {
+ if (this.node._node.nodeType == 3 ) {
debug("ctxt.next next.nodeName is null...");
return this.next();
}
@@ -241,7 +241,7 @@
if (typeof this._vdom == "undefined" || !this._vdom) {
// if documentElement
if (this.parentNode ) {
- if (this.parentNode.nodeType == 9) {
+ if (this.parentNode._node.nodeType == 9) {
if (this.localName == this.ownerDocument.vdom.firstChild.localName) {
this._vdom = this.ownerDocument.vdom.firstChild;
} else {
Modified: branches/bxe_2_0/relaxng/RelaxNG.js
==============================================================================
--- branches/bxe_2_0/relaxng/RelaxNG.js (original)
+++ branches/bxe_2_0/relaxng/RelaxNG.js Thu May 3 16:22:55 2007
@@ -918,7 +918,7 @@
TextVDOM.prototype.isValid = function(ctxt) {
//dump("TextVDOM.isValid :" + ctxt.node.data + ":\n");
- if (ctxt.node.nodeType == Node.TEXT_NODE) {
+ if (ctxt.node._node.nodeType == Node.TEXT_NODE) {
return true;
} else {
return false;
--
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs