[KSS-checkins] r41778 - in kukit/kukit.js/trunk: 3rd_party kukit
reebalazs at codespeak.net
reebalazs at codespeak.net
Sun Apr 1 21:41:27 CEST 2007
Author: reebalazs
Date: Sun Apr 1 21:41:25 2007
New Revision: 41778
Modified:
kukit/kukit.js/trunk/3rd_party/sarissa.js
kukit/kukit.js/trunk/kukit/plugin.js
Log:
update 3rdparty Sarissa library with version 0.9.7.6
Modified: kukit/kukit.js/trunk/3rd_party/sarissa.js
==============================================================================
--- kukit/kukit.js/trunk/3rd_party/sarissa.js (original)
+++ kukit/kukit.js/trunk/3rd_party/sarissa.js Sun Apr 1 21:41:25 2007
@@ -5,53 +5,36 @@
* Sarissa is an ECMAScript library acting as a cross-browser wrapper for native XML APIs.
* The library supports Gecko based browsers like Mozilla and Firefox,
* Internet Explorer (5.5+ with MSXML3.0+), Konqueror, Safari and a little of Opera
- * @version 0.9.6.1
+ * @version 0.9.7.6
* @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net
* ====================================================================
* Licence
* ====================================================================
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 or
- * the GNU Lesser General Public License version 2.1 as published by
- * the Free Software Foundation (your choice between the two).
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License or GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * or GNU Lesser General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- * or visit http://www.gnu.org
- *
+ * Sarissa is free software distributed under the GNU GPL version 2 (see <a href="gpl.txt">gpl.txt</a>) or higher,
+ * GNU LGPL version 2.1 (see <a href="lgpl.txt">lgpl.txt</a>) or higher and Apache Software License 2.0 or higher
+ * (see <a href="asl.txt">asl.txt</a>). This means you can choose one of the three and use that if you like. If
+ * you make modifications under the ASL, i would appreciate it if you submitted those.
+ * In case your copy of Sarissa does not include the license texts, you may find
+ * them online in various formats at <a href="http://www.gnu.org">http://www.gnu.org</a> and
+ * <a href="http://www.apache.org">http://www.apache.org</a>.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE
+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
/**
- * <p>Sarissa is a utility class. Provides "static" methods for DOMDocument and
- * XMLHTTP objects, DOM Node serializatrion to XML strings and other goodies.</p>
+ * <p>Sarissa is a utility class. Provides "static" methods for DOMDocument,
+ * DOM Node serialization to XML strings and other utility goodies.</p>
* @constructor
*/
function Sarissa(){};
-/** @private */
Sarissa.PARSED_OK = "Document contains no parsing errors";
-/**
- * Tells you whether transformNode and transformNodeToObject are available. This functionality
- * is contained in sarissa_ieemu_xslt.js and is deprecated. If you want to control XSLT transformations
- * use the XSLTProcessor
- * @deprecated
- * @type boolean
- */
-Sarissa.IS_ENABLED_TRANSFORM_NODE = false;
-/**
- * tells you whether XMLHttpRequest (or equivalent) is available
- * @type boolean
- */
-Sarissa.IS_ENABLED_XMLHTTP = false;
-/**
- * tells you whether selectNodes/selectSingleNode is available
- * @type boolean
- */
-Sarissa.IS_ENABLED_SELECT_NODES = false;
+Sarissa.PARSED_EMPTY = "Document is empty";
+Sarissa.PARSED_UNKNOWN_ERROR = "Not well-formed or other error";
var _sarissa_iNsCounter = 0;
var _SARISSA_IEPREFIX4XSLPARAM = "";
var _SARISSA_HAS_DOM_IMPLEMENTATION = document.implementation && true;
@@ -60,10 +43,12 @@
var _SARISSA_IS_MOZ = _SARISSA_HAS_DOM_CREATE_DOCUMENT && _SARISSA_HAS_DOM_FEATURE;
var _SARISSA_IS_SAFARI = (navigator.userAgent && navigator.vendor && (navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1 || navigator.vendor.indexOf("Apple") != -1));
var _SARISSA_IS_IE = document.all && window.ActiveXObject && navigator.userAgent.toLowerCase().indexOf("msie") > -1 && navigator.userAgent.toLowerCase().indexOf("opera") == -1;
-if(!window.Node || !window.Node.ELEMENT_NODE){
- var Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12};
+if(!window.Node || !Node.ELEMENT_NODE){
+ Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12};
};
+if(typeof XMLDocument == "undefined" && typeof Document !="undefined"){ XMLDocument = Document; }
+
// IE initialization
if(_SARISSA_IS_IE){
// for XSLT parameter names, prefix needed by IE
@@ -71,13 +56,15 @@
// used to store the most recent ProgID available out of the above
var _SARISSA_DOM_PROGID = "";
var _SARISSA_XMLHTTP_PROGID = "";
+ var _SARISSA_DOM_XMLWRITER = "";
/**
* Called when the Sarissa_xx.js file is parsed, to pick most recent
* ProgIDs for IE, then gets destroyed.
+ * @private
* @param idList an array of MSXML PROGIDs from which the most recent will be picked for a given object
* @param enabledList an array of arrays where each array has two items; the index of the PROGID for which a certain feature is enabled
*/
- pickRecentProgID = function (idList, enabledList){
+ Sarissa.pickRecentProgID = function (idList){
// found progID flag
var bFound = false;
for(var i=0; i < idList.length && !bFound; i++){
@@ -85,50 +72,69 @@
var oDoc = new ActiveXObject(idList[i]);
o2Store = idList[i];
bFound = true;
- for(var j=0;j<enabledList.length;j++)
- if(i <= enabledList[j][1])
- Sarissa["IS_ENABLED_"+enabledList[j][0]] = true;
}catch (objException){
// trap; try next progID
};
};
- if (!bFound)
+ if (!bFound) {
throw "Could not retreive a valid progID of Class: " + idList[idList.length-1]+". (original exception: "+e+")";
+ };
idList = null;
return o2Store;
};
// pick best available MSXML progIDs
- _SARISSA_DOM_PROGID = pickRecentProgID(["Msxml2.DOMDocument.5.0", "Msxml2.DOMDocument.4.0", "Msxml2.DOMDocument.3.0", "MSXML2.DOMDocument", "MSXML.DOMDocument", "Microsoft.XMLDOM"], [["SELECT_NODES", 2],["TRANSFORM_NODE", 2]]);
- _SARISSA_XMLHTTP_PROGID = pickRecentProgID(["Msxml2.XMLHTTP.5.0", "Msxml2.XMLHTTP.4.0", "MSXML2.XMLHTTP.3.0", "MSXML2.XMLHTTP", "Microsoft.XMLHTTP"], [["XMLHTTP", 4]]);
- _SARISSA_THREADEDDOM_PROGID = pickRecentProgID(["Msxml2.FreeThreadedDOMDocument.5.0", "MSXML2.FreeThreadedDOMDocument.4.0", "MSXML2.FreeThreadedDOMDocument.3.0"]);
- _SARISSA_XSLTEMPLATE_PROGID = pickRecentProgID(["Msxml2.XSLTemplate.5.0", "Msxml2.XSLTemplate.4.0", "MSXML2.XSLTemplate.3.0"], [["XSLTPROC", 2]]);
+ _SARISSA_DOM_PROGID = null;
+ _SARISSA_THREADEDDOM_PROGID = null;
+ _SARISSA_XSLTEMPLATE_PROGID = null;
+ _SARISSA_XMLHTTP_PROGID = null;
+ if(!window.XMLHttpRequest){
+ /**
+ * Emulate XMLHttpRequest
+ * @constructor
+ */
+ XMLHttpRequest = function() {
+ if(!_SARISSA_XMLHTTP_PROGID){
+ _SARISSA_XMLHTTP_PROGID = Sarissa.pickRecentProgID(["Msxml2.XMLHTTP.6.0", "MSXML2.XMLHTTP.3.0", "MSXML2.XMLHTTP", "Microsoft.XMLHTTP"]);
+ };
+ return new ActiveXObject(_SARISSA_XMLHTTP_PROGID);
+ };
+ };
// we dont need this anymore
- pickRecentProgID = null;
//============================================
// Factory methods (IE)
//============================================
// see non-IE version
Sarissa.getDomDocument = function(sUri, sName){
+ if(!_SARISSA_DOM_PROGID){
+ _SARISSA_DOM_PROGID = Sarissa.pickRecentProgID(["Msxml2.DOMDocument.6.0", "Msxml2.DOMDocument.3.0", "MSXML2.DOMDocument", "MSXML.DOMDocument", "Microsoft.XMLDOM"]);
+ };
var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID);
- // if a root tag name was provided, we need to load it in the DOM
- // object
+ // if a root tag name was provided, we need to load it in the DOM object
if (sName){
- // if needed, create an artifical namespace prefix the way Moz
- // does
- if (sUri){
- oDoc.loadXML("<a" + _sarissa_iNsCounter + ":" + sName + " xmlns:a" + _sarissa_iNsCounter + "=\"" + sUri + "\" />");
- // don't use the same prefix again
- ++_sarissa_iNsCounter;
- }
- else
- oDoc.loadXML("<" + sName + "/>");
+ // create an artifical namespace prefix
+ // or reuse existing prefix if applicable
+ var prefix = "";
+ if(sUri){
+ if(sName.indexOf(":") > 1){
+ prefix = sName.substring(0, sName.indexOf(":"));
+ sName = sName.substring(sName.indexOf(":")+1);
+ }else{
+ prefix = "a" + (_sarissa_iNsCounter++);
+ };
+ };
+ // use namespaces if a namespace URI exists
+ if(sUri){
+ oDoc.loadXML('<' + prefix+':'+sName + " xmlns:" + prefix + "=\"" + sUri + "\"" + " />");
+ } else {
+ oDoc.loadXML('<' + sName + " />");
+ };
};
return oDoc;
};
// see non-IE version
Sarissa.getParseErrorText = function (oDoc) {
var parseErrorText = Sarissa.PARSED_OK;
- if(oDoc.parseError != 0){
+ if(oDoc.parseError.errorCode != 0){
parseErrorText = "XML Parsing Error: " + oDoc.parseError.reason +
"\nLocation: " + oDoc.parseError.url +
"\nLine Number " + oDoc.parseError.line + ", Column " +
@@ -139,6 +145,9 @@
parseErrorText += "-";
};
parseErrorText += "^\n";
+ }
+ else if(oDoc.documentElement == null){
+ parseErrorText = Sarissa.PARSED_EMPTY;
};
return parseErrorText;
};
@@ -153,34 +162,109 @@
* @constructor
*/
XSLTProcessor = function(){
+ if(!_SARISSA_XSLTEMPLATE_PROGID){
+ _SARISSA_XSLTEMPLATE_PROGID = Sarissa.pickRecentProgID(["Msxml2.XSLTemplate.6.0", "MSXML2.XSLTemplate.3.0"]);
+ };
this.template = new ActiveXObject(_SARISSA_XSLTEMPLATE_PROGID);
this.processor = null;
};
/**
- * Impoprts the given XSLT DOM and compiles it to a reusable transform
+ * Imports the given XSLT DOM and compiles it to a reusable transform
+ * <b>Note:</b> If the stylesheet was loaded from a URL and contains xsl:import or xsl:include elements,it will be reloaded to resolve those
* @argument xslDoc The XSLT DOMDocument to import
*/
XSLTProcessor.prototype.importStylesheet = function(xslDoc){
+ if(!_SARISSA_THREADEDDOM_PROGID){
+ _SARISSA_THREADEDDOM_PROGID = Sarissa.pickRecentProgID(["MSXML2.FreeThreadedDOMDocument.6.0", "MSXML2.FreeThreadedDOMDocument.3.0"]);
+ };
+ xslDoc.setProperty("SelectionLanguage", "XPath");
+ xslDoc.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'");
// convert stylesheet to free threaded
- var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID);
- converted.loadXML(xslDoc.xml);
+ var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID);
+ // make included/imported stylesheets work if exist and xsl was originally loaded from url
+ if(xslDoc.url && xslDoc.selectSingleNode("//xsl:*[local-name() = 'import' or local-name() = 'include']") != null){
+ converted.async = false;
+ if (_SARISSA_THREADEDDOM_PROGID == "MSXML2.FreeThreadedDOMDocument.6.0") {
+ converted.setProperty("AllowDocumentFunction", true);
+ converted.resolveExternals = true;
+ }
+ converted.load(xslDoc.url);
+ } else {
+ converted.loadXML(xslDoc.xml);
+ };
+ converted.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'");
+ var output = converted.selectSingleNode("//xsl:output");
+ this.outputMethod = output ? output.getAttribute("method") : "html";
this.template.stylesheet = converted;
this.processor = this.template.createProcessor();
- // (re)set default param values
+ // for getParameter and clearParameters
this.paramsSet = new Array();
};
+
/**
- * Transform the given XML DOM
+ * Transform the given XML DOM and return the transformation result as a new DOM document
* @argument sourceDoc The XML DOMDocument to transform
* @return The transformation result as a DOM Document
*/
XSLTProcessor.prototype.transformToDocument = function(sourceDoc){
+ // fix for bug 1549749
+ if(_SARISSA_THREADEDDOM_PROGID){
+ this.processor.input=sourceDoc;
+ var outDoc=new ActiveXObject(_SARISSA_DOM_PROGID);
+ this.processor.output=outDoc;
+ this.processor.transform();
+ return outDoc;
+ }
+ else{
+ if(!_SARISSA_DOM_XMLWRITER){
+ _SARISSA_DOM_XMLWRITER = Sarissa.pickRecentProgID(["Msxml2.MXXMLWriter.6.0", "Msxml2.MXXMLWriter.3.0", "MSXML2.MXXMLWriter", "MSXML.MXXMLWriter", "Microsoft.XMLDOM"]);
+ };
+ this.processor.input = sourceDoc;
+ var outDoc = new ActiveXObject(_SARISSA_DOM_XMLWRITER);
+ this.processor.output = outDoc;
+ this.processor.transform();
+ var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID);
+ oDoc.loadXML(outDoc.output+"");
+ return oDoc;
+ };
+ };
+
+ /**
+ * Transform the given XML DOM and return the transformation result as a new DOM fragment.
+ * <b>Note</b>: The xsl:output method must match the nature of the owner document (XML/HTML).
+ * @argument sourceDoc The XML DOMDocument to transform
+ * @argument ownerDoc The owner of the result fragment
+ * @return The transformation result as a DOM Document
+ */
+ XSLTProcessor.prototype.transformToFragment = function (sourceDoc, ownerDoc) {
this.processor.input = sourceDoc;
- var outDoc = new ActiveXObject(_SARISSA_DOM_PROGID);
- this.processor.output = outDoc;
this.processor.transform();
- return outDoc;
+ var s = this.processor.output;
+ var f = ownerDoc.createDocumentFragment();
+ if (this.outputMethod == 'text') {
+ f.appendChild(ownerDoc.createTextNode(s));
+ } else if (ownerDoc.body && ownerDoc.body.innerHTML) {
+ var container = ownerDoc.createElement('div');
+ container.innerHTML = s;
+ while (container.hasChildNodes()) {
+ f.appendChild(container.firstChild);
+ }
+ }
+ else {
+ var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID);
+ if (s.substring(0, 5) == '<?xml') {
+ s = s.substring(s.indexOf('?>') + 2);
+ }
+ var xml = ''.concat('<my>', s, '</my>');
+ oDoc.loadXML(xml);
+ var container = oDoc.documentElement;
+ while (container.hasChildNodes()) {
+ f.appendChild(container.firstChild);
+ }
+ }
+ return f;
};
+
/**
* Set global XSLT parameter of the imported stylesheet
* @argument nsURI The parameter namespace URI
@@ -188,13 +272,13 @@
* @argument value The new parameter value
*/
XSLTProcessor.prototype.setParameter = function(nsURI, name, value){
- /* nsURI is optional but cannot be null */
+ // nsURI is optional but cannot be null
if(nsURI){
this.processor.addParameter(name, value, nsURI);
}else{
this.processor.addParameter(name, value);
};
- /* update updated params for getParameter */
+ // update updated params for getParameter
if(!this.paramsSet[""+nsURI]){
this.paramsSet[""+nsURI] = new Array();
};
@@ -209,14 +293,28 @@
*/
XSLTProcessor.prototype.getParameter = function(nsURI, name){
nsURI = nsURI || "";
- if(nsURI in this.paramsSet && name in this.paramsSet[nsURI]){
+ if(this.paramsSet[nsURI] && this.paramsSet[nsURI][name]){
return this.paramsSet[nsURI][name];
}else{
return null;
};
};
-}
-else{ /* end IE initialization, try to deal with real browsers now ;-) */
+ /**
+ * Clear parameters (set them to default values as defined in the stylesheet itself)
+ */
+ XSLTProcessor.prototype.clearParameters = function(){
+ for(var nsURI in this.paramsSet){
+ for(var name in this.paramsSet[nsURI]){
+ if(nsURI){
+ this.processor.addParameter(name, null, nsURI);
+ }else{
+ this.processor.addParameter(name, null);
+ };
+ };
+ };
+ this.paramsSet = new Array();
+ };
+}else{ /* end IE initialization, try to deal with real browsers now ;-) */
if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){
/**
* <p>Ensures the document was loaded correctly, otherwise sets the
@@ -224,8 +322,6 @@
* @private
*/
Sarissa.__handleLoad__ = function(oDoc){
- if (!oDoc.documentElement || oDoc.documentElement.tagName == "parsererror")
- oDoc.parseError = -1;
Sarissa.__setReadyState__(oDoc, 4);
};
/**
@@ -245,109 +341,37 @@
*/
Sarissa.__setReadyState__ = function(oDoc, iReadyState){
oDoc.readyState = iReadyState;
+ oDoc.readystate = iReadyState;
if (oDoc.onreadystatechange != null && typeof oDoc.onreadystatechange == "function")
oDoc.onreadystatechange();
};
Sarissa.getDomDocument = function(sUri, sName){
- var oDoc = document.implementation.createDocument(sUri?sUri:"", sName?sName:"", null);
+ var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null);
+ if(!oDoc.onreadystatechange){
+
+ /**
+ * <p>Emulate IE's onreadystatechange attribute</p>
+ */
+ oDoc.onreadystatechange = null;
+ };
+ if(!oDoc.readyState){
+ /**
+ * <p>Emulates IE's readyState property, which always gives an integer from 0 to 4:</p>
+ * <ul><li>1 == LOADING,</li>
+ * <li>2 == LOADED,</li>
+ * <li>3 == INTERACTIVE,</li>
+ * <li>4 == COMPLETED</li></ul>
+ */
+ oDoc.readyState = 0;
+ };
oDoc.addEventListener("load", _sarissa_XMLDocument_onload, false);
return oDoc;
};
if(window.XMLDocument){
- /**
- * <p>Emulate IE's onreadystatechange attribute</p>
- */
- XMLDocument.prototype.onreadystatechange = null;
- /**
- * <p>Emulates IE's readyState property, which always gives an integer from 0 to 4:</p>
- * <ul><li>1 == LOADING,</li>
- * <li>2 == LOADED,</li>
- * <li>3 == INTERACTIVE,</li>
- * <li>4 == COMPLETED</li></ul>
- */
- XMLDocument.prototype.readyState = 0;
- /**
- * <p>Emulate IE's parseError attribute</p>
- */
- XMLDocument.prototype.parseError = 0;
-
- // NOTE: setting async to false will only work with documents
- // called over HTTP (meaning a server), not the local file system,
- // unless you are using Moz 1.4+.
- // BTW the try>catch block is for 1.4; I haven't found a way to check if
- // the property is implemented without
- // causing an error and I dont want to use user agent stuff for that...
- var _SARISSA_SYNC_NON_IMPLEMENTED = false;// ("async" in XMLDocument.prototype) ? false: true;
- /**
- * <p>Keeps a handle to the original load() method. Internal use and only
- * if Mozilla version is lower than 1.4</p>
- * @private
- */
- XMLDocument.prototype._sarissa_load = XMLDocument.prototype.load;
-
- /**
- * <p>Overrides the original load method to provide synchronous loading for
- * Mozilla versions prior to 1.4, using an XMLHttpRequest object (if
- * async is set to false)</p>
- * @returns the DOM Object as it was before the load() call (may be empty)
- */
- XMLDocument.prototype.load = function(sURI) {
- var oDoc = document.implementation.createDocument("", "", null);
- Sarissa.copyChildNodes(this, oDoc);
- this.parseError = 0;
- Sarissa.__setReadyState__(this, 1);
- try {
- if(this.async == false && _SARISSA_SYNC_NON_IMPLEMENTED) {
- var tmp = new XMLHttpRequest();
- tmp.open("GET", sURI, false);
- tmp.send(null);
- Sarissa.__setReadyState__(this, 2);
- Sarissa.copyChildNodes(tmp.responseXML, this);
- Sarissa.__setReadyState__(this, 3);
- }
- else {
- this._sarissa_load(sURI);
- };
- }
- catch (objException) {
- this.parseError = -1;
- }
- finally {
- if(this.async == false){
- Sarissa.__handleLoad__(this);
- };
- };
- return oDoc;
- };
-
-
- }//if(window.XMLDocument)
- else if(document.implementation && document.implementation.hasFeature && document.implementation.hasFeature('LS', '3.0')){
- Document.prototype.async = true;
- Document.prototype.onreadystatechange = null;
- Document.prototype.parseError = 0;
- Document.prototype.load = function(sURI) {
- var parser = document.implementation.createLSParser(this.async ? document.implementation.MODE_ASYNCHRONOUS : document.implementation.MODE_SYNCHRONOUS, null);
- if(this.async){
- var self = this;
- parser.addEventListener("load",
- function(e) {
- self.readyState = 4;
- Sarissa.copyChildNodes(e.newDocument, self.documentElement, false);
- self.onreadystatechange.call();
- },
- false);
- };
- try {
- var oDoc = parser.parseURI(sURI);
- }
- catch(e){
- this.parseError = -1;
- };
- if(!this.async)
- Sarissa.copyChildNodes(oDoc, this.documentElement, false);
- return oDoc;
- };
+ // do nothing
+ }// TODO: check if the new document has content before trying to copynodes, check for error handling in DOM 3 LS
+ else if(_SARISSA_HAS_DOM_FEATURE && window.Document && !Document.prototype.load && document.implementation.hasFeature('LS', '3.0')){
+ //Opera 9 may get the XPath branch which gives creates XMLDocument, therefore it doesn't reach here which is good
/**
* <p>Factory method to obtain a new DOM Document object</p>
* @argument sUri the namespace of the root node (if any)
@@ -355,8 +379,19 @@
* @returns a new DOM Document
*/
Sarissa.getDomDocument = function(sUri, sName){
- return document.implementation.createDocument(sUri?sUri:"", sName?sName:"", null);
- };
+ var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null);
+ return oDoc;
+ };
+ }
+ else {
+ Sarissa.getDomDocument = function(sUri, sName){
+ var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null);
+ // looks like safari does not create the root element for some unknown reason
+ if(oDoc && (sUri || sName) && !oDoc.documentElement){
+ oDoc.appendChild(oDoc.createElementNS(sUri, sName));
+ };
+ return oDoc;
+ };
};
};//if(_SARISSA_HAS_DOM_CREATE_DOCUMENT)
};
@@ -364,13 +399,12 @@
// Common stuff
//==========================================
if(!window.DOMParser){
- /*
- * DOMParser is a utility class, used to construct DOMDocuments from XML strings
- * @constructor
- */
- DOMParser = function() {
- };
if(_SARISSA_IS_SAFARI){
+ /*
+ * DOMParser is a utility class, used to construct DOMDocuments from XML strings
+ * @constructor
+ */
+ DOMParser = function() { };
/**
* Construct a new DOM Document from the given XMLstring
* @param sXml the given XML string
@@ -378,15 +412,13 @@
* @return a new DOM Document from the given XML string
*/
DOMParser.prototype.parseFromString = function(sXml, contentType){
- if(contentType.toLowerCase() != "application/xml"){
- throw "Cannot handle content type: \"" + contentType + "\"";
- };
var xmlhttp = new XMLHttpRequest();
- xmlhttp.open("GET", "data:text/xml;charset=utf-8," + encodeURIComponent(str), false);
+ xmlhttp.open("GET", "data:text/xml;charset=utf-8," + encodeURIComponent(sXml), false);
xmlhttp.send(null);
return xmlhttp.responseXML;
};
- }else if(Sarissa.getDomDocument && Sarissa.getDomDocument() && "loadXML" in Sarissa.getDomDocument()){
+ }else if(Sarissa.getDomDocument && Sarissa.getDomDocument() && Sarissa.getDomDocument(null, "bar").xml){
+ DOMParser = function() { };
DOMParser.prototype.parseFromString = function(sXml, contentType){
var doc = Sarissa.getDomDocument();
doc.loadXML(sXml);
@@ -395,40 +427,36 @@
};
};
-if(window.XMLHttpRequest){
- Sarissa.IS_ENABLED_XMLHTTP = true;
-}
-else if(_SARISSA_IS_IE){
- /**
- * Emulate XMLHttpRequest
- * @constructor
- */
- XMLHttpRequest = function() {
- return new ActiveXObject(_SARISSA_XMLHTTP_PROGID);
- };
- Sarissa.IS_ENABLED_XMLHTTP = true;
-};
-
-if(!window.document.importNode && _SARISSA_IS_IE){
+if((typeof(document.importNode) == "undefined") && _SARISSA_IS_IE){
try{
/**
- * Implements importNode for the current window document in IE using innerHTML.
- * Testing showed that DOM was multiple times slower than innerHTML for this,
- * sorry folks. If you encounter trouble (who knows what IE does behind innerHTML)
- * please gimme a call.
+ * Implementation of importNode for the context window document in IE
* @param oNode the Node to import
* @param bChildren whether to include the children of oNode
* @returns the imported node for further use
*/
- window.document.importNode = function(oNode, bChildren){
- var importNode = document.createElement("div");
- if(bChildren)
- importNode.innerHTML = Sarissa.serialize(oNode);
- else
- importNode.innerHTML = Sarissa.serialize(oNode.cloneNode(false));
- return importNode.firstChild;
+ document.importNode = function(oNode, bChildren){
+ var tmp;
+ if(oNode.nodeName == "tbody" || oNode.nodeName == "tr"){
+ tmp = document.createElement("table");
+ }
+ else if(oNode.nodeName == "td"){
+ tmp = document.createElement("tr");
+ }
+ else if(oNode.nodeName == "option"){
+ tmp = document.createElement("select");
+ }
+ else{
+ tmp = document.createElement("div");
+ };
+ if(bChildren){
+ tmp.innerHTML = oNode.xml ? oNode.xml : oNode.outerHTML;
+ }else{
+ tmp.innerHTML = oNode.xml ? oNode.cloneNode(false).xml : oNode.cloneNode(false).outerHTML;
+ };
+ return tmp.getElementsByTagName("*")[0];
};
- }catch(e){};
+ }catch(e){ };
};
if(!Sarissa.getParseErrorText){
/**
@@ -442,17 +470,16 @@
*/
Sarissa.getParseErrorText = function (oDoc){
var parseErrorText = Sarissa.PARSED_OK;
- if(oDoc && oDoc.parseError && oDoc.parseError != 0){
- /*moz*/
- if(oDoc.documentElement.tagName == "parsererror"){
- parseErrorText = oDoc.documentElement.firstChild.data;
- parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data;
- }/*konq*/
- else{
- parseErrorText = Sarissa.getText(oDoc.documentElement);/*.getElementsByTagName("h1")[0], false) + "\n";
- parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("body")[0], false) + "\n";
- parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("pre")[0], false);*/
- };
+ if(!oDoc.documentElement){
+ parseErrorText = Sarissa.PARSED_EMPTY;
+ } else if(oDoc.documentElement.tagName == "parsererror"){
+ parseErrorText = oDoc.documentElement.firstChild.data;
+ parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data;
+ } else if(oDoc.getElementsByTagName("parsererror").length > 0){
+ var parsererror = oDoc.getElementsByTagName("parsererror")[0];
+ parseErrorText = Sarissa.getText(parsererror, true)+"\n";
+ } else if(oDoc.parseError && oDoc.parseError.errorCode != 0){
+ parseErrorText = Sarissa.PARSED_UNKNOWN_ERROR;
};
return parseErrorText;
};
@@ -465,7 +492,7 @@
var nodeType = node.nodeType;
if(nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE){
s += node.data;
- }else if(deep == true
+ } else if(deep == true
&& (nodeType == Node.ELEMENT_NODE
|| nodeType == Node.DOCUMENT_NODE
|| nodeType == Node.DOCUMENT_FRAGMENT_NODE)){
@@ -474,40 +501,20 @@
};
return s;
};
-if(window.XMLSerializer){
+if(!window.XMLSerializer
+ && Sarissa.getDomDocument
+ && Sarissa.getDomDocument("","foo", null).xml){
/**
- * <p>Factory method to obtain the serialization of a DOM Node</p>
- * @returns the serialized Node as an XML string
+ * Utility class to serialize DOM Node objects to XML strings
+ * @constructor
*/
- Sarissa.serialize = function(oDoc){
- var s = null;
- if(oDoc){
- s = oDoc.innerHTML?oDoc.innerHTML:(new XMLSerializer()).serializeToString(oDoc);
- };
- return s;
- };
-}else{
- if(Sarissa.getDomDocument && (Sarissa.getDomDocument("","foo", null)).xml){
- // see non-IE version
- Sarissa.serialize = function(oDoc) {
- var s = null;
- if(oDoc){
- s = oDoc.innerHTML?oDoc.innerHTML:oDoc.xml;
- };
- return s;
- };
- /**
- * Utility class to serialize DOM Node objects to XML strings
- * @constructor
- */
- XMLSerializer = function(){};
- /**
- * Serialize the given DOM Node to an XML string
- * @param oNode the DOM Node to serialize
- */
- XMLSerializer.prototype.serializeToString = function(oNode) {
- return oNode.xml;
- };
+ XMLSerializer = function(){};
+ /**
+ * Serialize the given DOM Node to an XML string
+ * @param oNode the DOM Node to serialize
+ */
+ XMLSerializer.prototype.serializeToString = function(oNode) {
+ return oNode.xml;
};
};
@@ -523,7 +530,7 @@
*/
Sarissa.clearChildNodes = function(oNode) {
// need to check for firstChild due to opera 8 bug with hasChildNodes
- while(oNode.firstChild){
+ while(oNode.firstChild) {
oNode.removeChild(oNode.firstChild);
};
};
@@ -544,12 +551,11 @@
};
var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument;
var nodes = nodeFrom.childNodes;
- if(ownerDoc.importNode && (!_SARISSA_IS_IE)) {
+ if(typeof(ownerDoc.importNode) != "undefined") {
for(var i=0;i < nodes.length;i++) {
nodeTo.appendChild(ownerDoc.importNode(nodes[i], true));
};
- }
- else{
+ } else {
for(var i=0;i < nodes.length;i++) {
nodeTo.appendChild(nodes[i].cloneNode(true));
};
@@ -577,9 +583,9 @@
while(nodeFrom.firstChild){
nodeTo.appendChild(nodeFrom.firstChild);
};
- }else{
+ } else {
var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument;
- if(ownerDoc.importNode && (!_SARISSA_IS_IE)) {
+ if(typeof(ownerDoc.importNode) != "undefined") {
for(var i=0;i < nodes.length;i++) {
nodeTo.appendChild(ownerDoc.importNode(nodes[i], true));
};
Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js (original)
+++ kukit/kukit.js/trunk/kukit/plugin.js Sun Apr 1 21:41:25 2007
@@ -94,9 +94,10 @@
};
kukit.pl.NativeEventBinder.prototype.__bind__ = function(name, func_to_bind, oper) {
- oper.completeParms([], {'preventdefault': '', 'allowbubbling': ''}, 'native event binding');
+ oper.completeParms([], {'preventdefault': '', 'allowbubbling': '', 'preventbubbling': ''}, 'native event binding');
oper.evalBool('preventdefault', 'native event binding');
oper.evalBool('allowbubbling', 'native event binding');
+ oper.evalBool('preventbubbling', 'native event binding');
if (oper.parms.preventdefault) {
if (name != 'click') {
throw 'In native events only the click event can have preventdefault.';
@@ -108,6 +109,10 @@
var func = function(e) {
target = kukit.pl.getTargetForBrowserEvent(e);
if (allowbubbling || target == node) {
+ if (e.kss_preventbubbling) {
+ kukit.log('Ignored bubbling event because of preventbubbling=true for "' + name + '" (target =' + target.tagName + '), EventRule #' + oper.eventrule.getNr() + ' mergeid ' + oper.eventrule.kss_selector.mergeid);
+ return;
+ }
// Execute the action, provide browserevent on oper
// ... however, do it protected. We want the preventdefault
// in any case!
@@ -125,6 +130,11 @@
// MS style
try { e.returnValue = false; } catch (exc2) {}
}
+ // Prevent bubbling to other kss events ?
+ if (oper.parms.preventbubbling) {
+ e.kss_preventbubbling = true;
+ }
+ //
if (exc != null) {
// throw the original exception
throw exc;
More information about the Kukit-checkins
mailing list