From reebalazs at codespeak.net  Mon Jul  3 18:29:02 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon,  3 Jul 2006 18:29:02 +0200 (CEST)
Subject: [Kukit-checkins] r29612 - kukit/kukit.js/trunk/kukit
Message-ID: <20060703162902.2B8371007D@code0.codespeak.net>

Author: reebalazs
Date: Mon Jul  3 18:28:59 2006
New Revision: 29612

Modified:
   kukit/kukit.js/trunk/kukit/kukit.js
   kukit/kukit.js/trunk/kukit/plugin.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
Log:
Calling the bind of document: special selectors

Modified: kukit/kukit.js/trunk/kukit/kukit.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kukit.js	(original)
+++ kukit/kukit.js/trunk/kukit/kukit.js	Mon Jul  3 18:28:59 2006
@@ -269,6 +269,10 @@
     for (var y=0; y < rules.length; y++) {
         rules[y].mergeForSelectedNodes(ruletable, in_node);
     }
+    // bind special selectors first
+    if (typeof(in_node) == 'undefined') {
+        kukit.rd.methodTable.bindall();
+    }
     // finally bind the merged events
     ruletable.bindall()
 };

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Mon Jul  3 18:28:59 2006
@@ -80,6 +80,9 @@
 
 kukit.pl.NativeEvent.prototype.__bind__ = function(name, parms, func_to_bind, node) {
     parms = kukit.pl.completeParms(parms, [], {}, 'native event binding');
+    if (node == null) {
+        throw 'Native event must be bound to a node.';
+    }
     var func = function(e) {
         target = kukit.pl.getTargetForBrowserEvent(e);
         if (target == node) {
@@ -156,6 +159,9 @@
 
 kukit.pl.CancelSubmitClickEvent.prototype.__bind__ = function(name, parms, func_to_bind, node) {
     parms = kukit.pl.completeParms(parms, [], {}, 'cancelSubmitClick event binding');
+    if (node == null) {
+        throw 'cancelSubmitClick event must be bound to a node.';
+    }
     var func = function(e) {
         target = kukit.pl.getTargetForBrowserEvent(e);
         if (target == node) {
@@ -224,22 +230,33 @@
 );
 
 
-
 kukit.ar.eventActionRegistry.register("logDebug", function (node, parms, eventrule) {
     parms = kukit.pl.completeParms(parms, [], {'message': 'Logging from Event'}, 'logDebug action');
-    kukit.logDebug(parms.message + ', rule=#' + eventrule.getNr() + ', node=' + node.nodeName); 
+    var nodeName = '<DOCUMENT>';
+    if (node != null) {
+        nodeName = node.nodeName;
+    }
+    kukit.logDebug(parms.message + ', rule=#' + eventrule.getNr() + ', node=' + nodeName); 
     }
 );
 
 kukit.ar.eventActionRegistry.register("log", function (node, parms, eventrule) {
     parms = kukit.pl.completeParms(parms, [], {'message': 'Logging from Event'}, 'log action');
-    kukit.log(parms.message + ', rule=#' + eventrule.getNr() + ', node=' + node.nodeName); 
+    var nodeName = '<DOCUMENT>';
+    if (node != null) {
+        nodeName = node.nodeName;
+    }
+    kukit.log(parms.message + ', rule=#' + eventrule.getNr() + ', node=' + nodeName); 
     }
 );
 
 kukit.ar.eventActionRegistry.register("alert", function (node, parms, eventrule) {
     parms = kukit.pl.completeParms(parms, [], {'message': 'Logging from Event'}, 'alert action');
-    alert(parms.message + ', rule=#' + eventrule.getNr() + ', node=' + node.nodeName); 
+    var nodeName = '<DOCUMENT>';
+    if (node != null) {
+        nodeName = node.nodeName;
+    }
+    alert(parms.message + ', rule=#' + eventrule.getNr() + ', node=' + nodeName); 
     }
 );
 

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Mon Jul  3 18:28:59 2006
@@ -539,5 +539,17 @@
     return mergedrule;
 };
 
+kukit.rd.MethodTable.prototype.bindall = function() {
+    // bind document events
+    var documentrules = this.content['document'];
+    var counter = 0;
+    for (var mergeid in documentrules) {
+        // bind to null as a node
+        documentrules[mergeid].bind(null);
+        counter += 1;
+    }
+    kukit.logDebug('Binding ' + counter + ' special rules in grand total');
+};
+ 
 kukit.rd.methodTable = new kukit.rd.MethodTable();
 

From reebalazs at codespeak.net  Mon Jul  3 18:29:49 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon,  3 Jul 2006 18:29:49 +0200 (CEST)
Subject: [Kukit-checkins] r29613 - kukit/azaxdemo/trunk/browser
Message-ID: <20060703162949.253301007D@code0.codespeak.net>

Author: reebalazs
Date: Mon Jul  3 18:29:47 2006
New Revision: 29613

Modified:
   kukit/azaxdemo/trunk/browser/azax_demo.pt
Log:
Small (in template) doc fix

Modified: kukit/azaxdemo/trunk/browser/azax_demo.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_demo.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_demo.pt	Mon Jul  3 18:29:47 2006
@@ -1,7 +1,5 @@
 <html>
   <head>
-    <!--link rel="kukit"
-          tal:attributes="href string:${context/absolute_url}/++resource++azax_demo.kukit"/-->
     <link rel="kukit" type="text/css"
           tal:attributes="href string:${context/absolute_url}/++resource++azax_demo.kss"/>
     <metal:header use-macro="context/header_macros/macros/header_resources" />
@@ -64,7 +62,7 @@
     <p>This page defines a <code>link</code> in the header which <code>rel</code> attribute points
        to a <code>.kukit</code> server file :
 
-          <a tal:attributes="href string:${context/absolute_url}/++resource++azax_demo.kukit">
+          <a tal:attributes="href string:${context/absolute_url}/++resource++azax_demo.kss">
            see the kukit file here</a>.</p>
     <p>
         This <code>.kukit</code> file declares CSS selectors associated with events and server URLs called when the event occur.

From reebalazs at codespeak.net  Mon Jul  3 18:41:20 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon,  3 Jul 2006 18:41:20 +0200 (CEST)
Subject: [Kukit-checkins] r29615 - kukit/kukit.js/trunk/kukit
Message-ID: <20060703164120.35ABD1007D@code0.codespeak.net>

Author: reebalazs
Date: Mon Jul  3 18:41:19 2006
New Revision: 29615

Modified:
   kukit/kukit.js/trunk/kukit/kukit.js
Log:
Remove PythonMethodSignature

Modified: kukit/kukit.js/trunk/kukit/kukit.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kukit.js	(original)
+++ kukit/kukit.js/trunk/kukit/kukit.js	Mon Jul  3 18:41:19 2006
@@ -286,55 +286,6 @@
     }
 };
 
-/* Python-style args and parameters setup */
-
-kukit.PythonMethodSignature = function(f_proto, f_defaults) {
-    // proto = a list of argnames
-    // default = a dict of default values
-    //
-    // e.g.
-    // sig = kukit.PythonMethodSignature(['a', 'b'], {'c': 1, 'd': 2});
-    // sig.f_keywords(['x'], {'b': 'y', 'c': 'z'}) ==> {'a': 'x', 'b': 'y', 'c': 'z', 'd': 2}
-    // sig.f_keywords(['x', 'y', 'z'], {'b': 'y', 'c': 'z'}) ==> ERROR
-    // sig.f_keywords(['x'], {'d': 3}) ==> ERROR
-    // sig.f_keywords(['x', 'y'], {'a': '1'}) ==> ERROR
-    //
-    this.f_proto = f_proto
-    this.f_defaults = f_defaults
-};
-
-kukit.PythonMethodSignature.prototype.f_keywords = function(args, kw) {
-    var result = {};
-    // check
-    if (args.length < this.f_proto.length) {
-        for (var i = args.length; i < this.f_proto.length; i++) {
-            var key = this.f_proto[i];
-            if (typeof(kw[key]) == 'undefined') {
-                throw 'Missing args in python-like method call"' + key + '"';
-            }
-        }
-    } else if (args.length > this.f_proto.length) {
-        throw 'Excess args in python-like method call (' + args.length + ' > ' + this.f_proto.length + ')';
-    }
-    // set args
-    for (var i = 0; i < args.length; i++) {
-        result[this.f_proto[i]] = args[i];
-    }
-    // set keywords
-    for (key in kw) {
-        if (typeof(result[key]) != 'undefined') {
-            throw 'Multiple values for keyword argument "' + key + '"';
-        }
-        result[key] = kw[key];
-    }
-    // set default values
-    for (key in this.f_defaults) {
-        if (typeof(result[key]) == 'undefined') {
-            result[key] = this.f_defaults[key];
-        }
-    }
-    return result;
-};
 
 /* Event handling */
 

From reebalazs at codespeak.net  Thu Jul  6 19:59:07 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu,  6 Jul 2006 19:59:07 +0200 (CEST)
Subject: [Kukit-checkins] r29706 - in kukit/kukit.js/trunk: kukit tests
Message-ID: <20060706175907.8D81310090@code0.codespeak.net>

Author: reebalazs
Date: Thu Jul  6 19:59:04 2006
New Revision: 29706

Added:
   kukit/kukit.js/trunk/kukit/commandreg.js
Modified:
   kukit/kukit.js/trunk/kukit/eventreg.js
   kukit/kukit.js/trunk/kukit/kukit.js
   kukit/kukit.js/trunk/kukit/plugin.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
   kukit/kukit.js/trunk/tests/runner.html
   kukit/kukit.js/trunk/tests/runtests.sh
Log:
Refactoring

- Moved command registry to its own js file

- Get rid of 'eval' parameter method, add 'statevar' and a 
  'setStatevar' command.

- Refactor CancelSubmitClick into the native click, preventdefault parm

- XxxEvent -> XxxEventBinder, in plugins

- Get rid of classname on event registration

- Refactor: event class -> binder,
  __trigger_action__ -> __trigger_event__


Added: kukit/kukit.js/trunk/kukit/commandreg.js
==============================================================================
--- (empty file)
+++ kukit/kukit.js/trunk/kukit/commandreg.js	Thu Jul  6 19:59:04 2006
@@ -0,0 +1,75 @@
+
+/* Command registration */
+
+kukit.cr = {};
+
+kukit.cr.CommandRegistry = function () {
+    this.content = {};
+};
+
+kukit.cr.CommandRegistry.prototype.register = function(name, klass) {
+    if (this.content[name]) {
+        // Do not allow redefinition
+        kukit.logError('Error : redefinition attempt of command ' + name);
+        return;
+        }
+    this.content[name] = klass;
+};
+
+kukit.cr.CommandRegistry.prototype.get = function(name) {
+    var klass = this.content[name];
+    if (! klass) {
+        // not found
+        kukit.logError('Error : undefined command ' + name);
+        }
+    return klass;
+};
+
+kukit.cr.commandRegistry = new kukit.cr.CommandRegistry();
+
+/* Command factories */
+
+kukit.cr.makeCommand = function(selector, name, type, params, transport) {
+    var commandClass = kukit.cr.commandRegistry.get(name);
+    var command = new commandClass();
+    command.selector = selector;
+    command.name = name;
+    command.selectorType = type;
+    command.params = params;
+    command.transport = transport;
+    return command;
+}
+
+kukit.cr._Command_execute_selector = function() {
+    kukit.logDebug('Selector type: ' + this.selectorType);
+    kukit.logDebug('Selector : ' + this.selector);
+    var selfunc = kukit.selectors.get(this.selectorType);
+    var nodes = selfunc(this.selector);
+    if (!nodes || nodes.length == 0) {
+        kukit.logError('Command found no nodes');
+    }
+    for (var i=0;i < nodes.length;i++) {
+        var node = nodes[i];
+        //XXX error handling for wrong command name
+        kukit.logDebug('Command Name: ' + this.name);
+        this.executeOnSingleNode(node);
+    }
+};
+
+kukit.cr.makeSelectorCommand = function(name, executeOnSingleNode) {
+    var commandClass = function() {};
+    commandClass.prototype = {
+        execute: kukit.cr._Command_execute_selector,
+        executeOnSingleNode: executeOnSingleNode
+    };
+    kukit.cr.commandRegistry.register(name, commandClass); 
+};
+
+kukit.cr.makeGlobalCommand = function(name, executeOnce) {
+    var commandClass = function() {};
+    commandClass.prototype = {
+        execute: executeOnce
+    };
+    kukit.cr.commandRegistry.register(name, commandClass); 
+};
+

Modified: kukit/kukit.js/trunk/kukit/eventreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/eventreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/eventreg.js	Thu Jul  6 19:59:04 2006
@@ -3,41 +3,53 @@
 
 kukit.er = {};
 
-/* Event class registry 
+/* Event registry 
 *
 *  available for plugin registration
 *
-*  class must be the *name* of the event class
-*  func must be a class (constructor) function.
+*  usage:
+*
+*  kukit.er.eventRegistry.register(namespace, eventname, func, 
+*    bindmethodname, defaultactionmethodname);
+*  
+*     namespace = null: means global namespace
+*     defaultactionmethodname = null: if there is no default action implemented
+*     func must be a class (constructor) function, this is the class that
+*           implements the binder.
 *
 */
 
-kukit.er.EventClassRegistry = function () {
+kukit.er.eventClassCounter = 0;
+
+kukit.er.EventRegistry = function () {
     this.content = {};
+    this.classes = {};
 };
 
-kukit.er.EventClassRegistry.prototype.register = function(classname, func) {
+/* binder registration */
+
+kukit.er.EventRegistry.prototype.registerBinder = function(classname, func) {
     if (typeof(func) == 'undefined') {
         throw 'Func is mandatory.';
     }
-    if (this.content[classname]) {
+    if (this.classes[classname]) {
         // Do not allow redefinition
         kukit.logError('Error : redefinition attempt of event class ' + classname);
         return;
     
     }
     // Decorate and store the class
-    kukit.er.decorateEventClass(func);
-    this.content[classname] = func;
+    kukit.er.decorateEventBinderClass(func);
+    this.classes[classname] = func;
 };
 
-kukit.er.EventClassRegistry.prototype.exists = function(classname) {
-    var func = this.content[classname];
+kukit.er.EventRegistry.prototype.existsBinder = function(classname) {
+    var func = this.classes[classname];
     return (typeof(func) != 'undefined');
 };
 
-kukit.er.EventClassRegistry.prototype.get = function(classname) {
-    var func = this.content[classname];
+kukit.er.EventRegistry.prototype.getBinder = function(classname) {
+    var func = this.classes[classname];
     if (! func) {
         // not found
         throw 'Error : undefined event setup type ' + classname;
@@ -45,33 +57,24 @@
     return func;
 };
 
-kukit.er.eventClassRegistry = new kukit.er.EventClassRegistry();
-
-/* Event registry 
-*
-*  available for plugin registration
-*
-*  usage:
-*
-*  kukit.er.eventRegistry.register(namespace, eventname, classname, 
-*    bindmethodname, defaultactionmethodname);
-*  
-* namespace = null: means global namespace
-* defaultactionmethodname = null: if there is no default action implemented
-*
-*/
-
-kukit.er.EventRegistry = function () {
-    this.content = {};
-};
+/* events (methods) registration */
 
-kukit.er.EventRegistry.prototype.register = function(namespace, eventname, classname, 
+kukit.er.EventRegistry.prototype.register = function(namespace, eventname, klass,
         bindmethodname, defaultactionmethodname) {
     if (typeof(defaultactionmethodname) == 'undefined') {
         throw 'EventRegistry.register misses some parameters';
     }
-    if (!eventname || !classname) {
-        throw 'In EventRegistry.register eventname, classname must be non-empty';
+    // Find out the class name. (Not specified now.)
+    classname = klass.prototype.__classname__;
+    if (typeof(classname) == 'undefined') {
+        // Create a classname, and register it too.
+        classname = '' + kukit.er.eventClassCounter;
+        kukit.er.eventClassCounter += 1;
+        this.registerBinder(classname, klass);
+        klass.prototype.__classname__ = classname;
+    }
+    if (!eventname) {
+        throw 'In EventRegistry.register eventname must be non-empty';
     }
     var key = this._getKey(namespace, eventname);
     var entry = this.content[key];
@@ -133,7 +136,7 @@
 *  executed in the KSS.
 */
 
-kukit.er.Event__trigger_action__ = function(name, parms, node) {
+kukit.er.Event__trigger_event__ = function(name, parms, node) {
     // Can be called from programs to execute an action programmatically.
     var eventrule =  kukit.rd.methodTable.getMergedRule('kss', name, this);
     // getMergedRule gave a warning (once by page), so be silent if not found
@@ -143,8 +146,8 @@
 };
 
 
-kukit.er.decorateEventClass = function(cls) {
-    cls.prototype.__trigger_action__ = kukit.er.Event__trigger_action__;
+kukit.er.decorateEventBinderClass = function(cls) {
+    cls.prototype.__trigger_event__ = kukit.er.Event__trigger_event__;
 };
 
 /* Event instance registry 
@@ -162,7 +165,7 @@
     var eventinstance = this.content[id];
     if (typeof(eventinstance) == 'undefined') {
         // Create a new event.
-        eventinstance = this.content[id] = new (kukit.er.eventClassRegistry.get(classname))();
+        eventinstance = this.content[id] = new (kukit.er.eventRegistry.getBinder(classname))();
         // decorate it with id and class
         eventinstance.__event_id__ = id;
         eventinstance.__event_classname__ = classname;

Modified: kukit/kukit.js/trunk/kukit/kukit.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kukit.js	(original)
+++ kukit/kukit.js/trunk/kukit/kukit.js	Thu Jul  6 19:59:04 2006
@@ -186,6 +186,10 @@
     return this.elements[0];
 };
 
+/* State vars srorage. This can be used from kss via a method. */
+
+kukit.statevars = {};
+
 /* instantiate request manager */
 
 kukit.requestManager = new kukit.RequestManager();
@@ -428,7 +432,7 @@
         }
         kukit.log('Command params: '+ has_params);
         if (selector != "" && has_params && name != "") {
-            var command = new kukit.makeCommand(selector, name, type, params, transport);
+            var command = new kukit.cr.makeCommand(selector, name, type, params, transport);
             this.addCommand(command);
         }
     }
@@ -547,180 +551,3 @@
     return result;
 };
 
-/* Command registry */
-
-kukit.CommandRegistry = function () {
-    this.content = {};
-};
-
-kukit.CommandRegistry.prototype.register = function(name, klass) {
-    if (this.content[name]) {
-        // Do not allow redefinition
-        kukit.logError('Error : redefinition attempt of command ' + name);
-        return;
-        }
-    this.content[name] = klass;
-};
-
-kukit.CommandRegistry.prototype.get = function(name) {
-    var klass = this.content[name];
-    if (! klass) {
-        // not found
-        kukit.logError('Error : undefined command ' + name);
-        }
-    return klass;
-};
-
-kukit.commandRegistry = new kukit.CommandRegistry();
-
-/* Command factories */
-
-kukit.makeCommand = function(selector, name, type, params, transport) {
-    var commandClass = kukit.commandRegistry.get(name);
-    var command = new commandClass();
-    command.selector = selector;
-    command.name = name;
-    command.selectorType = type;
-    command.params = params;
-    command.transport = transport;
-    return command;
-}
-
-kukit._Command_execute_selector = function() {
-    kukit.logDebug('Selector type: ' + this.selectorType);
-    kukit.logDebug('Selector : ' + this.selector);
-    var selfunc = kukit.selectors.get(this.selectorType);
-    var nodes = selfunc(this.selector);
-    if (!nodes || nodes.length == 0) {
-        kukit.logError('Command found no nodes');
-    }
-    for (var i=0;i < nodes.length;i++) {
-        var node = nodes[i];
-        //XXX error handling for wrong command name
-        kukit.logDebug('Command Name: ' + this.name);
-        this.executeOnSingleNode(node);
-    }
-};
-
-kukit.makeSelectorCommand = function(name, executeOnSingleNode) {
-    var commandClass = function() {};
-    commandClass.prototype = {
-        execute: kukit._Command_execute_selector,
-        executeOnSingleNode: executeOnSingleNode
-    };
-    kukit.commandRegistry.register(name, commandClass); 
-};
-
-kukit.makeGlobalCommand = function(name, executeOnce) {
-    var commandClass = function() {};
-    commandClass.prototype = {
-        execute: executeOnce
-    };
-    kukit.commandRegistry.register(name, commandClass); 
-};
-
-/* Core commands */
-
-// innerHTML
-kukit.makeSelectorCommand('setHtmlAsChild', function(node) {
-    var content = document.importNode(this.params['html'], true);
-    Sarissa.clearChildNodes(node);
-    kukit.dom.appendChildren(content.childNodes, node);
-    kukit.setupEvents(node);
-});
-
-// outerHTML ?
-kukit.makeSelectorCommand('replaceNode', function(node) {
-    var childNodes = this.params['html'].childNodes;
-    var sourceSelector = this.params['selector'].firstChild.nodeValue || null;
-    var parentNode = node.parentNode;
-    var newNode = parentNode.cloneNode(false);
-    try {
-        kukit.dom.appendChildren(childNodes, newNode);
-    } catch(exc) {
-        newNode.innerHTML = Sarissa.serialize(this.params['html']);
-    }
-    if (sourceSelector) {
-        var element = cssQuery(sourceSelector, newNode)[0];
-        if (element)
-            parentNode.replaceChild(element, node);
-        else
-            kukit.logDebug("Found no elements in response with selector '"+sourceSelector+"'.");
-    } else {
-        parentNode.replaceChild(newNode.firstChild, node);
-    }
-    kukit.setupEvents(parentNode);
-});
-
-
-kukit.makeSelectorCommand('setAttribute', function(node) {
-    var name = this.params['name'].firstChild.nodeValue;
-    var value = this.params['value'].firstChild.nodeValue;
-    node.setAttribute(name, value);
-});
-
-kukit.makeSelectorCommand('addAfter', function(node) {
-    var content = document.importNode(this.params['html'], true);
-    var parentNode = node.parentNode;
-    var toNode = kukit.dom.getNextSiblingTag(node);
-    if (toNode == null) {
-        var inserted = kukit.dom.appendChildren(content.childNodes, parentNode);
-    } else {
-        var inserted = kukit.dom.insertBefore(content, parentNode, toNode);
-    }
-    // update the events for the new nodes
-    kukit.logDebug("Inserted nodes length: "+inserted.length);
-    kukit.setupEvents(node);
-});
-
-kukit.makeSelectorCommand('removeNextSibling', function(node) {
-    kukit.logDebug('removeNextSibling');
-    var parentNode = node.parentNode;
-    var toNode = kukit.dom.getNextSiblingTag(node);
-    if (toNode != null) {
-        parentNode.removeChild(toNode);
-    }  
-});
-
-kukit.makeSelectorCommand('removePreviousSibling', function(node) {
-    kukit.logDebug('removePreviousSibling');
-    var parentNode = node.parentNode;
-    var toNode = kukit.dom.getPreviousSiblingTag(node);
-    parentNode.removeChild(toNode);
-});
-
-kukit.makeSelectorCommand('removeNode', function(node) {
-    var parentNode = node.parentNode;
-    parentNode.removeChild(node);
-});
-
-kukit.makeSelectorCommand('clearChildren', function(node) {
-    Sarissa.clearChildNodes(node);
-});
-
-kukit.makeSelectorCommand('moveNodeAfter', function(node) {
-    var parentNode = node.parentNode;
-    parentNode.removeChild(node);
-      
-    var id = this.params['html_id'].firstChild.nodeValue;
-    var toNode = document.getElementById(id);
-      
-    var nextNode = kukit.dom.getNextSiblingTag(toNode);
-    if (nextNode == null) {
-        toNode.parentNode.appendChild(node);
-    } else {
-        parentNode.insertBefore(node, nextNode);
-    }
-});
-
-kukit.makeSelectorCommand('copyChildrenFrom', function(node) {
-    var id = this.params['html_id'].firstChild.nodeValue;
-    var fromNode = document.getElementById(id);
-    Sarissa.copyChildNodes(fromNode, node);
-});
-
-kukit.makeSelectorCommand('copyChildrenTo', function(node) {
-    var id = this.params['html_id'].firstChild.nodeValue;
-    toNode = document.getElementById(id);
-    Sarissa.copyChildNodes(node, toNode);
-})

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Thu Jul  6 19:59:04 2006
@@ -34,25 +34,32 @@
     return newparms;
 };
 
+kukit.pl.evalBool = function(parms, key, errname) {
+    value = parms[key];
+    if (value == 'true' || value == 'True' || value == '1') {
+        value = true;
+    } else if (value == 'false' || value == 'False' || value == '0' || value == '') {
+        value = false;
+    } else {
+        throw 'Bad boolean value "' + value + '" for key "' + key + '" in ' + errname;
+    }
+    parms[key] = value;
+};
+
 /* 
 * Event plugins 
 * 
-* __trigger_action__(name, parms, node)
+* __trigger_event__(name, parms, node)
 * is a method bound to each class, so methods can call
 * it up to call an event action bound through kss.
 *
 * The event binder hooks
 * __bind__(name, parms, func_to_bind)
-* __bind_<name>__(parms, func_to_bind)
 * should be defined to make binding of event to the given function.
-* (Return true if binding was successful.)
 *
 * The event action hooks
 * __exec__(name, parms, node)
-* __exec_<name>__(parms, node)
-* can be defined to override the default event action.
-* (Return true if execution was successful or false if
-* chain should be continued.)
+* can be defined to specify a default event action.
 *
 */
 
@@ -75,14 +82,18 @@
 };
 
 
-kukit.pl.NativeEvent = function() {
+kukit.pl.NativeEventBinder = function() {
 };
 
-kukit.pl.NativeEvent.prototype.__bind__ = function(name, parms, func_to_bind, node) {
-    parms = kukit.pl.completeParms(parms, [], {}, 'native event binding');
+kukit.pl.NativeEventBinder.prototype.__bind__ = function(name, parms, func_to_bind, node) {
+    parms = kukit.pl.completeParms(parms, [], {'preventdefault': ''}, 'native event binding');
+    kukit.pl.evalBool(parms, 'preventdefault', 'native event binding');
     if (node == null) {
         throw 'Native event must be bound to a node.';
     }
+    if (parms.preventdefault && name != 'click') {
+        throw 'In native events only the click event can have preventdefault.';
+    }
     var func = function(e) {
         target = kukit.pl.getTargetForBrowserEvent(e);
         if (target == node) {
@@ -91,14 +102,25 @@
         } else {
             kukit.log('Ignored event for "' + name + '", possibly wrong target');
         }
+    };
+    if (parms.preventdefault) {
+        var func_prevent = function(e) {
+            func(e);
+            // Cancel default event
+            // W3C style
+            if (e.preventDefault)
+                e.preventDefault();
+            // MS style
+            try { e.returnValue = false; } catch (exc) {}
+        };
+        kukit.registerEventListener(node, name, func_prevent);
+    } else {
+        kukit.registerEventListener(node, name, func);
     }
-    kukit.registerEventListener(node, name, func);
-    return true;
 };
 
-kukit.er.eventClassRegistry.register('native', kukit.pl.NativeEvent);
-kukit.er.eventRegistry.register(null, 'click', 'native', '__bind__', null);
-kukit.er.eventRegistry.register(null, 'change', 'native', '__bind__', null);
+kukit.er.eventRegistry.register(null, 'click', kukit.pl.NativeEventBinder, '__bind__', null);
+kukit.er.eventRegistry.register(null, 'change', kukit.pl.NativeEventBinder, '__bind__', null);
 
 // Timer events. The binding of this event will start one counter
 // per event rule. No matter how many nodes matched it. 
@@ -125,11 +147,11 @@
     this.start();
 };
 
-kukit.pl.TimeoutEvent = function() {
+kukit.pl.TimeoutEventBinder = function() {
     this.counters = {};
 };
 
-kukit.pl.TimeoutEvent.prototype.__bind__ = function(name, parms, func_to_bind, node, eventrule) {
+kukit.pl.TimeoutEventBinder.prototype.__bind__ = function(name, parms, func_to_bind, node, eventrule) {
     parms = kukit.pl.completeParms(parms, ['delay'], {}, 'timeout event binding');
     var key = eventrule.getNr();
     if (this.counters[key]) {
@@ -144,58 +166,20 @@
         // Start the counter
         counter.start();
     }
-    // Success in any case.
-    return true;
-};
-
-kukit.er.eventClassRegistry.register('timeout', kukit.pl.TimeoutEvent);
-kukit.er.eventRegistry.register(null, 'timeout', 'timeout', '__bind__', null);
-
-// CancelSubmitClick. This is a mutated version of
-// the browser click event.
-
-kukit.pl.CancelSubmitClickEvent = function() {
-};
-
-kukit.pl.CancelSubmitClickEvent.prototype.__bind__ = function(name, parms, func_to_bind, node) {
-    parms = kukit.pl.completeParms(parms, [], {}, 'cancelSubmitClick event binding');
-    if (node == null) {
-        throw 'cancelSubmitClick event must be bound to a node.';
-    }
-    var func = function(e) {
-        target = kukit.pl.getTargetForBrowserEvent(e);
-        if (target == node) {
-            // Execute the action
-            func_to_bind();
-        } else {
-            kukit.log('Ignored event for "' + name + '", possibly wrong target')
-        }
-        // Cancel default event
-        // W3C style
-        if (e.preventDefault)
-            e.preventDefault();
-        // MS style
-        try { e.returnValue = false; } catch (exc) {}
-    }
-    kukit.registerEventListener(node, 'click', func);
-    return true;
 };
 
-kukit.er.eventClassRegistry.register('cancelSubmitClick', kukit.pl.CancelSubmitClickEvent);
-kukit.er.eventRegistry.register(null, 'cancelSubmitClick', 'cancelSubmitClick', '__bind__', null);
+kukit.er.eventRegistry.register(null, 'timeout', kukit.pl.TimeoutEventBinder, '__bind__', null);
 
-kukit.pl.LoadEvent = function() {
+kukit.pl.LoadEventBinder = function() {
 };
 
-kukit.pl.LoadEvent.prototype.__bind__ = function(name, parms, func_to_bind, node) {
+kukit.pl.LoadEventBinder.prototype.__bind__ = function(name, parms, func_to_bind, node) {
     parms = kukit.pl.completeParms(parms, [], {}, 'load event binding');
     // Just execute the action right now.
     func_to_bind()
-    return true;
 };
 
-kukit.er.eventClassRegistry.register('load', kukit.pl.LoadEvent);
-kukit.er.eventRegistry.register(null, 'load', 'load', '__bind__', null);
+kukit.er.eventRegistry.register(null, 'load', kukit.pl.LoadEventBinder, '__bind__', null);
 
 
 /* Core actions
@@ -260,4 +244,113 @@
     }
 );
 
+/* Core commands */
+
+// innerHTML
+kukit.cr.makeSelectorCommand('setHtmlAsChild', function(node) {
+    var content = document.importNode(this.params['html'], true);
+    Sarissa.clearChildNodes(node);
+    kukit.dom.appendChildren(content.childNodes, node);
+    kukit.setupEvents(node);
+});
+
+// outerHTML ?
+kukit.cr.makeSelectorCommand('replaceNode', function(node) {
+    var childNodes = this.params['html'].childNodes;
+    var sourceSelector = this.params['selector'].firstChild.nodeValue || null;
+    var parentNode = node.parentNode;
+    var newNode = parentNode.cloneNode(false);
+    try {
+        kukit.dom.appendChildren(childNodes, newNode);
+    } catch(exc) {
+        newNode.innerHTML = Sarissa.serialize(this.params['html']);
+    }
+    if (sourceSelector) {
+        var element = cssQuery(sourceSelector, newNode)[0];
+        if (element)
+            parentNode.replaceChild(element, node);
+        else
+            kukit.logDebug("Found no elements in response with selector '"+sourceSelector+"'.");
+    } else {
+        parentNode.replaceChild(newNode.firstChild, node);
+    }
+    kukit.setupEvents(parentNode);
+});
+
+kukit.cr.makeSelectorCommand('setAttribute', function(node) {
+    var name = this.params['name'].firstChild.nodeValue;
+    var value = this.params['value'].firstChild.nodeValue;
+    node.setAttribute(name, value);
+});
+
+kukit.cr.makeSelectorCommand('addAfter', function(node) {
+    var content = document.importNode(this.params['html'], true);
+    var parentNode = node.parentNode;
+    var toNode = kukit.dom.getNextSiblingTag(node);
+    if (toNode == null) {
+        var inserted = kukit.dom.appendChildren(content.childNodes, parentNode);
+    } else {
+        var inserted = kukit.dom.insertBefore(content, parentNode, toNode);
+    }
+    // update the events for the new nodes
+    kukit.logDebug("Inserted nodes length: "+inserted.length);
+    kukit.setupEvents(node);
+});
+
+kukit.cr.makeSelectorCommand('removeNextSibling', function(node) {
+    kukit.logDebug('removeNextSibling');
+    var parentNode = node.parentNode;
+    var toNode = kukit.dom.getNextSiblingTag(node);
+    if (toNode != null) {
+        parentNode.removeChild(toNode);
+    }  
+});
+
+kukit.cr.makeSelectorCommand('removePreviousSibling', function(node) {
+    kukit.logDebug('removePreviousSibling');
+    var parentNode = node.parentNode;
+    var toNode = kukit.dom.getPreviousSiblingTag(node);
+    parentNode.removeChild(toNode);
+});
+
+kukit.cr.makeSelectorCommand('removeNode', function(node) {
+    var parentNode = node.parentNode;
+    parentNode.removeChild(node);
+});
+
+kukit.cr.makeSelectorCommand('clearChildren', function(node) {
+    Sarissa.clearChildNodes(node);
+});
+
+kukit.cr.makeSelectorCommand('moveNodeAfter', function(node) {
+    var parentNode = node.parentNode;
+    parentNode.removeChild(node);
+      
+    var id = this.params['html_id'].firstChild.nodeValue;
+    var toNode = document.getElementById(id);
+      
+    var nextNode = kukit.dom.getNextSiblingTag(toNode);
+    if (nextNode == null) {
+        toNode.parentNode.appendChild(node);
+    } else {
+        parentNode.insertBefore(node, nextNode);
+    }
+});
 
+kukit.cr.makeSelectorCommand('copyChildrenFrom', function(node) {
+    var id = this.params['html_id'].firstChild.nodeValue;
+    var fromNode = document.getElementById(id);
+    Sarissa.copyChildNodes(fromNode, node);
+});
+
+kukit.cr.makeSelectorCommand('copyChildrenTo', function(node) {
+    var id = this.params['html_id'].firstChild.nodeValue;
+    toNode = document.getElementById(id);
+    Sarissa.copyChildNodes(node, toNode);
+});
+
+kukit.cr.makeGlobalCommand('setStatevar', function(node) {
+    var varname = this.params['varname'].firstChild.nodeValue;
+    var value = this.params['value'].firstChild.nodeValue;
+    kukit.statevars[varname] = value;
+});

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Thu Jul  6 19:59:04 2006
@@ -100,9 +100,9 @@
                 throw 'nodeattr method needs 1 argument (attrname)';
             }
         } break;
-        case 'eval': {
+        case 'statevar': {
             if (this.args.length != 1) {
-                throw 'eval method needs 1 argument (expression)';
+                throw 'statevar method needs 1 argument (varname)';
             }
         } break;
         default: {
@@ -131,9 +131,14 @@
             }
             parms[key] = value;
         } break;
-        case 'eval': {
-            // XXX do it with the variable registry
-            parms[key] = eval(this.args[0]);
+        case 'statevar': {
+            var key = this.args[0];
+            var value = kukit.statevars[key];
+            if (typeof(value) == 'undefined') {
+                // notfound arguments will get null
+                throw 'Nonexistent statevar "'+ key +'"';
+            }
+            parms[key] = value;
         } break;
         default: {
             throw 'Ignored kss parameter method.';
@@ -527,7 +532,6 @@
     }
     // look up the rule and merge if necessary
     var namespace = eventinstance.__event_namespace__;
-    var classname = eventinstance.__event_classname__;
     var id = eventinstance.__event_id__;
     var mergeid = kukit.rd.makeMergeId(id, namespace, name);
     var mergedrule = dict[mergeid];

Modified: kukit/kukit.js/trunk/tests/runner.html
==============================================================================
--- kukit/kukit.js/trunk/tests/runner.html	(original)
+++ kukit/kukit.js/trunk/tests/runner.html	Thu Jul  6 19:59:04 2006
@@ -21,6 +21,7 @@
         <script type="text/javascript" src="../kukit/kssparser.js"> </script>
         <script type="text/javascript" src="../kukit/eventreg.js"> </script>
         <script type="text/javascript" src="../kukit/actionreg.js"> </script>
+        <script type="text/javascript" src="../kukit/commandreg.js"> </script>
         <script type="text/javascript" src="../kukit/forms.js"> </script>
         <script type="text/javascript" src="../kukit/plugin.js"> </script>
         <script type="text/javascript" src="test_tokenizer.js"> </script>

Modified: kukit/kukit.js/trunk/tests/runtests.sh
==============================================================================
--- kukit/kukit.js/trunk/tests/runtests.sh	(original)
+++ kukit/kukit.js/trunk/tests/runtests.sh	Thu Jul  6 19:59:04 2006
@@ -7,6 +7,7 @@
 	-f ../kukit/kssparser.js \
 	-f ../kukit/eventreg.js \
 	-f ../kukit/actionreg.js \
+	-f ../kukit/commandreg.js \
 	-f ../kukit/forms.js \
 	-f ../kukit/plugin.js \
 	-f test_tokenizer.js \

From reebalazs at codespeak.net  Thu Jul  6 19:59:21 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu,  6 Jul 2006 19:59:21 +0200 (CEST)
Subject: [Kukit-checkins] r29707 - in kukit/azax/trunk: . plugins
Message-ID: <20060706175921.0C76510090@code0.codespeak.net>

Author: reebalazs
Date: Thu Jul  6 19:59:19 2006
New Revision: 29707

Modified:
   kukit/azax/trunk/azaxview.py
   kukit/azax/trunk/configure.zcml
   kukit/azax/trunk/plugins/configure.zcml
Log:
Refactoring

- Moved command registry to its own js file

- Get rid of 'eval' parameter method, add 'statevar' and a 
  'setStatevar' command.

- Refactor CancelSubmitClick into the native click, preventdefault parm

- XxxEvent -> XxxEventBinder, in plugins

- Get rid of classname on event registration

- Refactor: event class -> binder,
  __trigger_action__ -> __trigger_event__


Modified: kukit/azax/trunk/azaxview.py
==============================================================================
--- kukit/azax/trunk/azaxview.py	(original)
+++ kukit/azax/trunk/azaxview.py	Thu Jul  6 19:59:19 2006
@@ -140,7 +140,7 @@
         self.copyChildrenTo(selector, id)
         self.clearChildren(selector)
 
-    def executeCode(self, selector, code):
-        code = XmlParser(code)()
-        command = self.addCommand('executeCode', selector)
-        data = command.addParam('code', code)
+    def setStatevar(self, varname, value):
+        command = self.addCommand('setStatevar')
+        command.addParam('varname', varname)
+        command.addParam('value', value)

Modified: kukit/azax/trunk/configure.zcml
==============================================================================
--- kukit/azax/trunk/configure.zcml	(original)
+++ kukit/azax/trunk/configure.zcml	Thu Jul  6 19:59:19 2006
@@ -17,6 +17,7 @@
         kukit/kukit/kssparser.js
         kukit/kukit/eventreg.js
         kukit/kukit/actionreg.js
+        kukit/kukit/commandreg.js
         kukit/kukit/forms.js
         kukit/kukit/plugin.js"
     name="kukit.js"

Modified: kukit/azax/trunk/plugins/configure.zcml
==============================================================================
--- kukit/azax/trunk/plugins/configure.zcml	(original)
+++ kukit/azax/trunk/plugins/configure.zcml	Thu Jul  6 19:59:19 2006
@@ -70,7 +70,10 @@
      <azax:registerCommand
           name="copyChildrenTo"
           />
-          
+
+    <azax:registerCommand
+          name="setStatevar"
+          />
           
      <!-- Event types -->
 
@@ -83,7 +86,7 @@
         />
 
     <azax:registerEventType
-        name="cancelSubmitClick"
+        name="load"
         />
         
      <!-- Event actions -->

From reebalazs at codespeak.net  Thu Jul  6 19:59:56 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu,  6 Jul 2006 19:59:56 +0200 (CEST)
Subject: [Kukit-checkins] r29708 - kukit/azaxdemo/trunk/browser
Message-ID: <20060706175956.92A541008D@code0.codespeak.net>

Author: reebalazs
Date: Thu Jul  6 19:59:55 2006
New Revision: 29708

Modified:
   kukit/azaxdemo/trunk/browser/cancel_submit.kss
   kukit/azaxdemo/trunk/browser/more_selectors.js
Log:
Refactoring

- Moved command registry to its own js file

- Get rid of 'eval' parameter method, add 'statevar' and a 
  'setStatevar' command.

- Refactor CancelSubmitClick into the native click, preventdefault parm

- XxxEvent -> XxxEventBinder, in plugins

- Get rid of classname on event registration

- Refactor: event class -> binder,
  __trigger_action__ -> __trigger_event__


Modified: kukit/azaxdemo/trunk/browser/cancel_submit.kss
==============================================================================
--- kukit/azaxdemo/trunk/browser/cancel_submit.kss	(original)
+++ kukit/azaxdemo/trunk/browser/cancel_submit.kss	Thu Jul  6 19:59:55 2006
@@ -1,4 +1,5 @@
-input#submit:cancelSubmitClick {
+input#submit:click {
+    evt-click-preventdefault: true;
     action-server: save;
     save-text_save: currentformvar(text_save);
 }

Modified: kukit/azaxdemo/trunk/browser/more_selectors.js
==============================================================================
--- kukit/azaxdemo/trunk/browser/more_selectors.js	(original)
+++ kukit/azaxdemo/trunk/browser/more_selectors.js	Thu Jul  6 19:59:55 2006
@@ -20,7 +20,7 @@
     this.countsomuch = count;
     this.count = this.countsomuch;
     // Just bind the event via the native event binder
-    kukit.pl.NativeEvent.prototype.__bind__('click', {}, func_to_bind, node);
+    kukit.pl.NativeEventBinder.prototype.__bind__('click', {}, func_to_bind, node);
 };
 
 kukit.more_selectors.AnnoyClickerEvent.prototype.__default_click__ = function(name, parms, node) {
@@ -28,15 +28,13 @@
     if (this.count == 0) {
         // Continue with the real action.
         this.count = this.countsomuch;
-        this.__trigger_action__('doit', parms, node);
+        this.__trigger_event__('doit', parms, node);
     } else {
-        this.__trigger_action__('annoy', parms, node);
+        this.__trigger_event__('annoy', parms, node);
     }
 };
 
-kukit.er.eventClassRegistry.register('annoyClicker', kukit.more_selectors.AnnoyClickerEvent);
-kukit.er.eventRegistry.register('annoyclicker', 'click', 'annoyClicker', '__bind_click__', '__default_click__');
-kukit.er.eventRegistry.register('annoyclicker', 'annoy', 'annoyClicker', null, null);
-kukit.er.eventRegistry.register('annoyclicker', 'doit', 'annoyClicker', null, null);
-
+kukit.er.eventRegistry.register('annoyclicker', 'click', kukit.more_selectors.AnnoyClickerEvent, '__bind_click__', '__default_click__');
+kukit.er.eventRegistry.register('annoyclicker', 'annoy', kukit.more_selectors.AnnoyClickerEvent, null, null);
+kukit.er.eventRegistry.register('annoyclicker', 'doit', kukit.more_selectors.AnnoyClickerEvent, null, null);
 

From reebalazs at codespeak.net  Thu Jul  6 20:00:08 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu,  6 Jul 2006 20:00:08 +0200 (CEST)
Subject: [Kukit-checkins] r29709 - kukit/bluekit/trunk/browser
Message-ID: <20060706180008.6B35310092@code0.codespeak.net>

Author: reebalazs
Date: Thu Jul  6 20:00:06 2006
New Revision: 29709

Modified:
   kukit/bluekit/trunk/browser/mockup.js
Log:
Refactoring

- Moved command registry to its own js file

- Get rid of 'eval' parameter method, add 'statevar' and a 
  'setStatevar' command.

- Refactor CancelSubmitClick into the native click, preventdefault parm

- XxxEvent -> XxxEventBinder, in plugins

- Get rid of classname on event registration

- Refactor: event class -> binder,
  __trigger_action__ -> __trigger_event__


Modified: kukit/bluekit/trunk/browser/mockup.js
==============================================================================
--- kukit/bluekit/trunk/browser/mockup.js	(original)
+++ kukit/bluekit/trunk/browser/mockup.js	Thu Jul  6 20:00:06 2006
@@ -10,8 +10,7 @@
 
 //var foo = new Foo();
 
-kukit.er.eventClassRegistry.register('update', Foo);
-kukit.er.eventRegistry.register('bluekit', 'update', 'update', '__bind__', '__exec__');
+kukit.er.eventRegistry.register('bluekit', 'update', Foo, '__bind__', '__exec__');
 
 Foo.prototype.__bind__ = function(name, parms, func_to_bind, node) {
     kukit.registerEventListener(node, 'click', func_to_bind);

From reebalazs at codespeak.net  Sun Jul  9 11:20:17 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sun,  9 Jul 2006 11:20:17 +0200 (CEST)
Subject: [Kukit-checkins] r29878 - kukit/kukit.js/trunk/kukit
Message-ID: <20060709092017.CE1F510076@code0.codespeak.net>

Author: reebalazs
Date: Sun Jul  9 11:20:15 2006
New Revision: 29878

Modified:
   kukit/kukit.js/trunk/kukit/eventreg.js
   kukit/kukit.js/trunk/kukit/plugin.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
Log:
Default action fixes

- The default action needs to be executed if it is defined on the event,
  even if no parameters are bound to it from the kss eventrule.

- If an event is triggered programatically via a __trigger_event__ call,
  then it has to be executed even if there is no corresponding rule for it
  (kss:eventname) in the kss. This means that if no parameters are needed,
  the empty rule can be omitted from kss.

- The js caller should be able to specify parms at
  the __trigger_event__ call, and in this case the action (local or
  remote) gets these parameters - in addition they get overwritten by the
  parameters actually specified for the action, as usual.  



Modified: kukit/kukit.js/trunk/kukit/eventreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/eventreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/eventreg.js	Sun Jul  9 11:20:15 2006
@@ -131,23 +131,54 @@
 *
 */
 
+kukit.er.EventBinder_calldefault = function(namespace, name, parms, node) {
+    // private method for calling just a default method.
+    // params should be alredy prepared.
+    var methodname = kukit.er.eventRegistry.get(namespace, name).defaultactionmethodname
+    if (methodname) {
+        var method = this[methodname];
+        if (! method) {
+            throw 'Could not bind event name "' + name + '" on namespace "' + namespace + '", because the method "' + methodname + '" does not exist.';
+            }
+        // call it
+        method.call(this, name, parms, node);
+    }
+}
+
 /* This can be called on the event and will execute the
 *  desired event action. Parameters will be these + those
 *  executed in the KSS.
+*
+* Call example: eventinstance.__trigger_event__('doit', {'extravalue': '5'}, node);
 */
 
-kukit.er.Event__trigger_event__ = function(name, parms, node) {
-    // Can be called from programs to execute an action programmatically.
-    var eventrule =  kukit.rd.methodTable.getMergedRule('kss', name, this);
-    // getMergedRule gave a warning (once by page), so be silent if not found
+kukit.er.EventBinder__trigger_event__ = function(name, parms, node) {
+    // Called programmatically: look up the event rule. This may fail
+    // but yet we want to execute a default action in this case.
+    eventrule =  kukit.rd.methodTable.getMergedRule('kss', name, this);
+    this._EventBinder_triggerevent(name, parms, node, eventrule);
+}
+
+kukit.er.EventBinder_triggerevent = function(name, parms, node, eventrule) {
+    // Private. Called from __trigger_event__ or from main event execution.
+
     if (eventrule) {
-       eventrule.trigger_event(node, this); 
+        // Call the actions, if we had an event rule.
+        // This includes calling the default action.
+        eventrule.actions.execute(node, eventrule, parms, this);
+    } else {
+        // In case there is no event rule, just call the default event action.
+        // Parms cannot be specified this way. This is implicit calling.
+        var namespace = this.__event__namespace__;
+        kukit.logWarning('Calling implicit event "' + name + '" on namespace "' + namespace + '"')
+        this._EventBinder_calldefault(namespace, name, parms, node);
     }
 };
 
-
 kukit.er.decorateEventBinderClass = function(cls) {
-    cls.prototype.__trigger_event__ = kukit.er.Event__trigger_event__;
+    cls.prototype.__trigger_event__ = kukit.er.EventBinder__trigger_event__;
+    cls.prototype._EventBinder_triggerevent = kukit.er.EventBinder_triggerevent;
+    cls.prototype._EventBinder_calldefault = kukit.er.EventBinder_calldefault;
 };
 
 /* Event instance registry 

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Sun Jul  9 11:20:15 2006
@@ -127,9 +127,13 @@
 // The timer will tick for ever (i.e. won't stop
 // even if the binding nodes are all deleted)
 
-kukit.pl.TimerCounter = function(delay, func) {
+kukit.pl.TimerCounter = function(delay, func, restart) {
     this.delay = delay;
     this.func = func;
+    if (typeof(restart) == 'undefined') {
+        restart = false;
+    }
+    this.restart = restart;
 };
 
 kukit.pl.TimerCounter.prototype.start = function() {
@@ -144,7 +148,9 @@
     // Call the event action
     this.func();
     // Restart the timer
-    this.start();
+    if (this.restart) {
+        this.start();
+    }
 };
 
 kukit.pl.TimeoutEventBinder = function() {
@@ -161,7 +167,7 @@
     } else {   
         kukit.logDebug('timer event key entered for actionEvent #' + key + ' ' 
             + eventrule.selector);
-        var counter = new kukit.pl.TimerCounter(parms.delay, func_to_bind) 
+        var counter = new kukit.pl.TimerCounter(parms.delay, func_to_bind, true) 
         this.counters[key] = counter;
         // Start the counter
         counter.start();

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Sun Jul  9 11:20:15 2006
@@ -233,48 +233,12 @@
         }
     var self = this;
     var func_to_bind = function() {
-        self.trigger_event(node, eventinstance);
+        eventinstance._EventBinder_triggerevent(name, {}, node, self);
     }
     // do the binding    
     method.call(eventinstance, name, parms, func_to_bind, node, this);
 };
 
-/*
-* trigger_event(node, eventinstance) : calls event trigger hook on event instance.
-*  These hooks are tried in order, if succeeds it must return true:
-*
-* __exec__(name, parms, node)
-* __exec_<name>__(parms, node)
-* <<bound action for the event>>
-*
-* One of them executes in each case.
-*
-*/
-
-kukit.rd.EventRule.prototype.trigger_event = function(node, eventinstance) {
-    // Take care of the default action - if any.
-    var namespace = this.kss_selector.namespace;
-    var name = this.kss_selector.name;
-    var methodname = kukit.er.eventRegistry.get(namespace, name).defaultactionmethodname
-    if (methodname) {
-        var method = eventinstance[methodname];
-        if (! method) {
-            throw 'Could not bind event name "' + name + '" on namespace "' + namespace + '", because the method "' + methodname + '" does not exist.';
-            }
-        // get the default action parms
-        var defaultaction = this.actions.getDefaultAction();
-        var parms;
-        if (defaultaction) {
-            parms = defaultaction.getParms(node);
-        } else {
-            parms = {};
-        }
-        // call it
-        method.call(eventinstance, name, parms, node);
-    }
-    // Call the actions, in any case
-    this.actions.execute(node, this);
-};
 
 //
 // Merging event rules
@@ -357,10 +321,18 @@
     }
 };
 
-kukit.rd.ActionSet.prototype.execute = function(node, eventrule) {
+kukit.rd.ActionSet.prototype.execute = function(node, eventrule, defaultparms, eventinstance) {
     for (var key in this.content) {
         var action = this.content[key];
-        action.execute(node, eventrule);
+        action.execute(node, eventrule, defaultparms, eventinstance);
+    }
+    // Execute the default action in case of there is one but there were no
+    // parameters so it was actually not entered as an action object
+    // otherwise, it would have been executed from action.execute already
+    if (typeof(this.content['default']) == 'undefined') {
+        var namespace = eventrule.kss_selector.namespace;
+        var name = eventrule.kss_selector.name;
+        eventinstance._EventBinder_calldefault(namespace, name, defaultparms, node);
     }
 };
 
@@ -407,9 +379,15 @@
 };
 
 
-kukit.rd.Action.prototype.getParms = function(node) {
+kukit.rd.Action.prototype.getParms = function(node, defaultparms) {
     // Return the completed action parameters, based on the node
+    // if defaultparms is given, it is used as the base.
     var parms = {};
+    if (typeof(defaultparms) != 'undefined') {
+        for (var key in defaultparms) {
+            parms[key] = defaultparms[key]; 
+        }
+    }
     for (var key in this.parms) {
         var kssvalue = this.parms[key]; 
         // evaluate the method parameters into parms
@@ -419,9 +397,14 @@
 };
 
 
-kukit.rd.Action.prototype.execute = function(node, eventrule) {
-    var parms = this.getParms(node);
-    if (this.isRemote) {
+kukit.rd.Action.prototype.execute = function(node, eventrule, defaultparms, eventinstance) {
+    var parms = this.getParms(node, defaultparms);
+    if (this.name == 'default') {
+        // Default action.
+        var namespace = eventrule.kss_selector.namespace;
+        var name = eventrule.kss_selector.name;
+        eventinstance._EventBinder_calldefault(namespace, name, parms, node);
+    } else if (this.isRemote) {
         // Remote action.
         var action = kukit.calculateAbsoluteURL(this.name);
         kukit.notifyServer(action, parms);
@@ -536,8 +519,7 @@
     var mergeid = kukit.rd.makeMergeId(id, namespace, name);
     var mergedrule = dict[mergeid];
     if (typeof(mergedrule) == 'undefined') {
-        throw 'No method rule found category="' + category + '", event name="' + name + '" id="' + id + 
-                    '" namespace="' + namespace + '"';
+        // no error, just return null.
         mergedrule = null;
     }
     return mergedrule;

From reebalazs at codespeak.net  Sun Jul  9 11:21:38 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sun,  9 Jul 2006 11:21:38 +0200 (CEST)
Subject: [Kukit-checkins] r29879 - kukit/azaxdemo/trunk/browser
Message-ID: <20060709092138.8DB0010076@code0.codespeak.net>

Author: reebalazs
Date: Sun Jul  9 11:21:37 2006
New Revision: 29879

Modified:
   kukit/azaxdemo/trunk/browser/more_selectors.js
Log:
Make the more selectors demo to pass no parameters, just to make it clearer

Modified: kukit/azaxdemo/trunk/browser/more_selectors.js
==============================================================================
--- kukit/azaxdemo/trunk/browser/more_selectors.js	(original)
+++ kukit/azaxdemo/trunk/browser/more_selectors.js	Sun Jul  9 11:21:37 2006
@@ -28,9 +28,9 @@
     if (this.count == 0) {
         // Continue with the real action.
         this.count = this.countsomuch;
-        this.__trigger_event__('doit', parms, node);
+        this.__trigger_event__('doit', {}, node);
     } else {
-        this.__trigger_event__('annoy', parms, node);
+        this.__trigger_event__('annoy', {}, node);
     }
 };
 

From reebalazs at codespeak.net  Wed Jul 12 17:57:10 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Wed, 12 Jul 2006 17:57:10 +0200 (CEST)
Subject: [Kukit-checkins] r29990 - kukit/bluekit/trunk/browser
Message-ID: <20060712155710.183031006E@code0.codespeak.net>

Author: reebalazs
Date: Wed Jul 12 17:57:09 2006
New Revision: 29990

Added:
   kukit/bluekit/trunk/browser/plugin.js
Log:
Oops, forgot to check in this

Added: kukit/bluekit/trunk/browser/plugin.js
==============================================================================
--- (empty file)
+++ kukit/bluekit/trunk/browser/plugin.js	Wed Jul 12 17:57:09 2006
@@ -0,0 +1,12 @@
+
+/* kss plugins for prototype, bling support */
+
+kukit.cr.makeGlobalCommand('prototypeResponse', function(node) {
+    parms = kukit.pl.completeParms(this.params, ['html'], {}, 'addAfter command');
+    parms.html = kukit.dom.forceToDom(parms.html);
+    // supposed to have a single cdata node
+    this.transport.responseText = parms.html.firstChild.data;
+    this.transport.responseXML = null;
+});
+
+

From reebalazs at codespeak.net  Mon Jul 17 07:58:03 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon, 17 Jul 2006 07:58:03 +0200 (CEST)
Subject: [Kukit-checkins] r30097 - in kukit/azax/trunk: . plugins
	plugins/json/browser
Message-ID: <20060717055803.997CA10091@code0.codespeak.net>

Author: reebalazs
Date: Mon Jul 17 07:58:00 2006
New Revision: 30097

Modified:
   kukit/azax/trunk/azaxview.py
   kukit/azax/trunk/commands.py
   kukit/azax/trunk/configure.zcml
   kukit/azax/trunk/parsers.py
   kukit/azax/trunk/plugins/configure.zcml
   kukit/azax/trunk/plugins/json/browser/jsonkukit.js
Log:
Refactoring (command parameters separation, __trigger_event__ fixes etc.)

  action, event, command helpers
  
  - add a triggerEvent command (can call back the same instance
  or another one by id)
  
  Make commands remember about the event that triggered them in return (as supplement data)

  Add command parameter conversion helpers

  When adding the parser output to the command, it must encode - best: ascii with xmlrefs

  Remove dummy "none" command params, fix IE incompatibility
  
  - remove the "none" param that was added to the empty commands
  
  Restructure command parameters
  
  - commands now except parms
  
  - json transport caught up with changes
  


Modified: kukit/azax/trunk/azaxview.py
==============================================================================
--- kukit/azax/trunk/azaxview.py	(original)
+++ kukit/azax/trunk/azaxview.py	Mon Jul 17 07:58:00 2006
@@ -79,7 +79,7 @@
     
     def setHtmlAsChild(self, selector, new_value):
         """ see interfaces.py """
-        new_value = HtmlParser(new_value)()
+        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
         command = self.addCommand('setHtmlAsChild', selector)
         data = command.addParam('html', new_value)
     
@@ -91,34 +91,25 @@
     
     def addAfter(self, selector, new_value):
         """ see interfaces.py """
-        new_value = HtmlParser(new_value)()
+        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
         command = self.addCommand('addAfter', selector)
         data = command.addParam('html', new_value)
 
     def clearChildren(self, selector):
         """ see interfaces.py """
         command = self.addCommand('clearChildren', selector)
-        data = command.addParam('none')
 
     def removeNode(self, selector):
         """ see interfaces.py """
         command = self.addCommand('removeNode', selector)
-        data = command.addParam('none')
-
-    def removeNode(self, selector):
-        """ see interfaces.py """
-        command = self.addCommand('removeNode', selector)
-        data = command.addParam('none')
 
     def removeNextSibling(self, selector):
         """ see interfaces.py """
         command = self.addCommand('removeNextSibling', selector)
-        data = command.addParam('none')
 
     def removePreviousSibling(self, selector):
         """ see interfaces.py """
         command = self.addCommand('removePreviousSibling', selector)
-        data = command.addParam('none')
 
     def copyChildrenFrom(self, selector, id):
         """ see interfaces.py """
@@ -144,3 +135,9 @@
         command = self.addCommand('setStatevar')
         command.addParam('varname', varname)
         command.addParam('value', value)
+
+    def triggerEvent(self, name, **kw):
+        command = self.addCommand('triggerEvent')
+        command.addParam('name', name)
+        for key, value in kw.iteritems():
+            command.addParam(key, value)

Modified: kukit/azax/trunk/commands.py
==============================================================================
--- kukit/azax/trunk/commands.py	(original)
+++ kukit/azax/trunk/commands.py	Mon Jul 17 07:58:00 2006
@@ -69,11 +69,52 @@
         self.name = name
         self.params = []
 
+    # --
+    # Different parameter conversions
+    # --
+
+    # REMARK: with the jsonserver product present, you can
+    # just send complex data types directly with AddParam
+
     def addParam(self, name, content=''):
+        'Add the param as is'
         param = AzaxParam(name, content)
         self.params.append(param)
         return param
 
+    #
+    # Some helpers
+    #
+
+    def addUnicodeParam(self, name, content=''):
+        'Add the param as unicode'
+        self.addParam(name, content=content)
+
+    def addStringParam(self, name, content='', encoding='utf'):
+        'Add the param as an encoded string, by default UTF-8'
+        content = unicode(content, 'utf')
+        self.addParam(name, content=content)
+
+    def addHtmlParam(self, name, content=''):
+        'Add the param as an HTML content.'
+        content = HtmlParser(content)().encode('ascii', 'xmlcharrefreplace')
+        self.addParam(name, content=content)
+
+    def addXmlParam(self, name, content=''):
+        'Add the param as XML content'
+        content = XmlParser(content)().encode('ascii', 'xmlcharrefreplace')
+        self.addParam(name, content=content)
+
+    def addCdataParam(self, name, content=''):
+        'Add the param as a CDATA node'
+        content = '<![CDATA[%s]]>' % (content, )
+        self.addParam(name, content=content)
+
+
+    # --
+    # Accessors, not sure if we need them
+    # --
+
     def getName(self):
         return self.name
 
@@ -86,6 +127,7 @@
     def getParams(self):
         return self.params
 
+
 class CommandView(object):
     '''View of a command.
     

Modified: kukit/azax/trunk/configure.zcml
==============================================================================
--- kukit/azax/trunk/configure.zcml	(original)
+++ kukit/azax/trunk/configure.zcml	Mon Jul 17 07:58:00 2006
@@ -17,6 +17,7 @@
         kukit/kukit/kssparser.js
         kukit/kukit/eventreg.js
         kukit/kukit/actionreg.js
+        kukit/kukit/dom.js
         kukit/kukit/commandreg.js
         kukit/kukit/forms.js
         kukit/kukit/plugin.js"

Modified: kukit/azax/trunk/parsers.py
==============================================================================
--- kukit/azax/trunk/parsers.py	(original)
+++ kukit/azax/trunk/parsers.py	Mon Jul 17 07:58:00 2006
@@ -89,4 +89,5 @@
         # 1. Fixes an IE bug.
         # 2. Needed for the alternate transport mechanism to work.
         value = replace_html_named_entities(value)
+
         return value

Modified: kukit/azax/trunk/plugins/configure.zcml
==============================================================================
--- kukit/azax/trunk/plugins/configure.zcml	(original)
+++ kukit/azax/trunk/plugins/configure.zcml	Mon Jul 17 07:58:00 2006
@@ -71,9 +71,13 @@
           name="copyChildrenTo"
           />
 
-    <azax:registerCommand
+     <azax:registerCommand
           name="setStatevar"
           />
+
+     <azax:registerCommand
+          name="triggerEvent"
+          />
           
      <!-- Event types -->
 

Modified: kukit/azax/trunk/plugins/json/browser/jsonkukit.js
==============================================================================
--- kukit/azax/trunk/plugins/json/browser/jsonkukit.js	(original)
+++ kukit/azax/trunk/plugins/json/browser/jsonkukit.js	Mon Jul 17 07:58:00 2006
@@ -15,28 +15,38 @@
 * proxy method.
 */
 
-kukit.makeJSONKukitMethod = function(url, methodName, timeout) {
+kukit.makeJSONKukitMethod = function(url, methodName, timeout, supplement) {
 	// url and methodName can be used, 
 	// or methodName can be set to null and url will be used as a full url.
 	if (typeof(timeout) == 'undefined' || timeout == null) {
     	// default timeout is 4 sec... a sane choice
 		timeout = 4000;
 	}
+	if (typeof(supplement) == 'undefined') {
+    	// default timeout is 4 sec... a sane choice
+		supplement = null;
+	}
     return new JSONRPCMethod(url, methodName, kukit.jsonCallback, kukit.jsonError,
-			4000, null, null, kukit.requestManager);
+			4000, supplement, null, kukit.requestManager);
 }
 
 // OVERWRITE kukit.js
-kukit.notifyServer = function(url, params) {
+kukit.notifyServer = function(url, params, backparms) {
     // sending form, with standard form parameters.
-    var method = kukit.makeJSONKukitMethod(url, null);
+    var method = kukit.makeJSONKukitMethod(url, null, null, backparms);
 	method(params);
 }
 
-kukit.jsonCallback = function(result) {
-    var command_processor = new kukit.CommandProcessor();
-    command_processor.parseCommands(result);
-    command_processor.executeCommands();
+kukit.jsonCallback = function(result, backparms) {
+    try {
+        var command_processor = new kukit.CommandProcessor();
+        // Transport parm is same as result (although we don't use it)
+        command_processor.parseCommands(result, result);
+        command_processor.executeCommands(backparms);
+    } catch(e) {
+        kukit.logError('Error during command execution: ' + e);
+        throw e;
+    }
 }
 
 kukit.jsonError = function(result) {
@@ -46,88 +56,9 @@
 /* Command execution */
 
 // OVERWRITE kukit.js
-kukit.CommandProcessor.prototype.parseCommand = function(command) {
+kukit.CommandProcessor.prototype.parseCommand = function(command, transport) {
     // Add the command.
+    var command = new kukit.cr.makeCommand(command.selector, command.name, command.selectorType, command.params, transport);
     this.addCommand(command);
 } 
 
-kukit.CommandRegistry.prototype.forceJsonRegistry = function() {
-	if (typeof(this.jsonContent) == 'undefined') {
-		this.jsonContent = {};
-		this.jsonNr = 0; 
-	}
-}
-
-kukit.CommandRegistry.prototype.registerJson = function(name, func) {
-	this.forceJsonRegistry();
-	// Register a new style (json) command.
-	if (this.jsonContent[name] || this.content[name]) {
-        // Do not allow redefinition
-        kukit.logError('Error : redefinition attempt of command ' + name);
-        return;
-        }
-    this.jsonContent[name] = func;
-    this.jsonNr = this.jsonNr + 1;
-}
-
-// OVERWRITE kukit.js
-kukit.CommandRegistry.prototype.getFunc = function(name) {
-	this.forceJsonRegistry();
-    var func = this.content[name];
-    var jsonFunc = this.jsonContent[name];
-	var stub = null;
-    if (jsonFunc) {
-		// json commands receive the parameters "as are"
-		stub = jsonFunc;
-    } else if (func) {
-		// old style commands need all the parameters converted to DOM
-		stub = function(node, command_data) {
-			var new_params = {};
-			for (var key in command_data) {
-				var param = command_data[key];
-
-				//
-				// now convert to dom
-				//
-				
-				//param = "<option>test_xmlentity</option><option>tic</option><option>tac&#32;toe</option>";
-				// ***BROKEN*** param = "<option>test_htmlentity</option><option>tic</option><option>tac&nbsp;toe</option>";
-				//param = "<option>test_utf8</option><option>tic</option><option>tac?toe</option>";
-
-				// This is a good solution since it does not do magic to
-				// our html - BUT html is parsed as xml
-				// so we currently preprocess it on the server
-				// and remove html named entities from it.
-				//
-				var root_txt = '<html xmlns="http://www.w3.org/1999/xhtml"><div>' + param + '</div></html>';
-				var doc = (new DOMParser()).parseFromString(root_txt, "text/xml");
-				var root = doc.getElementsByTagName('div')[0];
-
-				// This would be the perfect solution: insert our stuff
-				// into the main document that is, since it is html,
-				// will parse html in correctly. But the problem is
-				// that is also sensitive to context which we have not
-				// at this point yet. So: <option> will not work since
-				// we have no embedding select, etc...
-				// -->> gets broken with both MOZILLA and IE
-				//
-				//var root = document.createElement('html');
-				//root.innerHTML = param;
-				//
-				// XXX Sarissa bug; html docs would not have a
-				// working serialize, and so importNodes would fail on them.
-				// XXX Fixed in: Revision 1.23  - Sun Jul 10 18:53:53 2005 UTC
-				// use at least 0.9.6.1
-				
-				new_params[key] = root;
-				//alert(Sarissa.serialize(root));
-			}
-			// now call the original function with the converted parameters
-			return func(node, new_params);
-		}
-	} else {
-        // not found
-        kukit.logError('Error : undefined command ' + name);
-        }
-    return stub;
-}

From reebalazs at codespeak.net  Mon Jul 17 08:03:18 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon, 17 Jul 2006 08:03:18 +0200 (CEST)
Subject: [Kukit-checkins] r30098 - in kukit/azaxdemo/trunk: . browser
Message-ID: <20060717060318.098CB10091@code0.codespeak.net>

Author: reebalazs
Date: Mon Jul 17 08:03:15 2006
New Revision: 30098

Modified:
   kukit/azaxdemo/trunk/azaxview.py
   kukit/azaxdemo/trunk/browser/header_macros.pt
   kukit/azaxdemo/trunk/browser/more_selectors.js
Log:
Refactoring, following changes

  Fixing cancel-submit demo work with unicode: it must provide the command param as unicode.

  Minor change on annoyclicker demo

  Make the more selectors demo to pass no parameters, just to make it clearer



Modified: kukit/azaxdemo/trunk/azaxview.py
==============================================================================
--- kukit/azaxdemo/trunk/azaxview.py	(original)
+++ kukit/azaxdemo/trunk/azaxview.py	Mon Jul 17 08:03:15 2006
@@ -98,7 +98,8 @@
         return self.render()
 
     def cancelSubmitSave(self, text_save):
-        self.setHtmlAsChild('div#async', 'Async saved %s' % text_save)
+        # we receive in utf encoding, but the methods receive utf, so we convert.
+        self.setHtmlAsChild('div#async', 'Async saved %s' % unicode(text_save, 'utf'))
         return self.render()
 
     def removeNodeXpath(self):

Modified: kukit/azaxdemo/trunk/browser/header_macros.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/header_macros.pt	(original)
+++ kukit/azaxdemo/trunk/browser/header_macros.pt	Mon Jul 17 08:03:15 2006
@@ -1,5 +1,6 @@
 <html>
     <metal:header define-macro="header_resources">
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <script type="text/javascript"
       tal:attributes="src string:${context/absolute_url}/++resource++sarissa.js;"
       src="++resource++sarissa.js">

Modified: kukit/azaxdemo/trunk/browser/more_selectors.js
==============================================================================
--- kukit/azaxdemo/trunk/browser/more_selectors.js	(original)
+++ kukit/azaxdemo/trunk/browser/more_selectors.js	Mon Jul 17 08:03:15 2006
@@ -24,6 +24,7 @@
 };
 
 kukit.more_selectors.AnnoyClickerEvent.prototype.__default_click__ = function(name, parms, node) {
+    parms = kukit.pl.completeParms(parms, [], {}, 'annoyClicker event binding');
     this.count -= 1;
     if (this.count == 0) {
         // Continue with the real action.

From reebalazs at codespeak.net  Mon Jul 17 08:05:09 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon, 17 Jul 2006 08:05:09 +0200 (CEST)
Subject: [Kukit-checkins] r30099 - in kukit/bluekit/trunk: . browser
Message-ID: <20060717060509.589A810091@code0.codespeak.net>

Author: reebalazs
Date: Mon Jul 17 08:05:07 2006
New Revision: 30099

Modified:
   kukit/bluekit/trunk/browser/bluekit.js
   kukit/bluekit/trunk/browser/plugin.js
   kukit/bluekit/trunk/configure.zcml
Log:
Refactoring, follow up changes

  IE acts up badly with the forceToDom applied for the cdata payload

  Update the name

  Make the command plugin work with the updated parameter passing



Modified: kukit/bluekit/trunk/browser/bluekit.js
==============================================================================
--- kukit/bluekit/trunk/browser/bluekit.js	(original)
+++ kukit/bluekit/trunk/browser/bluekit.js	Mon Jul 17 08:05:07 2006
@@ -86,8 +86,6 @@
         self._transport.send(body);
     };
     kukit.requestManager.notifyServer(f, this._url);
-
-
     }
 
 };

Modified: kukit/bluekit/trunk/browser/plugin.js
==============================================================================
--- kukit/bluekit/trunk/browser/plugin.js	(original)
+++ kukit/bluekit/trunk/browser/plugin.js	Mon Jul 17 08:05:07 2006
@@ -3,7 +3,9 @@
 
 kukit.cr.makeGlobalCommand('prototypeResponse', function(node) {
     parms = kukit.pl.completeParms(this.params, ['html'], {}, 'addAfter command');
-    parms.html = kukit.dom.forceToDom(parms.html);
+    // XXX no need for forceToDom: as it is always dom
+    // besides, importNode cripples the cdata in IE
+    ////parms.html = kukit.dom.forceToDom(parms.html);
     // supposed to have a single cdata node
     this.transport.responseText = parms.html.firstChild.data;
     this.transport.responseXML = null;

Modified: kukit/bluekit/trunk/configure.zcml
==============================================================================
--- kukit/bluekit/trunk/configure.zcml	(original)
+++ kukit/bluekit/trunk/configure.zcml	Mon Jul 17 08:05:07 2006
@@ -56,7 +56,7 @@
       />
 
     <azax:registerEventType
-        name="update"
+        name="bluekit-update"
         />
 
     <azax:registerCommand

From reebalazs at codespeak.net  Mon Jul 17 07:55:26 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon, 17 Jul 2006 07:55:26 +0200 (CEST)
Subject: [Kukit-checkins] r30096 - in kukit/kukit.js/trunk: kukit tests
Message-ID: <20060717055526.D279110091@code0.codespeak.net>

Author: reebalazs
Date: Mon Jul 17 07:55:22 2006
New Revision: 30096

Added:
   kukit/kukit.js/trunk/kukit/dom.js
Modified:
   kukit/kukit.js/trunk/kukit/actionreg.js
   kukit/kukit.js/trunk/kukit/commandreg.js
   kukit/kukit.js/trunk/kukit/eventreg.js
   kukit/kukit.js/trunk/kukit/kssparser.js
   kukit/kukit.js/trunk/kukit/kukit.js
   kukit/kukit.js/trunk/kukit/plugin.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
   kukit/kukit.js/trunk/kukit/tokenizer.js
   kukit/kukit.js/trunk/tests/runner.html
   kukit/kukit.js/trunk/tests/runtests.sh
Log:
Refactoring (command parameters separation, __trigger_event__ fixes etc.)

  Programmatic parameters are not propagated by default, they must be declared by pass()
  
  also, fixed statevar()

  Fixing things to make livesearch work, mostly the __trigger_event__
  
  - trigger-event is called on the selected nodes now: it is only called on
    a kss node if it has not been called on any node. This is crap and
    needs to be changed.
  
  - I added a registry of bound events to a binder instance, because we
    need to look that up
  
  - fix a few errors
  
  - make Sarissa's clearChildNodes function as a function in kukit.dom

  action, event, command helpers
  
  - add a triggerEvent command (can call back the same instance
  or another one by id)
  
  - separate methods kukit.rd.executeClientAction, executeServerAction

  Make commands remember about the event that triggered them in return (as supplement data)

  Add clear method to TimerCounter helper

  Add command parameter conversion helpers

  When adding the parser output to the command, it must encode - best: ascii with xmlrefs

  Remove dummy "none" command params, fix IE incompatibility
  
  - remove the "none" param that was added to the empty commands
  
  - fix a few minor IE incompatibilities
  
  - use str.charAt(n) instead of str[n]
  
  - forceToDom: now also does importNode, inevitable for IE
  
  - undefined local actions raise instead of logging a warning

  Restructure command parameters
  
  - commands now except parms
  
  - all dom parms must be accepted like string, there is a kukit.dom.forceToDom helper
  
  - json transport caught up with changes
  
  - logging of errors is necessary during command execution, FF silently swallows them?
  
  - dom module separated from kukit.js



Modified: kukit/kukit.js/trunk/kukit/actionreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/actionreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/actionreg.js	Mon Jul 17 07:55:22 2006
@@ -36,7 +36,8 @@
     var func = this.content[name];
     if (! func) {
         // not found
-        kukit.logError('Error : undefined action ' + name);
+        throw 'Error : undefined local action "' + name + '"';
+        //kukit.logError('Error : undefined action ' + name);
         }
     return func;
 };

Modified: kukit/kukit.js/trunk/kukit/commandreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/commandreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/commandreg.js	Mon Jul 17 07:55:22 2006
@@ -40,7 +40,7 @@
     return command;
 }
 
-kukit.cr._Command_execute_selector = function() {
+kukit.cr._Command_execute_selector = function(node, parms, eventrule, eventinstance, orignode) {
     kukit.logDebug('Selector type: ' + this.selectorType);
     kukit.logDebug('Selector : ' + this.selector);
     var selfunc = kukit.selectors.get(this.selectorType);
@@ -52,7 +52,7 @@
         var node = nodes[i];
         //XXX error handling for wrong command name
         kukit.logDebug('Command Name: ' + this.name);
-        this.executeOnSingleNode(node);
+        this.executeOnSingleNode(node, parms, eventrule, eventinstance);
     }
 };
 
@@ -68,7 +68,8 @@
 kukit.cr.makeGlobalCommand = function(name, executeOnce) {
     var commandClass = function() {};
     commandClass.prototype = {
-        execute: executeOnce
+        execute: executeOnce,
+        executeOnSingleNode: executeOnce
     };
     kukit.cr.commandRegistry.register(name, commandClass); 
 };

Added: kukit/kukit.js/trunk/kukit/dom.js
==============================================================================
--- (empty file)
+++ kukit/kukit.js/trunk/kukit/dom.js	Mon Jul 17 07:55:22 2006
@@ -0,0 +1,112 @@
+
+/* Generic dom helpers */
+
+kukit.dom = {};
+
+kukit.dom.getPreviousSiblingTag = function(node) {
+    var toNode = node.previousSibling;
+    while ((toNode != null) && (toNode.nodeType != 1)) {
+        toNode = toNode.previousSibling;
+    }
+    return toNode;
+};
+
+kukit.dom.getNextSiblingTag = function(node) {
+    var toNode = node.nextSibling;
+    while ((toNode != null) && (toNode.nodeType != 1)) {
+        toNode = toNode.nextSibling;
+    }
+    return toNode;
+}
+
+kukit.dom.insertBefore = function(nodeFrom, parentNode, nodeTo) {
+    var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument;
+    var nodes = nodeFrom.childNodes;
+    var result = new Array();
+    if(ownerDoc.importNode && (!_SARISSA_IS_IE)) {
+        for(var i=0;i < nodes.length;i++) {
+            result[i] = parentNode.insertBefore(ownerDoc.importNode(nodes[i], true), nodeTo);
+        }
+    } else {
+        for(var i=0;i < nodes.length;i++) {
+            result[i] = parentNode.insertBefore(nodes[i].cloneNode(true), nodeTo);
+        }
+    }
+    return result;
+};
+
+kukit.dom.appendChildren = function(nodes, toNode) {
+    var ownerDoc = toNode.nodeType == Node.DOCUMENT_NODE ? toNode : toNode.ownerDocument;
+    var result = new Array();
+    if(ownerDoc.importNode && (!_SARISSA_IS_IE)) {
+        for(var i=0;i < nodes.length;i++) {
+            result[i] = toNode.appendChild(ownerDoc.importNode(nodes[i], true));
+        }
+    }else{
+        for(var i=0;i < nodes.length;i++) {
+            result[i] = toNode.appendChild(nodes[i].cloneNode(true));
+        }
+    }
+    return result;
+};
+
+kukit.dom.clearChildNodes = function(node) {
+    //Maybe we want to get rid of sarissa once?
+    Sarissa.clearChildNodes(node);
+};
+
+kukit.dom.forceToDom = function(param) {
+    // This is a dirty helper to avoid rewriting existing stuff.
+    // If param is not a dom, it converts to it.
+    // This is to assure that all methods that accept a dom can accept a string
+    // instead.
+    if (typeof(param) == 'string') {
+        //
+        // now convert to dom
+        //
+        
+        //param = "<option>test_xmlentity</option><option>tic</option><option>tac&#32;toe</option>";
+        // ***BROKEN*** param = "<option>test_htmlentity</option><option>tic</option><option>tac&nbsp;toe</option>";
+        //param = "<option>test_utf8</option><option>tic</option><option>tac?toe</option>";
+
+        // This is a good solution since it does not do magic to
+        // our html - BUT html is parsed as xml
+        // so we currently preprocess it on the server
+        // and remove html named entities from it.
+        //
+        var root_txt = '<html xmlns="http://www.w3.org/1999/xhtml"><div>' + param + '</div></html>';
+        var doc = (new DOMParser()).parseFromString(root_txt, "text/xml");
+        var root = doc.getElementsByTagName('div')[0];
+
+        // This would be the perfect solution: insert our stuff
+        // into the main document that is, since it is html,
+        // will parse html in correctly. But the problem is
+        // that is also sensitive to context which we have not
+        // at this point yet. So: <option> will not work since
+        // we have no embedding select, etc...
+        // -->> gets broken with both MOZILLA and IE
+        //
+        //var root = document.createElement('html');
+        //root.innerHTML = param;
+        //
+        // XXX Sarissa bug; html docs would not have a
+        // working serialize, and so importNodes would fail on them.
+        // XXX Fixed in: Revision 1.23  - Sun Jul 10 18:53:53 2005 UTC
+        // use at least 0.9.6.1
+        
+        param = root;
+    } else {
+        // In case of dom, need to do this or else IE fails miserably
+        // importNode acts strangely.
+        // on FF, you can execute it several times but the next condition
+        //        always evaluated to False.
+        // on IE, it is a big problem to execute this for the second time
+        //        but it needs to be executed once, thus the condition
+        if (param.ownerDocument != document) {
+            param = document.importNode(param, true);
+        }
+    }
+    //alert(Sarissa.serialize(param));
+    return param;
+};
+

Modified: kukit/kukit.js/trunk/kukit/eventreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/eventreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/eventreg.js	Mon Jul 17 07:55:22 2006
@@ -65,7 +65,7 @@
         throw 'EventRegistry.register misses some parameters';
     }
     // Find out the class name. (Not specified now.)
-    classname = klass.prototype.__classname__;
+    var classname = klass.prototype.__classname__;
     if (typeof(classname) == 'undefined') {
         // Create a classname, and register it too.
         classname = '' + kukit.er.eventClassCounter;
@@ -88,7 +88,7 @@
     this.content[key] = {
         'classname': classname,
         'bindmethodname': bindmethodname,
-        'defaultactionmethodname': defaultactionmethodname,
+        'defaultactionmethodname': defaultactionmethodname
         };
 };
 
@@ -134,7 +134,7 @@
 kukit.er.EventBinder_calldefault = function(namespace, name, parms, node) {
     // private method for calling just a default method.
     // params should be alredy prepared.
-    var methodname = kukit.er.eventRegistry.get(namespace, name).defaultactionmethodname
+    var methodname = kukit.er.eventRegistry.get(namespace, name).defaultactionmethodname;
     if (methodname) {
         var method = this[methodname];
         if (! method) {
@@ -147,30 +147,57 @@
 
 /* This can be called on the event and will execute the
 *  desired event action. Parameters will be these + those
-*  executed in the KSS.
+*  defined in the rule.
 *
 * Call example: eventinstance.__trigger_event__('doit', {'extravalue': '5'}, node);
 */
 
 kukit.er.EventBinder__trigger_event__ = function(name, parms, node) {
-    // Called programmatically: look up the event rule. This may fail
+    // Called programmatically
+    //
+    // XXX uhh this must go away. An implicit kss rule is only to be executed
+    // if no other nodes execute.
+    var executed = 0;
+    var special = 0;
+    // document rules. Execute them with node = null
+    eventrule =  kukit.rd.methodTable.getMergedRule('document', name, this);
+    if (eventrule != null) {
+        this._EventBinder_triggerevent(name, parms, null, eventrule);
+        special += 1;
+    }
+    // Normal rules. If any of those match, execute them too
+    // each on the node that it selects - not on the original node.
+    var items = kukit.er.eventInstanceRegistry.getBinding(this, name);
+    for (var i=0; i<items.length; i++) {
+        var item = items[i];
+        this._EventBinder_triggerevent(name, parms, item.node, item.eventrule);
+        executed += 1;
+    }
+    // look up the kss event rule. This may fail (eventrule = null)
     // but yet we want to execute a default action in this case.
-    eventrule =  kukit.rd.methodTable.getMergedRule('kss', name, this);
-    this._EventBinder_triggerevent(name, parms, node, eventrule);
+    var eventrule =  kukit.rd.methodTable.getMergedRule('kss', name, this);
+    // XXX uhh this must go away. If we have no eventrule, we must remember
+    // it and execute but only if otherwise not bound (this is an implicit
+    if (eventrule != null || executed + special == 0) {
+        // kss method is executed on the old node
+        // XXX bad, very bad
+        this._EventBinder_triggerevent(name, parms, node, eventrule);
+        special += 1;
+    }
+    kukit.logDebug('Event "' + name + '" executed on ' + executed + ' nodes, ' + special + ' special kss targets.');
 }
 
 kukit.er.EventBinder_triggerevent = function(name, parms, node, eventrule) {
     // Private. Called from __trigger_event__ or from main event execution.
-
     if (eventrule) {
         // Call the actions, if we had an event rule.
         // This includes calling the default action.
         eventrule.actions.execute(node, eventrule, parms, this);
     } else {
         // In case there is no event rule, just call the default event action.
-        // Parms cannot be specified this way. This is implicit calling.
-        var namespace = this.__event__namespace__;
-        kukit.logWarning('Calling implicit event "' + name + '" on namespace "' + namespace + '"')
+        // This is programmatic calling.
+        var namespace = this.__event_namespace__;
+        kukit.logDebug('Calling implicit event "' + name + '" on namespace "' + namespace + '"')
         this._EventBinder_calldefault(namespace, name, parms, node);
     }
 };
@@ -196,11 +223,13 @@
     var eventinstance = this.content[id];
     if (typeof(eventinstance) == 'undefined') {
         // Create a new event.
+        kukit.logDebug('instantiating event id=' + id + ', classname=' + classname + ', namespace=' + namespace);
         eventinstance = this.content[id] = new (kukit.er.eventRegistry.getBinder(classname))();
         // decorate it with id and class
         eventinstance.__event_id__ = id;
         eventinstance.__event_classname__ = classname;
         eventinstance.__event_namespace__ = namespace;
+        eventinstance.__event_rules__ = [];
     } else if (eventinstance.__event_classname__ != classname) {
         // just paranoia
         throw 'Conflicting class for event id "' + id + '", "' + eventinstance.__event_classname__
@@ -209,6 +238,29 @@
     return eventinstance;
 };
 
+kukit.er.EventInstanceRegistry.prototype.markBinding = function (eventinstance, node, eventrule) {
+    // Marks that the instance was bound to this rule
+    var name = eventrule.kss_selector.name;
+    rules_already_bound = eventinstance.__event_rules__[name];
+    if (typeof(rules_already_bound) == 'undefined') {
+        // Create an empty list.
+        rules_already_bound = eventinstance.__event_rules__[name] = [];
+    }
+    var item = {'eventrule': eventrule, 'node': node};
+    rules_already_bound.push(item);
+};
+
+kukit.er.EventInstanceRegistry.prototype.getBinding = function (eventinstance, name) {
+    // Get the eventrule, node items that bind to the instance with an event name
+    var items = eventinstance.__event_rules__[name];
+    if (typeof(items) == 'undefined') {
+        // Create an empty list.
+        items = eventinstance.__event_rules__[name] = [];
+    }
+    // Return it
+    return items;
+};
+
 kukit.er.EventInstanceRegistry.prototype.getEventById = function (id) {
     // Get an event.
     var eventinstance = this.content[id];
@@ -219,11 +271,13 @@
 };
 
 kukit.er.EventInstanceRegistry.prototype.getSingletonEventByName = function (namespace, name) {
+    //Get classname
+    var classname = eventRegistry.prototype.get(namespace, name).classname;
     // Get an event.
-    var id = kukit.rd.makeId(namespace, name);
+    var id = kukit.rd.makeId(namespace, classname);
     var eventinstance = this.content[id];
     if (typeof(eventinstance) == 'undefined') {
-        throw 'Singleton event with namespace "' + namespace + '" and name "' + name + '" not found.'
+        throw 'Singleton event with namespace "' + namespace + '" and (event) name "' + name + '" not found.'
     }
     return eventinstance;
 };

Modified: kukit/kukit.js/trunk/kukit/kssparser.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kssparser.js	(original)
+++ kukit/kukit.js/trunk/kukit/kssparser.js	Mon Jul 17 07:55:22 2006
@@ -402,7 +402,7 @@
     // Decide if we have an event or a method selector.
     // We have a method selector if a single word "document" or "kss".
     var singleword = css.replace(/[\r\n\t ]/g, ' ');
-    if (singleword && singleword[0] == ' ') {
+    if (singleword && singleword.charAt(0) == ' ') {
         singleword = singleword.substring(1);
     }
     var isEvent = (singleword != 'document' && singleword != 'kss');

Modified: kukit/kukit.js/trunk/kukit/kukit.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kukit.js	(original)
+++ kukit/kukit.js/trunk/kukit/kukit.js	Mon Jul 17 07:55:22 2006
@@ -315,18 +315,19 @@
 
 /* Server notification */
 
-kukit.notifyServer = function(url, params) {
+// Backparms can be used on command execution.
+kukit.notifyServer = function(url, params, backparms) {
     var f = function() {
-        kukit.reallyNotifyServer(url, params);
+        kukit.reallyNotifyServer(url, params, backparms);
     };
     kukit.requestManager.notifyServer(f, url);
 };
 
-kukit.reallyNotifyServer = function(url, params) {
+kukit.reallyNotifyServer = function(url, params, backparms) {
     // make a deferred callback
     var domDoc = new XMLHttpRequest();
     var notifyServer_done  = function() {
-        kukit.notifyServer_done(domDoc);
+        kukit.notifyServer_done(domDoc, backparms);
     };
     // convert params
     var query = new kukit.fo.FormQuery();
@@ -344,16 +345,25 @@
     domDoc.send(encoded);
 };
 
-kukit.notifyServer_done = function(domDoc) {
-      if (domDoc.readyState == 4)
-      {
-        kukit.processResult(domDoc);
+kukit.notifyServer_done = function(domDoc, backparms) {
+    if (domDoc.readyState == 4)
+    {
+        // catch the errors otherwise won't get logged.
+        // In FF they seem to get swallowed silently.
+        try {
+            kukit.processResult(domDoc, backparms);
+        } catch(e) {
+            kukit.logError('Error during command execution: ' + e);
+            // also IE acts foul on thrown errors
+            // but at least mumbles something
+            throw e;
+        }
 /*  } else {
         kukit.logDebug('Request arrived with readyState = ' + domDoc.readyState); */
-      }
+    }
 };
 
-kukit.processResult = function(domDoc) {
+kukit.processResult = function(domDoc, backparms) {
     var domXml = domDoc.responseXML;
     kukit.requestManager.receivedResult();
         if (!domXml) {
@@ -378,7 +388,15 @@
         }
         var command_processor = new kukit.CommandProcessor();
         command_processor.parseCommands(commands, domDoc);
-        command_processor.executeCommands();
+        command_processor.executeCommands(backparms);
+};
+
+kukit.CommandExecutionError = kukit.exceptionFactory('CommandExecutionError');
+kukit.CommandExecutionError.prototype.__superinit__ = kukit.CommandExecutionError.prototype.__init__; 
+kukit.CommandExecutionError.prototype.__init__ = function(name, e, command) {
+    var kw = this.__superinit__(name, '');
+    kw.message = 'Command "' + command.name + '": ' + e.toString();
+    return kw
 };
 
 kukit.CommandProcessor = function() {
@@ -396,9 +414,8 @@
 
 kukit.CommandProcessor.prototype.parseCommand = function(command, transport) {
     var selector = "";
-    var params = new Array();
+    var params = {};
     var name = "";
-    var has_params = false;
 
     selector = command.getAttribute("selector");
     if (selector == null)
@@ -408,14 +425,14 @@
         type = command.getAttribute("selectorType");
         if (name == null)
             name = "";
-        kukit.log('Command name: '+ name);
+        //kukit.log('Command name: '+ name);
         var childNodes = command.childNodes;
         for (var n=0;n < childNodes.length;n++) {
             var childNode = childNodes[n];
-              kukit.logDebug('NodeType: '+ childNode.nodeType);
+              //kukit.logDebug('NodeType: '+ childNode.nodeType);
               if (childNode.nodeType != 1) 
                   continue;
-              kukit.logDebug('NodeName: '+ childNode.nodeName);
+              //kukit.logDebug('NodeName: '+ childNode.nodeName);
               if (childNode.localName) {
                   if (childNode.localName.toLowerCase() != "param")    
                       continue;
@@ -426,12 +443,23 @@
               }        
               data = childNode.getAttribute('name');
               if (data != null) { 
-                params[data] = childNode;
-                has_params = true;
+                // Decide if we have a string or a dom parameter
+                var childCount = childNode.childNodes.length;
+                var result;
+                if (childCount == 0) {
+                    // We take this a string (although this could be dom)
+                    result = '';
+                } else if (childCount == 1 && childNode.firstChild.nodeType == 3) {
+                    // we have a single text node
+                    result = childNode.firstChild.nodeValue;
+                } else {
+                    // dom
+                    result = childNode;
+                }
+                params[data] = result;
              }
         }
-        kukit.log('Command params: '+ has_params);
-        if (selector != "" && has_params && name != "") {
+        if (selector != "" && name != "") {
             var command = new kukit.cr.makeCommand(selector, name, type, params, transport);
             this.addCommand(command);
         }
@@ -442,12 +470,24 @@
     this.commands[this.commands.length] = command;
 };
 
-kukit.CommandProcessor.prototype.executeCommands = function() {
-    var commands = this.commands
-     for (var y=0;y < commands.length;y++) {
+kukit.CommandProcessor.prototype.executeCommands = function(backparms) {
+    // node, eventrule, eventinstance are given on backparms, in case
+    // the command was called up from an event
+    if (typeof(backparms) == 'undefined' || backparms == null) {
+        backparms = {'node': null, 'eventrule': null, 'eventinstance': null};
+    }
+    var commands = this.commands;
+    for (var y=0;y < commands.length;y++) {
         var command = commands[y];
-        command.execute();  
-      }
+        try {
+            // XXX TODO change from command.params to parms
+            command.execute(null, command.params, backparms.eventrule, 
+                backparms.eventinstance, backparms.node);
+        } catch (e) {
+            // augment the error message
+            throw new kukit.CommandExecutionError(e, command); 
+        }
+    }
 };
 
 /* selector registry */
@@ -500,54 +540,3 @@
 kukit.selectors.register('default', kukit.selectors.get('css'));
 
 
-/* general dom helpers */
-
-kukit.dom = {};
-
-kukit.dom.getPreviousSiblingTag = function(node) {
-    var toNode = node.previousSibling;
-    while ((toNode != null) && (toNode.nodeType != 1)) {
-        toNode = toNode.previousSibling;
-    }
-    return toNode;
-};
-
-kukit.dom.getNextSiblingTag = function(node) {
-    var toNode = node.nextSibling;
-    while ((toNode != null) && (toNode.nodeType != 1)) {
-        toNode = toNode.nextSibling;
-    }
-    return toNode;
-}
-
-kukit.dom.insertBefore = function(nodeFrom, parentNode, nodeTo) {
-    var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument;
-    var nodes = nodeFrom.childNodes;
-    var result = new Array();
-    if(ownerDoc.importNode && (!_SARISSA_IS_IE)) {
-        for(var i=0;i < nodes.length;i++) {
-            result[i] = parentNode.insertBefore(ownerDoc.importNode(nodes[i], true), nodeTo);
-        }
-    } else {
-        for(var i=0;i < nodes.length;i++) {
-            result[i] = parentNode.insertBefore(nodes[i].cloneNode(true), nodeTo);
-        }
-    }
-    return result;
-};
-
-kukit.dom.appendChildren = function(nodes, toNode) {
-    var ownerDoc = toNode.nodeType == Node.DOCUMENT_NODE ? toNode : toNode.ownerDocument;
-    var result = new Array();
-    if(ownerDoc.importNode && (!_SARISSA_IS_IE)) {
-        for(var i=0;i < nodes.length;i++) {
-            result[i] = toNode.appendChild(ownerDoc.importNode(nodes[i], true));
-        }
-    }else{
-        for(var i=0;i < nodes.length;i++) {
-            result[i] = toNode.appendChild(nodes[i].cloneNode(true));
-        }
-    }
-    return result;
-};
-

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Mon Jul 17 07:55:22 2006
@@ -5,11 +5,14 @@
 
 /* Utility for parameter checking */
 
-kukit.pl.completeParms = function(parms, mandatory, defaults, errname) {
+kukit.pl.completeParms = function(parms, mandatory, defaults, errname, allow_excess) {
     // Checks if mandatory params are supplied and there are no excess params
     // also fill up default values
     // Parms are cloned and returned.
     // Call example: parms=kukit.pl.completeParms(parms, ['mand1', 'mand2'], {'key1': 'defval'}, 'event X');
+    if (typeof(allow_excess) == 'undefined') {
+        allow_excess = false;
+    }
     var newparms = {};
     for (var i=0; i<mandatory.length; i++) {
         var next = mandatory[i];
@@ -28,7 +31,11 @@
     }
     for (var key in parms){
         if (typeof(newparms[key]) == 'undefined') {
-            throw 'Excess parameter "' + key + '" in ' + errname;
+            if (allow_excess) {
+                newparms[key] = parms[key];
+            } else {
+                throw 'Excess parameter "' + key + '" in ' + errname;
+            }
         }
     }
     return newparms;
@@ -134,14 +141,18 @@
         restart = false;
     }
     this.restart = restart;
+    this.timer;
 };
 
 kukit.pl.TimerCounter.prototype.start = function() {
+    if (this.timer) {
+        throw 'Timer already started.';
+    }
     var self = this;
     var func = function() {
         self.timeout();
     }
-    setTimeout(func, this.delay);
+    this.timer = setTimeout(func, this.delay);
 };
 
 kukit.pl.TimerCounter.prototype.timeout = function() {
@@ -149,10 +160,17 @@
     this.func();
     // Restart the timer
     if (this.restart) {
+        this.timer = null;
         this.start();
     }
 };
 
+kukit.pl.TimerCounter.prototype.clear = function() {
+    if (this.timer) {
+        window.clearTimeout(this.timer);
+    }
+};
+
 kukit.pl.TimeoutEventBinder = function() {
     this.counters = {};
 };
@@ -215,7 +233,7 @@
             actionparms[key] = parms[key];
         }
     }
-    eventinstance.__trigger_action__(parms.name, actionparms, node);
+    eventinstance.__trigger_event__(parms.name, actionparms, node);
     }
 );
 
@@ -253,30 +271,38 @@
 /* Core commands */
 
 // innerHTML
+// accepts both string and dom.
 kukit.cr.makeSelectorCommand('setHtmlAsChild', function(node) {
-    var content = document.importNode(this.params['html'], true);
-    Sarissa.clearChildNodes(node);
-    kukit.dom.appendChildren(content.childNodes, node);
+    parms = kukit.pl.completeParms(this.params, ['html'], {}, 'setHtmlAsChild command');
+    if (typeof(parms.html) == 'string') {
+        node.innerHTML = parms.html;
+    } else {
+        parms.html = kukit.dom.forceToDom(parms.html);
+        kukit.dom.clearChildNodes(node);
+        kukit.dom.appendChildren(parms.html.childNodes, node);
+    }
     kukit.setupEvents(node);
 });
 
 // outerHTML ?
+// This seems to be untested.
 kukit.cr.makeSelectorCommand('replaceNode', function(node) {
-    var childNodes = this.params['html'].childNodes;
-    var sourceSelector = this.params['selector'].firstChild.nodeValue || null;
+    parms = kukit.pl.completeParms(this.params, ['html'], {'selector': null}, 'replaceNode command');
+    parms.html = kukit.dom.forceToDom(parms.html);
+    var childNodes = parms.html.childNodes;
     var parentNode = node.parentNode;
     var newNode = parentNode.cloneNode(false);
     try {
         kukit.dom.appendChildren(childNodes, newNode);
     } catch(exc) {
-        newNode.innerHTML = Sarissa.serialize(this.params['html']);
+        newNode.innerHTML = Sarissa.serialize(parms.html);
     }
-    if (sourceSelector) {
-        var element = cssQuery(sourceSelector, newNode)[0];
+    if (parms.selector) {
+        var element = cssQuery(parms.selector, newNode)[0];
         if (element)
             parentNode.replaceChild(element, node);
         else
-            kukit.logDebug("Found no elements in response with selector '"+sourceSelector+"'.");
+            kukit.logDebug("Found no elements in response with selector '" + parms.selector + "'.");
     } else {
         parentNode.replaceChild(newNode.firstChild, node);
     }
@@ -284,13 +310,14 @@
 });
 
 kukit.cr.makeSelectorCommand('setAttribute', function(node) {
-    var name = this.params['name'].firstChild.nodeValue;
-    var value = this.params['value'].firstChild.nodeValue;
-    node.setAttribute(name, value);
+    parms = kukit.pl.completeParms(this.params, ['name', 'value'], {}, 'setAttribute command');
+    node.setAttribute(parms.name, parms.value);
 });
 
 kukit.cr.makeSelectorCommand('addAfter', function(node) {
-    var content = document.importNode(this.params['html'], true);
+    parms = kukit.pl.completeParms(this.params, ['html'], {}, 'addAfter command');
+    parms.html = kukit.dom.forceToDom(parms.html);
+    var content = document.importNode(parms.html, true);
     var parentNode = node.parentNode;
     var toNode = kukit.dom.getNextSiblingTag(node);
     if (toNode == null) {
@@ -304,7 +331,7 @@
 });
 
 kukit.cr.makeSelectorCommand('removeNextSibling', function(node) {
-    kukit.logDebug('removeNextSibling');
+    parms = kukit.pl.completeParms(this.params, [], {}, 'removeNextSibling command');
     var parentNode = node.parentNode;
     var toNode = kukit.dom.getNextSiblingTag(node);
     if (toNode != null) {
@@ -313,27 +340,31 @@
 });
 
 kukit.cr.makeSelectorCommand('removePreviousSibling', function(node) {
-    kukit.logDebug('removePreviousSibling');
+    parms = kukit.pl.completeParms(this.params, [], {}, 'removePreviousSibling command');
     var parentNode = node.parentNode;
     var toNode = kukit.dom.getPreviousSiblingTag(node);
     parentNode.removeChild(toNode);
 });
 
 kukit.cr.makeSelectorCommand('removeNode', function(node) {
+    parms = kukit.pl.completeParms(this.params, [], {}, 'removeNode command');
     var parentNode = node.parentNode;
     parentNode.removeChild(node);
 });
 
 kukit.cr.makeSelectorCommand('clearChildren', function(node) {
-    Sarissa.clearChildNodes(node);
+    // TODO get rid of none
+    //parms = kukit.pl.completeParms(this.params, [], {}, 'clearChildren command');
+    parms = kukit.pl.completeParms(this.params, [], {'none': false}, 'clearChildren command');
+    kukit.dom.clearChildNodes(node);
 });
 
 kukit.cr.makeSelectorCommand('moveNodeAfter', function(node) {
+    parms = kukit.pl.completeParms(this.params, ['html_id'], {}, 'moveNodeAfter command');
     var parentNode = node.parentNode;
     parentNode.removeChild(node);
       
-    var id = this.params['html_id'].firstChild.nodeValue;
-    var toNode = document.getElementById(id);
+    var toNode = document.getElementById(parms.html_id);
       
     var nextNode = kukit.dom.getNextSiblingTag(toNode);
     if (nextNode == null) {
@@ -344,19 +375,45 @@
 });
 
 kukit.cr.makeSelectorCommand('copyChildrenFrom', function(node) {
-    var id = this.params['html_id'].firstChild.nodeValue;
-    var fromNode = document.getElementById(id);
+    parms = kukit.pl.completeParms(this.params, ['html_id'], {}, 'copyChildrenFrom command');
+    var fromNode = document.getElementById(parms.html_id);
     Sarissa.copyChildNodes(fromNode, node);
 });
 
 kukit.cr.makeSelectorCommand('copyChildrenTo', function(node) {
-    var id = this.params['html_id'].firstChild.nodeValue;
-    toNode = document.getElementById(id);
+    parms = kukit.pl.completeParms(this.params, ['html_id'], {}, 'copyChildrenTo command');
+    toNode = document.getElementById(parms.html_id);
     Sarissa.copyChildNodes(node, toNode);
 });
 
 kukit.cr.makeGlobalCommand('setStatevar', function(node) {
-    var varname = this.params['varname'].firstChild.nodeValue;
-    var value = this.params['value'].firstChild.nodeValue;
-    kukit.statevars[varname] = value;
+    parms = kukit.pl.completeParms(this.params, ['varname', 'value'], {}, 'setStatevar command');
+    kukit.statevars[parms.varname] = parms.value;
+});
+
+kukit.cr.makeGlobalCommand('triggerEvent', function (node, parms, eventrule, eventinstance) {
+    // allows excess parms in the following check.
+    parms = kukit.pl.completeParms(parms, ['name'], {'id': null, 'namespace': null}, 'triggerEvent command', true);
+    if (parms.id) {
+        // by id
+        eventinstance = kukit.er.eventInstanceRegistry.getEventById(parms.id);
+        // if namespace is defined too, let's check it!
+        if (parms.namespace != null && parms.namespace != eventinstance.__event_namespace__) {
+            throw 'Id and namespace are conflicting in cascade action, rule=#' + eventrule.getNr() + ', node=' + node.nodeName; 
+        }
+    } else {
+        if (eventinstance == null) {
+            // singleton by class
+            eventinstance = kukit.er.eventInstanceRegistry.getSingletonEventByName(parms.namespace, parms.name);
+        }
+    }
+    // marshall it, the rest of the parms will be passed
+    var actionparms = {};
+    for (var key in parms) {
+        if (key != 'name' && key != 'id' && key != 'namespace') {
+            actionparms[key] = parms[key];
+        }
+    }
+    eventinstance.__trigger_event__(parms.name, actionparms, node);
 });
+

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Mon Jul 17 07:55:22 2006
@@ -47,7 +47,7 @@
     this.classname = kukit.er.eventRegistry.get(this.namespace, this.name).classname
     if (this.id == null) {
         // singleton for class
-        this.id = kukit.rd.makeId(this.namespace, this.name);
+        this.id = kukit.rd.makeId(this.namespace, this.classname);
     }
     // Also set the merge id. The rules with the same merge
     // id should be merged on the same node.
@@ -105,12 +105,17 @@
                 throw 'statevar method needs 1 argument (varname)';
             }
         } break;
+        case 'pass': {
+            if (this.args.length != 1) {
+                throw 'pass method needs 1 argument (attrname)';
+            }
+        } break;
         default: {
             throw 'Not implemented kss parameter method "' + this.methodname + '"';
         } break;
     }
 };
-kukit.rd.KssMethodValue.prototype.evaluate = function(parms, key, node) {
+kukit.rd.KssMethodValue.prototype.evaluate = function(parms, key, node, defaultparms) {
     // Evaluate into parms.
     switch (this.methodname) {
         case 'formvar': {
@@ -132,11 +137,20 @@
             parms[key] = value;
         } break;
         case 'statevar': {
-            var key = this.args[0];
-            var value = kukit.statevars[key];
+            var key2 = this.args[0];
+            var value = kukit.statevars[key2];
+            if (typeof(value) == 'undefined') {
+                // notfound arguments will get null
+                throw 'Nonexistent statevar "'+ key2 +'"';
+            }
+            parms[key] = value;
+        } break;
+        case 'pass': {
+            var key2 = this.args[0];
+            var value = defaultparms[key2];
             if (typeof(value) == 'undefined') {
                 // notfound arguments will get null
-                throw 'Nonexistent statevar "'+ key +'"';
+                throw 'Nonexistent default parm "'+ key2 +'"';
             }
             parms[key] = value;
         } break;
@@ -237,6 +251,8 @@
     }
     // do the binding    
     method.call(eventinstance, name, parms, func_to_bind, node, this);
+    // mark on the instance as bound
+    kukit.er.eventInstanceRegistry.markBinding(eventinstance, node, this);
 };
 
 
@@ -381,22 +397,50 @@
 
 kukit.rd.Action.prototype.getParms = function(node, defaultparms) {
     // Return the completed action parameters, based on the node
-    // if defaultparms is given, it is used as the base.
+    // if defaultparms is given, its values can be used with the 
+    // pass() function.
     var parms = {};
-    if (typeof(defaultparms) != 'undefined') {
-        for (var key in defaultparms) {
-            parms[key] = defaultparms[key]; 
-        }
+    if (typeof(defaultparms) == 'undefined') {
+        defaultparms = {};
     }
     for (var key in this.parms) {
         var kssvalue = this.parms[key]; 
         // evaluate the method parameters into parms
-        kssvalue.evaluate(parms, key, node); 
+        kssvalue.evaluate(parms, key, node, defaultparms); 
     }
     return parms;
 };
 
 
+kukit.rd.executeClientAction = function(name, node, eventrule, parms, eventinstance) {
+    var func = kukit.ar.eventActionRegistry.get(name);
+    func(node, parms, eventrule);
+};
+
+kukit.rd.executeServerAction = function(name, node, eventrule, parms, eventinstance) {
+    var action = kukit.calculateAbsoluteURL(name);
+    // these backparms will be accessible to some commands that execute in return
+    var backparms = {
+            'node': node,
+            'eventrule': eventrule,
+            'eventinstance': eventinstance
+        };
+    // be a little cautious
+    if (! eventinstance) {
+        eventinstance = null;
+        if (! parms) {
+            parms = {};
+            if (! eventrule) {
+                eventrule = null;
+                if (! node) {
+                    backparms = null;
+                }
+            }
+        }
+    }
+    kukit.notifyServer(action, parms, backparms);
+};
+
 kukit.rd.Action.prototype.execute = function(node, eventrule, defaultparms, eventinstance) {
     var parms = this.getParms(node, defaultparms);
     if (this.name == 'default') {
@@ -405,16 +449,13 @@
         var name = eventrule.kss_selector.name;
         eventinstance._EventBinder_calldefault(namespace, name, parms, node);
     } else if (this.isRemote) {
-        // Remote action.
-        var action = kukit.calculateAbsoluteURL(this.name);
-        kukit.notifyServer(action, parms);
+        kukit.rd.executeServerAction(this.name, node, eventrule, parms, eventinstance);
     } else {
-        // Local action.
-        var func = kukit.ar.eventActionRegistry.get(this.name);
-        func(node, parms, eventrule);
+        kukit.rd.executeClientAction(this.name, node, eventrule, parms, eventinstance);
     }
 };
 
+
 /*     Rule table
 
     Used for binding rules to nodes, and handling the merges.
@@ -513,7 +554,7 @@
     if (typeof(dict) == 'undefined') {
         throw 'Unknown method rule category "' + category + '"';
     }
-    // look up the rule and merge if necessary
+    // look up the rule
     var namespace = eventinstance.__event_namespace__;
     var id = eventinstance.__event_id__;
     var mergeid = kukit.rd.makeMergeId(id, namespace, name);

Modified: kukit/kukit.js/trunk/kukit/tokenizer.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/tokenizer.js	(original)
+++ kukit/kukit.js/trunk/kukit/tokenizer.js	Mon Jul 17 07:55:22 2006
@@ -144,7 +144,7 @@
     // tests and the original demo, but with kukitportlet demo
     // it breaks. Someone stinks!
     //txt = txt.replace(/^ /, '');
-    if (txt && txt[0] == ' ') {
+    if (txt && txt.charAt(0) == ' ') {
         txt = txt.substr(1);
     }
     txt = txt.replace(/ $/, '');

Modified: kukit/kukit.js/trunk/tests/runner.html
==============================================================================
--- kukit/kukit.js/trunk/tests/runner.html	(original)
+++ kukit/kukit.js/trunk/tests/runner.html	Mon Jul 17 07:55:22 2006
@@ -21,6 +21,7 @@
         <script type="text/javascript" src="../kukit/kssparser.js"> </script>
         <script type="text/javascript" src="../kukit/eventreg.js"> </script>
         <script type="text/javascript" src="../kukit/actionreg.js"> </script>
+        <script type="text/javascript" src="../kukit/dom.js"> </script>
         <script type="text/javascript" src="../kukit/commandreg.js"> </script>
         <script type="text/javascript" src="../kukit/forms.js"> </script>
         <script type="text/javascript" src="../kukit/plugin.js"> </script>

Modified: kukit/kukit.js/trunk/tests/runtests.sh
==============================================================================
--- kukit/kukit.js/trunk/tests/runtests.sh	(original)
+++ kukit/kukit.js/trunk/tests/runtests.sh	Mon Jul 17 07:55:22 2006
@@ -7,6 +7,7 @@
 	-f ../kukit/kssparser.js \
 	-f ../kukit/eventreg.js \
 	-f ../kukit/actionreg.js \
+	-f ../kukit/dom.js \
 	-f ../kukit/commandreg.js \
 	-f ../kukit/forms.js \
 	-f ../kukit/plugin.js \

From reebalazs at codespeak.net  Mon Jul 17 15:43:10 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon, 17 Jul 2006 15:43:10 +0200 (CEST)
Subject: [Kukit-checkins] r30127 - kukit/kukit.js/trunk/kukit
Message-ID: <20060717134310.4C18A1007C@code0.codespeak.net>

Author: reebalazs
Date: Mon Jul 17 15:43:07 2006
New Revision: 30127

Modified:
   kukit/kukit.js/trunk/kukit/plugin.js
Log:
Adding crosscompatible native events.

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Mon Jul 17 15:43:07 2006
@@ -92,12 +92,30 @@
 kukit.pl.NativeEventBinder = function() {
 };
 
-kukit.pl.NativeEventBinder.prototype.__bind__ = function(name, parms, func_to_bind, node) {
-    parms = kukit.pl.completeParms(parms, [], {'preventdefault': ''}, 'native event binding');
-    kukit.pl.evalBool(parms, 'preventdefault', 'native event binding');
+kukit.pl.NativeEventBinder.prototype.__bind__node = function(name, parms, func_to_bind, node) {
     if (node == null) {
         throw 'Native event must be bound to a node.';
     }
+    this.__bind__(name, parms, func_to_bind, node);
+};
+
+kukit.pl.NativeEventBinder.prototype.__bind__nodeorwindow = function(name, parms, func_to_bind, node) {
+    if (node == null) {
+        node = window;
+    }
+    this.__bind__(name, parms, func_to_bind, node);
+};
+
+kukit.pl.NativeEventBinder.prototype.__bind__nodeordocument = function(name, parms, func_to_bind, node) {
+    if (node == null) {
+        node = document;
+    }
+    this.__bind__(name, parms, func_to_bind, node);
+};
+
+kukit.pl.NativeEventBinder.prototype.__bind__ = function(name, parms, func_to_bind, node) {
+    parms = kukit.pl.completeParms(parms, [], {'preventdefault': ''}, 'native event binding');
+    kukit.pl.evalBool(parms, 'preventdefault', 'native event binding');
     if (parms.preventdefault && name != 'click') {
         throw 'In native events only the click event can have preventdefault.';
     }
@@ -126,8 +144,27 @@
     }
 };
 
-kukit.er.eventRegistry.register(null, 'click', kukit.pl.NativeEventBinder, '__bind__', null);
-kukit.er.eventRegistry.register(null, 'change', kukit.pl.NativeEventBinder, '__bind__', null);
+// Registration of all the native events that can bound to a node or to document 
+// (= document or window, depending on the event specs)
+// Unsupported are those with absolute no hope to work in a cross browser way
+// Preventdefault is only allowed for click, currently
+kukit.er.eventRegistry.register(null, 'blur', kukit.pl.NativeEventBinder, '__bind__nodeorwindow', null);
+kukit.er.eventRegistry.register(null, 'focus', kukit.pl.NativeEventBinder, '__bind__nodeorwindow', null);
+kukit.er.eventRegistry.register(null, 'resize', kukit.pl.NativeEventBinder, '__bind__nodeorwindow', null);
+kukit.er.eventRegistry.register(null, 'click', kukit.pl.NativeEventBinder, '__bind__nodeordocument', null);
+kukit.er.eventRegistry.register(null, 'dblclick', kukit.pl.NativeEventBinder, '__bind__node', null);
+kukit.er.eventRegistry.register(null, 'mousedown', kukit.pl.NativeEventBinder, '__bind__nodeordocument', null);
+kukit.er.eventRegistry.register(null, 'mouseup', kukit.pl.NativeEventBinder, '__bind__nodeordocument', null);
+kukit.er.eventRegistry.register(null, 'mousemove', kukit.pl.NativeEventBinder, '__bind__nodeordocument', null);
+kukit.er.eventRegistry.register(null, 'mouseover', kukit.pl.NativeEventBinder, '__bind__node', null);
+kukit.er.eventRegistry.register(null, 'mouseout', kukit.pl.NativeEventBinder, '__bind__node', null);
+kukit.er.eventRegistry.register(null, 'change', kukit.pl.NativeEventBinder, '__bind__node', null);
+kukit.er.eventRegistry.register(null, 'reset', kukit.pl.NativeEventBinder, '__bind__node', null);
+kukit.er.eventRegistry.register(null, 'select', kukit.pl.NativeEventBinder, '__bind__node', null);
+kukit.er.eventRegistry.register(null, 'submit', kukit.pl.NativeEventBinder, '__bind__node', null);
+kukit.er.eventRegistry.register(null, 'keydown', kukit.pl.NativeEventBinder, '__bind__nodeordocument', null);
+kukit.er.eventRegistry.register(null, 'keypress', kukit.pl.NativeEventBinder, '__bind__nodeordocument', null);
+kukit.er.eventRegistry.register(null, 'keyup', kukit.pl.NativeEventBinder, '__bind__nodeordocument', null);
 
 // Timer events. The binding of this event will start one counter
 // per event rule. No matter how many nodes matched it. 

From reebalazs at codespeak.net  Mon Jul 17 15:43:21 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon, 17 Jul 2006 15:43:21 +0200 (CEST)
Subject: [Kukit-checkins] r30128 - kukit/azax/trunk/plugins
Message-ID: <20060717134321.217171007C@code0.codespeak.net>

Author: reebalazs
Date: Mon Jul 17 15:43:18 2006
New Revision: 30128

Modified:
   kukit/azax/trunk/plugins/configure.zcml
Log:
Adding crosscompatible native events.

Modified: kukit/azax/trunk/plugins/configure.zcml
==============================================================================
--- kukit/azax/trunk/plugins/configure.zcml	(original)
+++ kukit/azax/trunk/plugins/configure.zcml	Mon Jul 17 15:43:18 2006
@@ -82,9 +82,57 @@
      <!-- Event types -->
 
     <azax:registerEventType
-        name="native"
+        name="blur"
         />
-          
+    <azax:registerEventType
+        name="focus"
+        />
+    <azax:registerEventType
+        name="resize"
+        />
+    <azax:registerEventType
+        name="click"
+        />
+    <azax:registerEventType
+        name="dblclick"
+        />
+    <azax:registerEventType
+        name="mousedown"
+        />
+    <azax:registerEventType
+        name="mouseup"
+        />
+    <azax:registerEventType
+        name="mousemove"
+        />
+    <azax:registerEventType
+        name="mouseover"
+        />
+    <azax:registerEventType
+        name="mouseout"
+        />
+    <azax:registerEventType
+        name="change"
+        />
+    <azax:registerEventType
+        name="reset"
+        />
+    <azax:registerEventType
+        name="select"
+        />
+    <azax:registerEventType
+        name="submit"
+        />
+    <azax:registerEventType
+        name="keydown"
+        />
+    <azax:registerEventType
+        name="keypress"
+        />
+    <azax:registerEventType
+        name="keyup"
+        />
+
     <azax:registerEventType
         name="timeout"
         />

From reebalazs at codespeak.net  Mon Jul 17 16:08:06 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon, 17 Jul 2006 16:08:06 +0200 (CEST)
Subject: [Kukit-checkins] r30130 - kukit/azaxdemo/trunk
Message-ID: <20060717140806.0AD9510082@code0.codespeak.net>

Author: reebalazs
Date: Mon Jul 17 16:08:04 2006
New Revision: 30130

Modified:
   kukit/azaxdemo/trunk/azaxview.py
Log:
Fix unicode issue in instant edit demo as well

Modified: kukit/azaxdemo/trunk/azaxview.py
==============================================================================
--- kukit/azaxdemo/trunk/azaxview.py	(original)
+++ kukit/azaxdemo/trunk/azaxview.py	Mon Jul 17 16:08:04 2006
@@ -75,7 +75,9 @@
         return self.render()
         
     def getInputField(self, value):
-        """ returns the current time """
+        'Inserts the value as entered into an input field'
+        # we receive in utf encoding, but the methods receive utf, so we convert.
+        value = unicode(value, 'utf')
         self.setHtmlAsChild('div#text', 
                             '<div><input type="text" name="value" value="'+value+'" /></div>' \
                             '<input type="button" value="save" id="save" />'
@@ -83,7 +85,9 @@
         return self.render()
         
     def saveText(self, value):
-        """ returns the current time """
+        'Inserts the value to display it on the page'
+        # we receive in utf encoding, but the methods receive utf, so we convert.
+        value = unicode(value, 'utf')
         self.setHtmlAsChild('div#text', value+'<input type="hidden" name="value" value="'+value+'" />')
         return self.render()
     

From reebalazs at codespeak.net  Thu Jul 20 13:39:52 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 20 Jul 2006 13:39:52 +0200 (CEST)
Subject: [Kukit-checkins] r30266 - in kukit/kukit.js/trunk: kukit tests
Message-ID: <20060720113952.E081A100B3@code0.codespeak.net>

Author: reebalazs
Date: Thu Jul 20 13:39:49 2006
New Revision: 30266

Modified:
   kukit/kukit.js/trunk/kukit/eventreg.js
   kukit/kukit.js/trunk/kukit/kssparser.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
   kukit/kukit.js/trunk/tests/test_kssparser.js
Log:
Kss rev4 syntax implemented

- different syntax for event ids (css:eventname:id vs. formerly css:eventname(id))
- special selector kss is now called 'behaviour'

Modified: kukit/kukit.js/trunk/kukit/eventreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/eventreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/eventreg.js	Thu Jul 20 13:39:49 2006
@@ -173,13 +173,13 @@
         this._EventBinder_triggerevent(name, parms, item.node, item.eventrule);
         executed += 1;
     }
-    // look up the kss event rule. This may fail (eventrule = null)
+    // look up the behaviour event rule. This may fail (eventrule = null)
     // but yet we want to execute a default action in this case.
-    var eventrule =  kukit.rd.methodTable.getMergedRule('kss', name, this);
+    var eventrule =  kukit.rd.methodTable.getMergedRule('behaviour', name, this);
     // XXX uhh this must go away. If we have no eventrule, we must remember
     // it and execute but only if otherwise not bound (this is an implicit
     if (eventrule != null || executed + special == 0) {
-        // kss method is executed on the old node
+        // behaviour method is executed on the old node
         // XXX bad, very bad
         this._EventBinder_triggerevent(name, parms, node, eventrule);
         special += 1;

Modified: kukit/kukit.js/trunk/kukit/kssparser.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kssparser.js	(original)
+++ kukit/kukit.js/trunk/kukit/kssparser.js	Thu Jul 20 13:39:49 2006
@@ -9,8 +9,8 @@
 kukit.kssp.commentend = kukit.tk.mkToken('commentend', "*/");
 kukit.kssp.openbrace = kukit.tk.mkToken('openbrace', "{");
 kukit.kssp.closebrace = kukit.tk.mkToken('closebrace', "}");
-kukit.kssp.openbracket = kukit.tk.mkToken('openbracket', "[");
-kukit.kssp.closebracket = kukit.tk.mkToken('closebracket', "]");
+//kukit.kssp.openbracket = kukit.tk.mkToken('openbracket', "[");
+//kukit.kssp.closebracket = kukit.tk.mkToken('closebracket', "]");
 kukit.kssp.openparent = kukit.tk.mkToken('openparent', "(");
 kukit.kssp.closeparent = kukit.tk.mkToken('closeparent', ")");
 kukit.kssp.semicolon = kukit.tk.mkToken('semicolon', ";");
@@ -249,25 +249,6 @@
     this.txt = txt;
 };
 
-// propvalue in pseudo must ba single word with no spaces around.
-kukit.kssp.propvalue_in_pseudo = kukit.tk.mkParser('propvalue', {
-    "{": 'this.emitAndReturn()',
-    " ": 'this.emitAndReturn()',
-    "\t": 'this.emitAndReturn()',
-    "\n": 'this.emitAndReturn()',
-    "\r": 'this.emitAndReturn()',
-    "/*": 'this.emitAndReturn()',
-    ":": 'this.emitAndReturn()',
-    "(": 'this.emitAndReturn(new kukit.kssp.methodargs(this.src, kukit.kssp.openparent))'
-    });
-kukit.kssp.propvalue_in_pseudo.prototype.multiword_allowed = false;
-kukit.kssp.propvalue_in_pseudo.prototype.process = kukit.kssp.propvalue.prototype.process;
-kukit.kssp.propvalue_in_pseudo.prototype.valueClass = kukit.rd.KssPseudoValue;
-kukit.kssp.propvalue_in_pseudo.prototype.produceTxt = function(txt) {
-    // txt parms are returned embedded
-    this.value = new kukit.rd.KssPseudoValue(txt, []);
-}
-
 kukit.kssp.string = kukit.tk.mkParser('string', {
     "'": 'this.emitAndReturn(new kukit.kssp.quote(this.src))',
     "\\": 'new kukit.kssp.backslashed(this.src, kukit.kssp.backslash)'
@@ -340,11 +321,11 @@
 
 // embedded parser to parse the selector
 // kss event selector: (has spaces in it)
-//      <css selector> selector:name(id)
+//      <css selector> selector:name[:id]
 // kss method selector: (has no spaces in it)
-//      document:name(id)
+//      document:name[:id] or behaviour:name[:id]
 kukit.kssp.kssselector = kukit.tk.mkParser('kssselector', {
-    ":": '[new kukit.kssp.colon(this.src), new kukit.kssp.propvalue_in_pseudo(this.src)]',
+    ":": 'new kukit.kssp.colon(this.src)',
     "{": 'this.emitAndReturn()',
     "/*": 'new kukit.kssp.comment(this.src, kukit.kssp.commentbegin)'
     });
@@ -363,8 +344,8 @@
                 if (token.txt.match(/^[\r\n\t ]*$/) != null) {
                     tokenindex -= 1;
                 } else {
-                    // Error.
-                    this.emitError('Kss event selector must end with an event qualifier :event or :event(id)');
+                    // found it
+                    cycle = false;
                 }
             } break;
             case kukit.kssp.comment.prototype.symbol: {
@@ -375,51 +356,69 @@
             } break;
         }
     }
-    // Now we found the token that must be <fraction> <colon> <propvalue>.
+    // Now we found the token that must be <fraction> <colon> <single-word-fraction>
+    // or <fraction> <colon> <single-word-fraction> <colon> <single-word-fraction>
     tokenindex -= 2
     if (tokenindex < 0
-            || this.result[tokenindex+2].symbol != kukit.kssp.propvalue_in_pseudo.prototype.symbol
+            || this.result[tokenindex+2].symbol != kukit.tk.Fraction.prototype.symbol
             || this.result[tokenindex+1].symbol != kukit.kssp.colon.prototype.symbol
             || this.result[tokenindex].symbol != kukit.tk.Fraction.prototype.symbol) {
-        this.emitError('Kss event selector must end with an event qualifier :event or :event(id)');
+        this.emitError('Kss event selector must end with an event qualifier :event or :event:id');
+    }
+    // See if there were two columns
+    var id = null;
+    var lasttoken;
+    if (tokenindex > 0 
+            && this.result[tokenindex-1].symbol == kukit.kssp.colon.prototype.symbol) {
+        lasttoken = this.result[tokenindex];
+        if (lasttoken.txt.match(/[\r\n\t ]/) == null) {
+            // no spaces in it.
+            tokenindex -= 2
+            if (tokenindex < 0
+                    || this.result[tokenindex].symbol != kukit.tk.Fraction.prototype.symbol) {
+                this.emitError('Kss event selector must end with an event qualifier :event or :event:id');
+            }
+            id = this.result[tokenindex+4].txt;
+        } 
+    }
+    // mark the important tokens
+    lasttoken = this.result[tokenindex];
+    var colontoken = this.result[tokenindex+1];
+    var name = this.result[tokenindex+2].txt;
+    // Crop space from the last fraction and that they don't contain space
+    if (id != null) {
+        id = id.replace(/[\r\n\t ]+$/, '');
+        if (id.match(/[\r\n\t ]/) != null) {
+            this.emitError('Kss event id qualifier must not contain space');
+        }
+    } else {
+        name = name.replace(/[\r\n\t ]+$/, '');
+        if (name.match(/[\r\n\t ]/) != null) {
+            this.emitError('Kss event name qualifier must not contain space');
+        }
     }
-    // See that the last fraction does not end with space.
-    var lasttoken = this.result[tokenindex];
-    var commatoken = this.result[tokenindex+1];
-    var pseudotoken = this.result[tokenindex+2];
     var txt = lasttoken.txt;
     if (txt.match(/[\r\n\t ]$/) != null) {
         this.emitError('In kss event selector no space can be before the colon');
     }
-    if (! pseudotoken.value.methodname) {
-        this.emitError('Kss event selector must have a one-word name after the colon');
-    }
-    if (pseudotoken.value.args.length > 1) {
-        this.emitError('Kss pseudo value must not have more then one parameters');
-    }
-    css = this.src.text.substring(this.startpos, commatoken.startpos);
-    //print ('>>' + css + ':' + pseudotoken.value.methodname);
+    css = this.src.text.substring(this.startpos, colontoken.startpos);
+    //print ('>>' + css + ':' + name + ':' + id);
     // Decide if we have an event or a method selector.
-    // We have a method selector if a single word "document" or "kss".
+    // We have a method selector if a single word "document" or "behaviour".
     var singleword = css.replace(/[\r\n\t ]/g, ' ');
     if (singleword && singleword.charAt(0) == ' ') {
         singleword = singleword.substring(1);
     }
-    var isEvent = (singleword != 'document' && singleword != 'kss');
+    var isEvent = (singleword != 'document' && singleword != 'behaviour');
     if (! isEvent) {
         // just store the single word, in case of event selectors
         css = singleword;
     }
     // create the selector.
-    var id = null;
-    if (pseudotoken.value.args.length == 1) {
-        id = pseudotoken.value.args[0];
-    }
-    var name = pseudotoken.value.methodname;
     var splitname = name.split('-');
     var namespace = null;
     if (splitname.length > 2) {
-        this.emitError('Kss event selector must be id or class-id but no more dashes, "' + name + '"');
+        this.emitError('Kss event selector must be name or namespace-name but no more dashes, "' + name + '"');
     } else if (splitname.length == 2) { 
         name = splitname[1];
         namespace = splitname[0];

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Thu Jul 20 13:39:49 2006
@@ -31,7 +31,7 @@
         throw 'Kss selector namespace must not contain @: "' + namespace + '"';
     if (! isEvent) {
         // method rule
-        if (css != 'document' && css != 'kss') {
+        if (css != 'document' && css != 'behaviour') {
             throw 'KssSpecialSelector "' + name + '" must have one of the allowed names';
         }
     }
@@ -533,7 +533,7 @@
 kukit.rd.MethodTable = function() {
     this.content = {};
     this.content['document'] = {};
-    this.content['kss'] = {};
+    this.content['behaviour'] = {};
 };
 
 kukit.rd.MethodTable.prototype.add = function(eventrule) {
@@ -549,7 +549,7 @@
 
 kukit.rd.MethodTable.prototype.getMergedRule = function(category, name, eventinstance) {
     // Returns the rule for a given event instance, 
-    // Get the entry by category (= document or kss)
+    // Get the entry by category (= document or behaviour)
     var dict = this.content[category];
     if (typeof(dict) == 'undefined') {
         throw 'Unknown method rule category "' + category + '"';

Modified: kukit/kukit.js/trunk/tests/test_kssparser.js
==============================================================================
--- kukit/kukit.js/trunk/tests/test_kssparser.js	(original)
+++ kukit/kukit.js/trunk/tests/test_kssparser.js	Thu Jul 20 13:39:49 2006
@@ -216,59 +216,6 @@
             'Excess characters after the property value', 17);
     };
     
-    this.testPropValueInPseudo = function() {
-        // Parsing prop values in pseudo (no methods allowed)
-
-        var txt= "b";
-        var src = new kukit.tk.Cursor(txt);
-        var parser = new kukit.kssp.propvalue_in_pseudo(src, null, true);
-        this.assertEquals(parser.finished, true);
-        this.assertEquals(parser.value.methodname, 'b');
-
-        // multiword ok but does not finish
-        txt= "b   c";
-        src = new kukit.tk.Cursor(txt);
-        parser = new kukit.kssp.propvalue_in_pseudo(src, null, true);
-        this.assertEquals(parser.finished, true);
-        this.assertEquals(src.pos, 1);
-        this.assertEquals(parser.value.methodname, 'b');
-
-        // space ok but does not finish
-        txt= " b";
-        src = new kukit.tk.Cursor(txt);
-        parser = new kukit.kssp.propvalue_in_pseudo(src, null, true);
-        this.assertEquals(parser.finished, true);
-        this.assertEquals(src.pos, 0);
-        this.assertEquals(parser.value.methodname, '');
-
-        // ok, does not finish
-        txt= "apples/* more comments and*/";
-        src = new kukit.tk.Cursor(txt);
-        parser = new kukit.kssp.propvalue_in_pseudo(src, null, true);
-        this.assertEquals(parser.finished, true);
-        this.assertEquals(src.pos, 6);
-        this.assertEquals(parser.value.methodname, 'apples');
-
-        // params ok
-        txt= "click(x)";
-        src = new kukit.tk.Cursor(txt);
-        parser = new kukit.kssp.propvalue_in_pseudo(src, null, true);
-        this.assertEquals(parser.finished, true);
-        this.assertEquals(parser.value.methodname, 'click');
-        this.assertListEquals(parser.value.args, ['x']);
-
-        // more then 1 args not ok (but we check it only from kss selector)
-        //txt= "drag(x, y)";
-        //src = new kukit.tk.Cursor(txt);
-
-        // not ok but we don't parse an error
-        //txt= "'drag'(x)";
-        //src = new kukit.tk.Cursor(txt);
-        //this.assertParsingError(kukit.kssp.propvalue_in_pseudo, src, null, true,
-        //    'Excess characters after the property value', 16);
-
-    };
-
     this.testMethodArgs = function() {
         // Parsing method args
         var txt= "(a, b)";
@@ -315,7 +262,7 @@
 
     this.testKssSelector = function() {
         // Parsing event selector params
-        var txt= "a:drag(hello)";
+        var txt= "a:drag:hello";
         var src = new kukit.tk.Cursor(txt);
         var parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.finished, true);
@@ -325,7 +272,7 @@
         this.assertEquals(parser.kssSelector.namespace, null);
         this.assertEquals(parser.kssSelector.id, 'hello');
 
-        var txt= "a:dnd-drag(hello)";
+        var txt= "a:dnd-drag:hello";
         var src = new kukit.tk.Cursor(txt);
         var parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.finished, true);
@@ -335,14 +282,12 @@
         this.assertEquals(parser.kssSelector.namespace, 'dnd');
         this.assertEquals(parser.kssSelector.id, 'hello');
 
-        var txt= "a:dnd-drag-toomuch(hello)";
+        var txt= "a:dnd-drag-toomuch:hello";
         var src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must be id or class-id but no more dashes, "dnd-drag-toomuch"', 25);
+            'Kss event selector must be name or namespace-name but no more dashes, "dnd-drag-toomuch"', 24);
 
-        // maybe in std css space is not allowed in the parents,
-        // but we tolerate it
-        txt= "  a div#id:drag( hello)";
+        txt= "  a div#id:drag:hello ";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.kssSelector.isEventSelector, true);
@@ -352,16 +297,16 @@
         this.assertEquals(parser.kssSelector.id, 'hello');
 
         // We do not allow space here 
-        txt= "  a div#id:drag   (hello)";
+        txt= "  a div#id:drag   :hello";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event(id)', 25);
+           'In kss event selector no space can be before the colon', 24);
 
         // We do not allow space here
-        txt= "  a div#id: drag(hello)";
+        txt= "  a div#id:drag:h ello";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event(id)', 23);
+            'Kss event id qualifier must not contain space', 22);
 
         txt= "a div#id:drop ";
         src = new kukit.tk.Cursor(txt);
@@ -392,38 +337,22 @@
         this.assertEquals(parser.kssSelector.namespace, null);
         this.assertEquals(parser.kssSelector.id, null);
 
-        // two params: not allowed
-        txt= "a:drop('hello', bello)";
-        src = new kukit.tk.Cursor(txt);
-        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss pseudo value must not have more then one parameters', 22);
-
-        // zero params: not std css but tolerated 
-        txt= "a:drop()";
+        // XXX more commas: should prohibit it? - is allowed now.
+        txt= "a:hover:drop:bello";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
-        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event(id)', 8);
-
-        txt= "   (hello)";
-        src = new kukit.tk.Cursor(txt);
-        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event(id)', 10);
-
-        txt= "hello  ('bello')";
-        src = new kukit.tk.Cursor(txt);
-        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event(id)', 16);
-
-        txt= "a:lang(hu)  (hello)";
-        src = new kukit.tk.Cursor(txt);
-        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event(id)', 19);
+        this.assertEquals(parser.finished, true);
+        this.assertEquals(parser.kssSelector.isEventSelector, true);
+        this.assertEquals(parser.kssSelector.css, 'a:hover');
+        this.assertEquals(parser.kssSelector.name, 'drop');
+        this.assertEquals(parser.kssSelector.namespace, null);
+        this.assertEquals(parser.kssSelector.id, 'bello');
 
-        txt= "a:lang(hu) b (hello)";
+        // missing id: not allowed 
+        txt= "a:drop:";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event(id)', 20);
+            'Kss event selector must end with an event qualifier :event or :event:id', 7);
 
         // A valid attr selector in the css selector part.
         txt= "a[href=hello].class:lang(hu) div#id:click ";
@@ -435,7 +364,7 @@
         this.assertEquals(parser.kssSelector.namespace, null);
         this.assertEquals(parser.kssSelector.id, null);
 
-        txt= "a[href=hello].class:lang(hu) div#id:drop(hello) ";
+        txt= "a[href=hello].class:lang(hu) div#id:drop:hello ";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.finished, true);
@@ -448,7 +377,7 @@
         txt= "   a:lang(hu) click ";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event(id)', 20);
+             'Kss event name qualifier must not contain space', 20);
 
         // Spaces in the end
         txt= "   a:lang(hu, uh) b:click    ";
@@ -493,31 +422,21 @@
         this.assertEquals(parser.kssSelector.namespace, null);
         this.assertEquals(parser.kssSelector.id, null);
 
-        txt= "a:click:clack ";
-        src = new kukit.tk.Cursor(txt);
-        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event(id)', 14);
-
-        txt= "a:click    :clack ";
-        src = new kukit.tk.Cursor(txt);
-        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'In kss event selector no space can be before the colon', 18);
-
         txt= "a:click/*comment */:clack ";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event(id)', 26);
+            'Kss event selector must end with an event qualifier :event or :event:id', 26);
 
         txt= "click/*comment here*/:clack ";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event(id)', 28);
+            'Kss event selector must end with an event qualifier :event or :event:id', 28);
 
         txt= "/*comment here*/click:clack ";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
 
-        txt= " no-document:click(hello)";
+        txt= " no-document:click:hello";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.finished, true);
@@ -530,7 +449,7 @@
             
         // Event method selectors
 
-        txt= " document:click(hello)  ";
+        txt= " document:click:hello  ";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.finished, true);
@@ -540,7 +459,7 @@
         this.assertEquals(parser.kssSelector.namespace, null);
         this.assertEquals(parser.kssSelector.id, 'hello');
 
-        txt= " document:native-click(hello)  ";
+        txt= " document:native-click:hello  ";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.finished, true);
@@ -553,12 +472,23 @@
         txt= "document";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event(id)', 8);
+            'Kss event selector must end with an event qualifier :event or :event:id', 8);
 
         txt= "document: ";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must have a one-word name after the colon', 10);
+            'Kss event selector must end with an event qualifier :event or :event:id', 10);
+
+        // also, "behaviour:" works
+        txt= " behaviour:click:hello  ";
+        src = new kukit.tk.Cursor(txt);
+        parser = new kukit.kssp.kssselector(src, null, true);
+        this.assertEquals(parser.finished, true);
+        this.assertEquals(parser.kssSelector.isMethodSelector, true);
+        this.assertEquals(parser.kssSelector.css, 'behaviour');
+        this.assertEquals(parser.kssSelector.name, 'click');
+        this.assertEquals(parser.kssSelector.namespace, null);
+        this.assertEquals(parser.kssSelector.id, 'hello');
 
     }
  
@@ -601,18 +531,18 @@
             +"   action-server : kukitGetPreviousMonth /* place comment here*/;\n"
             +"   kukitGetPreviousMonth-member: formvar(edit, 'f_member');\n"
             +"}\n"
-            +"#calendar-previous a:dnd-drag(shelve) {\n"
+            +"#calendar-previous a:dnd-drag:shelve {\n"
             +"   action-server : whatever\n"
             +"}\n"
-            +"#button-one:annoyClicker-click(annoy-me) {\n"
+            +"#button-one:annoyClicker-click:annoy-me {\n"
             +"   action-server:     clickedButton;\n"
             +"   clickedButton-id:  nodeattr(id);\n"
             +"}\n"
-            +"document:annoy(annoyMe) {\n"
+            +"document:annoy:annoyMe {\n"
             +"   action-client:    alert;\n"
             +'   alert-message:    "You are an idiot! Ha ha ha. (But just keep on trying...)";\n'
             +"}\n"
-            +"document:annoyClicker-annoy(annoyMe) {\n"
+            +"document:annoyClicker-annoy:annoyMe {\n"
             +"   action-client:    alert;\n"
             +'   alert-message:       "You are an idiot! Ha ha ha. (But just keep on trying...)";\n'
             +"}\n"
@@ -711,7 +641,7 @@
             });
          
         // rule 4
-            // #calendar-previous a:dnd-drag(shelve) {
+            // #calendar-previous a:dnd-drag:shelve {
             //   kss-action : whatever
             // }
         rule = parser.eventRules[4];
@@ -729,7 +659,7 @@
             });
  
         // rule 5
-            //#button-one:annoyClicker-click(annoyMe) {
+            //#button-one:annoyClicker-click:annoyMe {
             //   kss-action:     clickedButton;
             //   id:             nodeattr(id);
             //}
@@ -769,7 +699,7 @@
             });
 
         // rule 7
-            // document:annoyClicker-annoy(annoyMe) {
+            // document:annoyClicker-annoy:annoyMe {
             // annoy#annoy-me {
             //   kss-action:    alert;
             //   message:       "You are an idiot! Ha ha ha. (But just keep on trying...)";

From reebalazs at codespeak.net  Thu Jul 20 13:40:19 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 20 Jul 2006 13:40:19 +0200 (CEST)
Subject: [Kukit-checkins] r30267 - kukit/azaxdemo/trunk/browser
Message-ID: <20060720114019.6B887100B3@code0.codespeak.net>

Author: reebalazs
Date: Thu Jul 20 13:40:17 2006
New Revision: 30267

Modified:
   kukit/azaxdemo/trunk/browser/more_selectors.kss
   kukit/azaxdemo/trunk/browser/more_selectors.pt
Log:
Kss rev4 syntax implemented

- different syntax for event ids (css:eventname:id vs. formerly css:eventname(id))
- special selector kss is now called 'behaviour'

Modified: kukit/azaxdemo/trunk/browser/more_selectors.kss
==============================================================================
--- kukit/azaxdemo/trunk/browser/more_selectors.kss	(original)
+++ kukit/azaxdemo/trunk/browser/more_selectors.kss	Thu Jul 20 13:40:17 2006
@@ -1,29 +1,29 @@
 
-#button-one:annoyclicker-click(annoyMe) {
+#button-one:annoyclicker-click:annoyMe {
 }
 
-kss:annoyclicker-doit(annoyMe) {
+behaviour:annoyclicker-doit:annoyMe {
     action-server:     clickedButton;
     clickedButton-id:  nodeattr(id);
 	action-client: log;
 	log-message: "Was here.";
 }
 
-kss:annoyclicker-annoy(annoyMe) {
+behaviour:annoyclicker-annoy:annoyMe {
     action-client:     alert;
-    alert-message:     "You are an idiot! Ha ha ha. (But just keep on trying...)";
+    alert-message:     "Keep trying until you get there";
 }
 
-#button-two:annoyclicker-click(annoyYou) {
+#button-two:annoyclicker-click:annoyYou {
 	evt-click-count:         2;
 }
 
-kss:annoyclicker-doit(annoyYou) {
+behaviour:annoyclicker-doit:annoyYou {
     action-server:     clickedButton;
     clickedButton-id:  nodeattr(id);
 }
 
-kss:annoyclicker-annoy(annoyYou) {
+behaviour:annoyclicker-annoy:annoyYou {
     action-client:     alert;
-    alert-message:     "You are an idiot too, but not so big as I am.";
+    alert-message:     "Keep trying until you get there, from the second button";
 }

Modified: kukit/azaxdemo/trunk/browser/more_selectors.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/more_selectors.pt	(original)
+++ kukit/azaxdemo/trunk/browser/more_selectors.pt	Thu Jul 20 13:40:17 2006
@@ -30,7 +30,7 @@
 <h3>Demo</h3>
     <div id="update-status">
     </div>
-    <input type="button" id="button-one" value="Annoy me"/>
-    <input type="button" id="button-two" value="Annoy you"/>
+    <input type="button" id="button-one" value="Do it"/>
+    <input type="button" id="button-two" value="Do it again"/>
   </body>
 </html>

From reebalazs at codespeak.net  Fri Jul 21 18:48:25 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 21 Jul 2006 18:48:25 +0200 (CEST)
Subject: [Kukit-checkins] r30328 - in kukit/kukit.js/trunk: kukit tests
Message-ID: <20060721164825.37ABD100CC@code0.codespeak.net>

Author: reebalazs
Date: Fri Jul 21 18:48:23 2006
New Revision: 30328

Modified:
   kukit/kukit.js/trunk/kukit/kssparser.js
   kukit/kukit.js/trunk/tests/test_kssparser.js
Log:
Reverted to eventid in parents syntax

Modified: kukit/kukit.js/trunk/kukit/kssparser.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kssparser.js	(original)
+++ kukit/kukit.js/trunk/kukit/kssparser.js	Fri Jul 21 18:48:23 2006
@@ -9,8 +9,8 @@
 kukit.kssp.commentend = kukit.tk.mkToken('commentend', "*/");
 kukit.kssp.openbrace = kukit.tk.mkToken('openbrace', "{");
 kukit.kssp.closebrace = kukit.tk.mkToken('closebrace', "}");
-//kukit.kssp.openbracket = kukit.tk.mkToken('openbracket', "[");
-//kukit.kssp.closebracket = kukit.tk.mkToken('closebracket', "]");
+kukit.kssp.openbracket = kukit.tk.mkToken('openbracket', "[");
+kukit.kssp.closebracket = kukit.tk.mkToken('closebracket', "]");
 kukit.kssp.openparent = kukit.tk.mkToken('openparent', "(");
 kukit.kssp.closeparent = kukit.tk.mkToken('closeparent', ")");
 kukit.kssp.semicolon = kukit.tk.mkToken('semicolon', ";");
@@ -249,6 +249,25 @@
     this.txt = txt;
 };
 
+// propvalue in pseudo must ba single word with no spaces around.
+kukit.kssp.propvalue_in_pseudo = kukit.tk.mkParser('propvalue', {
+    "{": 'this.emitAndReturn()',
+    " ": 'this.emitAndReturn()',
+    "\t": 'this.emitAndReturn()',
+    "\n": 'this.emitAndReturn()',
+    "\r": 'this.emitAndReturn()',
+    "/*": 'this.emitAndReturn()',
+    ":": 'this.emitAndReturn()',
+    "(": 'this.emitAndReturn(new kukit.kssp.methodargs(this.src, kukit.kssp.openparent))'
+    });
+kukit.kssp.propvalue_in_pseudo.prototype.multiword_allowed = false;
+kukit.kssp.propvalue_in_pseudo.prototype.process = kukit.kssp.propvalue.prototype.process;
+kukit.kssp.propvalue_in_pseudo.prototype.valueClass = kukit.rd.KssPseudoValue;
+kukit.kssp.propvalue_in_pseudo.prototype.produceTxt = function(txt) {
+    // txt parms are returned embedded
+    this.value = new kukit.rd.KssPseudoValue(txt, []);
+}
+
 kukit.kssp.string = kukit.tk.mkParser('string', {
     "'": 'this.emitAndReturn(new kukit.kssp.quote(this.src))',
     "\\": 'new kukit.kssp.backslashed(this.src, kukit.kssp.backslash)'
@@ -321,11 +340,11 @@
 
 // embedded parser to parse the selector
 // kss event selector: (has spaces in it)
-//      <css selector> selector:name[:id]
+//      <css selector> selector:name(id)
 // kss method selector: (has no spaces in it)
-//      document:name[:id] or behaviour:name[:id]
+//      document:name(id) or behaviour:name(id)
 kukit.kssp.kssselector = kukit.tk.mkParser('kssselector', {
-    ":": 'new kukit.kssp.colon(this.src)',
+    ":": '[new kukit.kssp.colon(this.src), new kukit.kssp.propvalue_in_pseudo(this.src)]',
     "{": 'this.emitAndReturn()',
     "/*": 'new kukit.kssp.comment(this.src, kukit.kssp.commentbegin)'
     });
@@ -344,8 +363,8 @@
                 if (token.txt.match(/^[\r\n\t ]*$/) != null) {
                     tokenindex -= 1;
                 } else {
-                    // found it
-                    cycle = false;
+                    // Error.
+                    this.emitError('Kss event selector must end with an event qualifier :event or :event(id)');
                 }
             } break;
             case kukit.kssp.comment.prototype.symbol: {
@@ -356,53 +375,30 @@
             } break;
         }
     }
-    // Now we found the token that must be <fraction> <colon> <single-word-fraction>
-    // or <fraction> <colon> <single-word-fraction> <colon> <single-word-fraction>
+    // Now we found the token that must be <fraction> <colon> <propvalue>.
     tokenindex -= 2
     if (tokenindex < 0
-            || this.result[tokenindex+2].symbol != kukit.tk.Fraction.prototype.symbol
+            || this.result[tokenindex+2].symbol != kukit.kssp.propvalue_in_pseudo.prototype.symbol
             || this.result[tokenindex+1].symbol != kukit.kssp.colon.prototype.symbol
             || this.result[tokenindex].symbol != kukit.tk.Fraction.prototype.symbol) {
-        this.emitError('Kss event selector must end with an event qualifier :event or :event:id');
-    }
-    // See if there were two columns
-    var id = null;
-    var lasttoken;
-    if (tokenindex > 0 
-            && this.result[tokenindex-1].symbol == kukit.kssp.colon.prototype.symbol) {
-        lasttoken = this.result[tokenindex];
-        if (lasttoken.txt.match(/[\r\n\t ]/) == null) {
-            // no spaces in it.
-            tokenindex -= 2
-            if (tokenindex < 0
-                    || this.result[tokenindex].symbol != kukit.tk.Fraction.prototype.symbol) {
-                this.emitError('Kss event selector must end with an event qualifier :event or :event:id');
-            }
-            id = this.result[tokenindex+4].txt;
-        } 
-    }
-    // mark the important tokens
-    lasttoken = this.result[tokenindex];
-    var colontoken = this.result[tokenindex+1];
-    var name = this.result[tokenindex+2].txt;
-    // Crop space from the last fraction and that they don't contain space
-    if (id != null) {
-        id = id.replace(/[\r\n\t ]+$/, '');
-        if (id.match(/[\r\n\t ]/) != null) {
-            this.emitError('Kss event id qualifier must not contain space');
-        }
-    } else {
-        name = name.replace(/[\r\n\t ]+$/, '');
-        if (name.match(/[\r\n\t ]/) != null) {
-            this.emitError('Kss event name qualifier must not contain space');
-        }
+        this.emitError('Kss event selector must end with an event qualifier :event or :event(id)');
     }
+    // See that the last fraction does not end with space.
+    var lasttoken = this.result[tokenindex];
+    var commatoken = this.result[tokenindex+1];
+    var pseudotoken = this.result[tokenindex+2];
     var txt = lasttoken.txt;
     if (txt.match(/[\r\n\t ]$/) != null) {
         this.emitError('In kss event selector no space can be before the colon');
     }
-    css = this.src.text.substring(this.startpos, colontoken.startpos);
-    //print ('>>' + css + ':' + name + ':' + id);
+    if (! pseudotoken.value.methodname) {
+        this.emitError('Kss event selector must have a one-word name after the colon');
+    }
+    if (pseudotoken.value.args.length > 1) {
+        this.emitError('Kss pseudo value must not have more then one parameters');
+    }
+    css = this.src.text.substring(this.startpos, commatoken.startpos);
+    //print ('>>' + css + ':' + pseudotoken.value.methodname);
     // Decide if we have an event or a method selector.
     // We have a method selector if a single word "document" or "behaviour".
     var singleword = css.replace(/[\r\n\t ]/g, ' ');
@@ -415,6 +411,11 @@
         css = singleword;
     }
     // create the selector.
+    var id = null;
+    if (pseudotoken.value.args.length == 1) {
+        id = pseudotoken.value.args[0];
+    }
+    var name = pseudotoken.value.methodname;
     var splitname = name.split('-');
     var namespace = null;
     if (splitname.length > 2) {

Modified: kukit/kukit.js/trunk/tests/test_kssparser.js
==============================================================================
--- kukit/kukit.js/trunk/tests/test_kssparser.js	(original)
+++ kukit/kukit.js/trunk/tests/test_kssparser.js	Fri Jul 21 18:48:23 2006
@@ -216,6 +216,59 @@
             'Excess characters after the property value', 17);
     };
     
+    this.testPropValueInPseudo = function() {
+        // Parsing prop values in pseudo (no methods allowed)
+
+        var txt= "b";
+        var src = new kukit.tk.Cursor(txt);
+        var parser = new kukit.kssp.propvalue_in_pseudo(src, null, true);
+        this.assertEquals(parser.finished, true);
+        this.assertEquals(parser.value.methodname, 'b');
+
+        // multiword ok but does not finish
+        txt= "b   c";
+        src = new kukit.tk.Cursor(txt);
+        parser = new kukit.kssp.propvalue_in_pseudo(src, null, true);
+        this.assertEquals(parser.finished, true);
+        this.assertEquals(src.pos, 1);
+        this.assertEquals(parser.value.methodname, 'b');
+
+        // space ok but does not finish
+        txt= " b";
+        src = new kukit.tk.Cursor(txt);
+        parser = new kukit.kssp.propvalue_in_pseudo(src, null, true);
+        this.assertEquals(parser.finished, true);
+        this.assertEquals(src.pos, 0);
+        this.assertEquals(parser.value.methodname, '');
+
+        // ok, does not finish
+        txt= "apples/* more comments and*/";
+        src = new kukit.tk.Cursor(txt);
+        parser = new kukit.kssp.propvalue_in_pseudo(src, null, true);
+        this.assertEquals(parser.finished, true);
+        this.assertEquals(src.pos, 6);
+        this.assertEquals(parser.value.methodname, 'apples');
+
+        // params ok
+        txt= "click(x)";
+        src = new kukit.tk.Cursor(txt);
+        parser = new kukit.kssp.propvalue_in_pseudo(src, null, true);
+        this.assertEquals(parser.finished, true);
+        this.assertEquals(parser.value.methodname, 'click');
+        this.assertListEquals(parser.value.args, ['x']);
+
+        // more then 1 args not ok (but we check it only from kss selector)
+        //txt= "drag(x, y)";
+        //src = new kukit.tk.Cursor(txt);
+
+        // not ok but we don't parse an error
+        //txt= "'drag'(x)";
+        //src = new kukit.tk.Cursor(txt);
+        //this.assertParsingError(kukit.kssp.propvalue_in_pseudo, src, null, true,
+        //    'Excess characters after the property value', 16);
+
+    };
+
     this.testMethodArgs = function() {
         // Parsing method args
         var txt= "(a, b)";
@@ -262,7 +315,7 @@
 
     this.testKssSelector = function() {
         // Parsing event selector params
-        var txt= "a:drag:hello";
+        var txt= "a:drag(hello)";
         var src = new kukit.tk.Cursor(txt);
         var parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.finished, true);
@@ -272,7 +325,7 @@
         this.assertEquals(parser.kssSelector.namespace, null);
         this.assertEquals(parser.kssSelector.id, 'hello');
 
-        var txt= "a:dnd-drag:hello";
+        var txt= "a:dnd-drag(hello)";
         var src = new kukit.tk.Cursor(txt);
         var parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.finished, true);
@@ -282,12 +335,14 @@
         this.assertEquals(parser.kssSelector.namespace, 'dnd');
         this.assertEquals(parser.kssSelector.id, 'hello');
 
-        var txt= "a:dnd-drag-toomuch:hello";
+        var txt= "a:dnd-drag-toomuch(hello)";
         var src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must be name or namespace-name but no more dashes, "dnd-drag-toomuch"', 24);
+            'Kss event selector must be name or namespace-name but no more dashes, "dnd-drag-toomuch"', 25);
 
-        txt= "  a div#id:drag:hello ";
+        // maybe in std css space is not allowed in the parents,
+        // but we tolerate it
+        txt= "  a div#id:drag( hello)";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.kssSelector.isEventSelector, true);
@@ -297,16 +352,16 @@
         this.assertEquals(parser.kssSelector.id, 'hello');
 
         // We do not allow space here 
-        txt= "  a div#id:drag   :hello";
+        txt= "  a div#id:drag   (hello)";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-           'In kss event selector no space can be before the colon', 24);
+            'Kss event selector must end with an event qualifier :event or :event(id)', 25);
 
         // We do not allow space here
-        txt= "  a div#id:drag:h ello";
+        txt= "  a div#id: drag(hello)";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event id qualifier must not contain space', 22);
+            'Kss event selector must end with an event qualifier :event or :event(id)', 23);
 
         txt= "a div#id:drop ";
         src = new kukit.tk.Cursor(txt);
@@ -337,22 +392,38 @@
         this.assertEquals(parser.kssSelector.namespace, null);
         this.assertEquals(parser.kssSelector.id, null);
 
-        // XXX more commas: should prohibit it? - is allowed now.
-        txt= "a:hover:drop:bello";
+        // two params: not allowed
+        txt= "a:drop('hello', bello)";
+        src = new kukit.tk.Cursor(txt);
+        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
+            'Kss pseudo value must not have more then one parameters', 22);
+
+        // zero params: not std css but tolerated 
+        txt= "a:drop()";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
-        this.assertEquals(parser.finished, true);
-        this.assertEquals(parser.kssSelector.isEventSelector, true);
-        this.assertEquals(parser.kssSelector.css, 'a:hover');
-        this.assertEquals(parser.kssSelector.name, 'drop');
-        this.assertEquals(parser.kssSelector.namespace, null);
-        this.assertEquals(parser.kssSelector.id, 'bello');
+        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
+            'Kss event selector must end with an event qualifier :event or :event(id)', 8);
 
-        // missing id: not allowed 
-        txt= "a:drop:";
+        txt= "   (hello)";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event:id', 7);
+            'Kss event selector must end with an event qualifier :event or :event(id)', 10);
+
+        txt= "hello  ('bello')";
+        src = new kukit.tk.Cursor(txt);
+        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
+            'Kss event selector must end with an event qualifier :event or :event(id)', 16);
+
+        txt= "a:lang(hu)  (hello)";
+        src = new kukit.tk.Cursor(txt);
+        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
+            'Kss event selector must end with an event qualifier :event or :event(id)', 19);
+
+        txt= "a:lang(hu) b (hello)";
+        src = new kukit.tk.Cursor(txt);
+        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
+            'Kss event selector must end with an event qualifier :event or :event(id)', 20);
 
         // A valid attr selector in the css selector part.
         txt= "a[href=hello].class:lang(hu) div#id:click ";
@@ -364,7 +435,7 @@
         this.assertEquals(parser.kssSelector.namespace, null);
         this.assertEquals(parser.kssSelector.id, null);
 
-        txt= "a[href=hello].class:lang(hu) div#id:drop:hello ";
+        txt= "a[href=hello].class:lang(hu) div#id:drop(hello) ";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.finished, true);
@@ -377,7 +448,7 @@
         txt= "   a:lang(hu) click ";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-             'Kss event name qualifier must not contain space', 20);
+            'Kss event selector must end with an event qualifier :event or :event(id)', 20);
 
         // Spaces in the end
         txt= "   a:lang(hu, uh) b:click    ";
@@ -422,21 +493,31 @@
         this.assertEquals(parser.kssSelector.namespace, null);
         this.assertEquals(parser.kssSelector.id, null);
 
+        txt= "a:click:clack ";
+        src = new kukit.tk.Cursor(txt);
+        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
+            'Kss event selector must end with an event qualifier :event or :event(id)', 14);
+
+        txt= "a:click    :clack ";
+        src = new kukit.tk.Cursor(txt);
+        this.assertParsingError(kukit.kssp.kssselector, src, null, true,
+            'In kss event selector no space can be before the colon', 18);
+
         txt= "a:click/*comment */:clack ";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event:id', 26);
+            'Kss event selector must end with an event qualifier :event or :event(id)', 26);
 
         txt= "click/*comment here*/:clack ";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event:id', 28);
+            'Kss event selector must end with an event qualifier :event or :event(id)', 28);
 
         txt= "/*comment here*/click:clack ";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
 
-        txt= " no-document:click:hello";
+        txt= " no-document:click(hello)";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.finished, true);
@@ -449,7 +530,7 @@
             
         // Event method selectors
 
-        txt= " document:click:hello  ";
+        txt= " document:click(hello)  ";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.finished, true);
@@ -459,7 +540,7 @@
         this.assertEquals(parser.kssSelector.namespace, null);
         this.assertEquals(parser.kssSelector.id, 'hello');
 
-        txt= " document:native-click:hello  ";
+        txt= " document:native-click(hello)  ";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.finished, true);
@@ -472,15 +553,15 @@
         txt= "document";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event:id', 8);
+            'Kss event selector must end with an event qualifier :event or :event(id)', 8);
 
         txt= "document: ";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.kssselector, src, null, true,
-            'Kss event selector must end with an event qualifier :event or :event:id', 10);
+            'Kss event selector must have a one-word name after the colon', 10);
 
         // also, "behaviour:" works
-        txt= " behaviour:click:hello  ";
+        txt= " behaviour:click(hello)  ";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.kssselector(src, null, true);
         this.assertEquals(parser.finished, true);
@@ -531,18 +612,18 @@
             +"   action-server : kukitGetPreviousMonth /* place comment here*/;\n"
             +"   kukitGetPreviousMonth-member: formvar(edit, 'f_member');\n"
             +"}\n"
-            +"#calendar-previous a:dnd-drag:shelve {\n"
+            +"#calendar-previous a:dnd-drag(shelve) {\n"
             +"   action-server : whatever\n"
             +"}\n"
-            +"#button-one:annoyClicker-click:annoy-me {\n"
+            +"#button-one:annoyClicker-click(annoy-me) {\n"
             +"   action-server:     clickedButton;\n"
             +"   clickedButton-id:  nodeattr(id);\n"
             +"}\n"
-            +"document:annoy:annoyMe {\n"
+            +"document:annoy(annoyMe) {\n"
             +"   action-client:    alert;\n"
             +'   alert-message:    "You are an idiot! Ha ha ha. (But just keep on trying...)";\n'
             +"}\n"
-            +"document:annoyClicker-annoy:annoyMe {\n"
+            +"document:annoyClicker-annoy(annoyMe) {\n"
             +"   action-client:    alert;\n"
             +'   alert-message:       "You are an idiot! Ha ha ha. (But just keep on trying...)";\n'
             +"}\n"
@@ -641,7 +722,7 @@
             });
          
         // rule 4
-            // #calendar-previous a:dnd-drag:shelve {
+            // #calendar-previous a:dnd-drag(shelve) {
             //   kss-action : whatever
             // }
         rule = parser.eventRules[4];
@@ -659,7 +740,7 @@
             });
  
         // rule 5
-            //#button-one:annoyClicker-click:annoyMe {
+            //#button-one:annoyClicker-click(annoyMe) {
             //   kss-action:     clickedButton;
             //   id:             nodeattr(id);
             //}
@@ -699,7 +780,7 @@
             });
 
         // rule 7
-            // document:annoyClicker-annoy:annoyMe {
+            // document:annoyClicker-annoy(annoyMe) {
             // annoy#annoy-me {
             //   kss-action:    alert;
             //   message:       "You are an idiot! Ha ha ha. (But just keep on trying...)";

From reebalazs at codespeak.net  Fri Jul 21 18:48:44 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 21 Jul 2006 18:48:44 +0200 (CEST)
Subject: [Kukit-checkins] r30329 - kukit/azaxdemo/trunk/browser
Message-ID: <20060721164844.B24AE100CC@code0.codespeak.net>

Author: reebalazs
Date: Fri Jul 21 18:48:43 2006
New Revision: 30329

Modified:
   kukit/azaxdemo/trunk/browser/more_selectors.kss
Log:
Reverted to eventid in parents syntax

Modified: kukit/azaxdemo/trunk/browser/more_selectors.kss
==============================================================================
--- kukit/azaxdemo/trunk/browser/more_selectors.kss	(original)
+++ kukit/azaxdemo/trunk/browser/more_selectors.kss	Fri Jul 21 18:48:43 2006
@@ -1,29 +1,29 @@
 
-#button-one:annoyclicker-click:annoyMe {
+#button-one:annoyclicker-click(annoyMe) {
 }
 
-behaviour:annoyclicker-doit:annoyMe {
+behaviour:annoyclicker-doit(annoyMe) {
     action-server:     clickedButton;
     clickedButton-id:  nodeattr(id);
 	action-client: log;
 	log-message: "Was here.";
 }
 
-behaviour:annoyclicker-annoy:annoyMe {
+behaviour:annoyclicker-annoy(annoyMe) {
     action-client:     alert;
     alert-message:     "Keep trying until you get there";
 }
 
-#button-two:annoyclicker-click:annoyYou {
+#button-two:annoyclicker-click(annoyYou) {
 	evt-click-count:         2;
 }
 
-behaviour:annoyclicker-doit:annoyYou {
+behaviour:annoyclicker-doit(annoyYou) {
     action-server:     clickedButton;
     clickedButton-id:  nodeattr(id);
 }
 
-behaviour:annoyclicker-annoy:annoyYou {
+behaviour:annoyclicker-annoy(annoyYou) {
     action-client:     alert;
     alert-message:     "Keep trying until you get there, from the second button";
 }

From reebalazs at codespeak.net  Sat Jul 22 10:27:58 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sat, 22 Jul 2006 10:27:58 +0200 (CEST)
Subject: [Kukit-checkins] r30345 - kukit/azax/trunk
Message-ID: <20060722082758.5C9E4100BE@code0.codespeak.net>

Author: reebalazs
Date: Sat Jul 22 10:27:55 2006
New Revision: 30345

Modified:
   kukit/azax/trunk/__init__.py
   kukit/azax/trunk/azaxview.py
   kukit/azax/trunk/commands.py
   kukit/azax/trunk/interfaces.py
Log:
Allow command building from restricted code

Modified: kukit/azax/trunk/__init__.py
==============================================================================
--- kukit/azax/trunk/__init__.py	(original)
+++ kukit/azax/trunk/__init__.py	Sat Jul 22 10:27:55 2006
@@ -1,3 +1,5 @@
+__all__ = ('AzaxBaseView', 'force_unicode', 'AzaxUnicodeError', 'AzaxCommands') 
+
 import mimetypes
 
 mimetypes.types_map['.kkt'] = 'text/xml'    # XXX legacy!
@@ -5,3 +7,11 @@
 
 from azaxview import AzaxBaseView
 from unicode_quirks import force_unicode, AzaxUnicodeError
+from commands import AzaxCommands, AzaxCommand, AzaxParam
+
+# Allow to build commands from restricted code
+from AccessControl import allow_class
+allow_class(AzaxCommands)
+allow_class(AzaxCommand)
+allow_class(AzaxParam)
+allow_class(AzaxUnicodeError)

Modified: kukit/azax/trunk/azaxview.py
==============================================================================
--- kukit/azax/trunk/azaxview.py	(original)
+++ kukit/azax/trunk/azaxview.py	Sat Jul 22 10:27:55 2006
@@ -34,10 +34,7 @@
 
 from Products.Five import BrowserView
 from  commands import AzaxCommands, AzaxCommand
-from selectors import XpathSelector, CssSelector, HtmlIdSelector
 from parsers import XmlParser, HtmlParser
-import zope.component
-from zope.interface import Interface
 
 class AzaxBaseView(BrowserView):
     """ Base azax view
@@ -49,29 +46,26 @@
     def render(self):
         '''All methods must use this to return their command set
         '''
-        adapter = zope.component.getMultiAdapter((self.getCommands(), self.request), Interface, 'render')
-        return adapter.render()
+        return self.getCommands().render(self.request)
 
     def __init__(self, context, request):
         BrowserView.__init__(self, context, request)
         self.commands = AzaxCommands()
 
     def addCommand(self, name, selector=None):
-        command = AzaxCommand(name, selector=selector)
-        self.commands.append(command)
-        return command
+        return self.commands.addCommand(name, selector=selector)
 
     def getCommands(self):
         return self.commands
 
     def getXpathSelector(self, selector):
-        return XpathSelector(selector)
+        return self.commands.getXpathSelector(selector)
             
     def getCssSelector(self, selector):
-        return CssSelector(selector)
+        return self.commands.getCssSelector(selector)
             
     def getHtmlIdSelector(self, selector):
-        return HtmlIdSelector(selector)
+        return self.commands.getHtmlIdSelector(selector)
             
     # --
     # default set of commands

Modified: kukit/azax/trunk/commands.py
==============================================================================
--- kukit/azax/trunk/commands.py	(original)
+++ kukit/azax/trunk/commands.py	Sat Jul 22 10:27:55 2006
@@ -30,10 +30,33 @@
 from interfaces import IAzaxCommands, IAzaxCommand, IAzaxParam
 from plugins import Command
 from unicode_quirks import force_unicode
+from zope.interface import Interface
+import zope.component
+from selectors import XpathSelector, CssSelector, HtmlIdSelector
 
 class AzaxCommands(list):
     implements(IAzaxCommands)
-    
+ 
+    def addCommand(self, name, selector=None):
+        command = AzaxCommand(name, selector=selector)
+        self.append(command)
+        return command
+   
+    def render(self, request):
+        '''All methods must use this to return their command set
+        '''
+        adapter = zope.component.getMultiAdapter((self, request), Interface, 'render')
+        return adapter.render()
+
+    def getXpathSelector(self, selector):
+        return XpathSelector(selector)
+            
+    def getCssSelector(self, selector):
+        return CssSelector(selector)
+            
+    def getHtmlIdSelector(self, selector):
+        return HtmlIdSelector(selector)
+
 class AzaxParam:
     implements(IAzaxParam)
     

Modified: kukit/azax/trunk/interfaces.py
==============================================================================
--- kukit/azax/trunk/interfaces.py	(original)
+++ kukit/azax/trunk/interfaces.py	Sat Jul 22 10:27:55 2006
@@ -24,8 +24,70 @@
 class IAzaxCommands(Interface):
     'Azax commands'
 
+    def addCommand(self, name, selector=None):
+        'Add a command'
+   
+    def render(self, request):
+        'All methods must use this to return their command set'
+
+    def getXpathSelector(self, selector):
+        'Return selector'
+            
+    def getCssSelector(self, selector):
+        'Return selector'
+            
+    def getHtmlIdSelector(self, selector):
+        'Return selector'
+
 class IAzaxCommand(Interface):
     'An Azax command'
 
+    def addParam(self, name, content=''):
+        'Add the param as is'
+
+    #
+    # Some helpers
+    #
+
+    def addUnicodeParam(self, name, content=''):
+        'Add the param as unicode'
+
+    def addStringParam(self, name, content='', encoding='utf'):
+        'Add the param as an encoded string, by default UTF-8'
+
+    def addHtmlParam(self, name, content=''):
+        'Add the param as an HTML content.'
+
+    def addXmlParam(self, name, content=''):
+        'Add the param as XML content'
+
+    def addCdataParam(self, name, content=''):
+        'Add the param as a CDATA node'
+
+    # --
+    # Accessors, not sure if we need them
+    # --
+
+    def getName(self):
+        ''
+
+    def getSelector(self):
+        ''
+
+    def getSelectorType(self):
+        ''
+
+    def getParams(self):
+        ''
+
 class IAzaxParam(Interface):
     'An Azax parameter'
+    
+    def force_content_unicode(self):
+        'Content must be str with ascii encoding, or unicode'
+
+    def getName(self):
+        ''
+
+    def getContent(self):
+        ''

From reebalazs at codespeak.net  Tue Jul 25 14:54:11 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 25 Jul 2006 14:54:11 +0200 (CEST)
Subject: [Kukit-checkins] r30522 - in kukit/azaxdemo/trunk: . browser
Message-ID: <20060725125411.363E5100A0@code0.codespeak.net>

Author: reebalazs
Date: Tue Jul 25 14:54:07 2006
New Revision: 30522

Added:
   kukit/azaxdemo/trunk/browser/azax_xpath.kss
   kukit/azaxdemo/trunk/browser/azax_xpath.pt
Modified:
   kukit/azaxdemo/trunk/browser/azax_demo_index.pt
   kukit/azaxdemo/trunk/browser/azax_instant_edit.pt
   kukit/azaxdemo/trunk/browser/header_macros.pt
   kukit/azaxdemo/trunk/configure.zcml
Log:
Resources refactoring: separate xpath demo, temporarily disabled

Modified: kukit/azaxdemo/trunk/browser/azax_demo_index.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_demo_index.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_demo_index.pt	Tue Jul 25 14:54:07 2006
@@ -7,6 +7,7 @@
      <li><a href="two_selects.html">Two selects</a></li>
      <li><a href="three_autoupdate.html">Three autoupdate</a></li>
      <li><a href="azax_instant_edit.html">instant edit</a></li>
+     <!--li><a href="azax_xpath.html">xpath</a></li-->
      <li><a href="cancel_submit.html">Cancel Submit Click</a></li>
      <li><a href="azax_tree.html">Tree</a></li>
      <li><a href="more_selectors.html">More complex selectors</a></li>

Modified: kukit/azaxdemo/trunk/browser/azax_instant_edit.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_instant_edit.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_instant_edit.pt	Tue Jul 25 14:54:07 2006
@@ -16,38 +16,5 @@
         </div>
     </form>
 	</div>
-
-<hr>
-<p>Noone except Godefroid knows, what the part below this does. You
-can safely ignore it, just click on "Click me".</p>
-<br>
-<p>ab</p>
-<input onclick="test();" type="submit" />
-<script>function test() {
-        var
-        res=xpathDomEval("//P[@id='xpath']/following-sibling::*[position()=1]", document);
-        if (res.nodeSetValue() == null) {alert('null');}
-        else {
-        Log.write(''+res.stringValue());
-        Log.show();
-        Log.write(''+res.nodeSetValue().length);
-        Log.show();
-        }
-        /*res=xpathDomEval("following-sibling::P", res.nodeSetValue()[0]);
-        if (res.nodeSetValue() == null) {alert('null');}
-        else {
-        Log.write(''+res.stringValue());
-        Log.show();
-        Log.write(''+res.nodeSetValue().length);
-        Log.show();
-        }*/
-        }
-</script>
-<p><a id="remove_xpath">Remove Node with XPath</a><p>
-<p id="xpath">XPath</p>
-<p>next 1</p>
-<p>next 2</p>
-<p>next 3</p>
-
   </body>
 </html>

Added: kukit/azaxdemo/trunk/browser/azax_xpath.kss
==============================================================================
--- (empty file)
+++ kukit/azaxdemo/trunk/browser/azax_xpath.kss	Tue Jul 25 14:54:07 2006
@@ -0,0 +1 @@
+

Added: kukit/azaxdemo/trunk/browser/azax_xpath.pt
==============================================================================
--- (empty file)
+++ kukit/azaxdemo/trunk/browser/azax_xpath.pt	Tue Jul 25 14:54:07 2006
@@ -0,0 +1,44 @@
+<html>
+  <head>
+    <link rel="kukit" type="text/css"
+          tal:attributes="href string:${context/absolute_url}/++resource++azax_xpath.kss"/>
+    <metal:header use-macro="context/header_macros/macros/header_resources" />
+    <metal:header use-macro="context/header_macros/macros/ajaxslt_extra_resources" />
+  </head>
+  <body>
+    <p><a href=".">All demos</a></p>
+
+<h3>xpath Demo</h3>
+<p>Some preliminary xpath demo. Godefroid's test area.
+</p>
+<br>
+<p>ab</p>
+<input onclick="test();" type="submit" />
+<script>function test() {
+        var
+        res=xpathDomEval("//P[@id='xpath']/following-sibling::*[position()=1]", document);
+        if (res.nodeSetValue() == null) {alert('null');}
+        else {
+        Log.write(''+res.stringValue());
+        Log.show();
+        Log.write(''+res.nodeSetValue().length);
+        Log.show();
+        }
+        /*res=xpathDomEval("following-sibling::P", res.nodeSetValue()[0]);
+        if (res.nodeSetValue() == null) {alert('null');}
+        else {
+        Log.write(''+res.stringValue());
+        Log.show();
+        Log.write(''+res.nodeSetValue().length);
+        Log.show();
+        }*/
+        }
+</script>
+<p><a id="remove_xpath">Remove Node with XPath</a><p>
+<p id="xpath">XPath</p>
+<p>next 1</p>
+<p>next 2</p>
+<p>next 3</p>
+
+  </body>
+</html>

Modified: kukit/azaxdemo/trunk/browser/header_macros.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/header_macros.pt	(original)
+++ kukit/azaxdemo/trunk/browser/header_macros.pt	Tue Jul 25 14:54:07 2006
@@ -13,7 +13,15 @@
       tal:attributes="src string:${context/absolute_url}/++resource++MochiKit.js;"
       src="++resource++MochiKit.js">
     </script>
+    <script type="text/javascript"
+      tal:attributes="src string:${context/absolute_url}/++resource++kukit.js;"
+      src="++resource++kukit.js">
+    </script>
+    </metal:header>
+
     <!-- ajaxslt-->
+
+    <metal:header define-macro="ajaxslt_extra_resources">
     <script type="text/javascript"
       tal:attributes="src
       string:${context/absolute_url}/++resource++ajaxslt_misc.js;"
@@ -34,9 +42,5 @@
       string:${context/absolute_url}/++resource++ajaxslt_xslt.js;"
       src="++resource++ajaxslt_xslt.js">
     </script-->
-    <script type="text/javascript"
-      tal:attributes="src string:${context/absolute_url}/++resource++kukit.js;"
-      src="++resource++kukit.js">
-    </script>
     </metal:header>
 </html>    

Modified: kukit/azaxdemo/trunk/configure.zcml
==============================================================================
--- kukit/azaxdemo/trunk/configure.zcml	(original)
+++ kukit/azaxdemo/trunk/configure.zcml	Tue Jul 25 14:54:07 2006
@@ -178,6 +178,18 @@
       permission="zope2.View"
       />
 
+  <!-- xpath content -->
+  <browser:page
+      for=".interfaces.ISimpleContent"
+      template="browser/azax_xpath.pt"
+      name="azax_xpath.html"
+      permission="zope2.View"
+      />
+
+  <browser:resource
+    file="browser/azax_xpath.kss"
+    name="azax_xpath.kss"
+  />
 
   <!-- cancel submit -->
   <browser:page

From reebalazs at codespeak.net  Tue Jul 25 15:26:13 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 25 Jul 2006 15:26:13 +0200 (CEST)
Subject: [Kukit-checkins] r30524 - kukit/azaxdemo/trunk
Message-ID: <20060725132613.EAE2B100AC@code0.codespeak.net>

Author: reebalazs
Date: Tue Jul 25 15:26:12 2006
New Revision: 30524

Modified:
   kukit/azaxdemo/trunk/azaxview.py
   kukit/azaxdemo/trunk/configure.zcml
Log:
Resources refactoring: separate xpath demo, fix

Modified: kukit/azaxdemo/trunk/azaxview.py
==============================================================================
--- kukit/azaxdemo/trunk/azaxview.py	(original)
+++ kukit/azaxdemo/trunk/azaxview.py	Tue Jul 25 15:26:12 2006
@@ -107,7 +107,7 @@
         return self.render()
 
     def removeNodeXpath(self):
-        sel = self.getXpathSelector("//P[@id='xpath']/following-sibling::*[position()=1]")
+        sel = self.getSelector('xpath', "//P[@id='xpath']/following-sibling::*[position()=1]")
         self.removeNode(sel)
         return self.render()
        

Modified: kukit/azaxdemo/trunk/configure.zcml
==============================================================================
--- kukit/azaxdemo/trunk/configure.zcml	(original)
+++ kukit/azaxdemo/trunk/configure.zcml	Tue Jul 25 15:26:12 2006
@@ -191,6 +191,14 @@
     name="azax_xpath.kss"
   />
 
+  <browser:page
+      for=".interfaces.ISimpleContent"
+      class=".azaxview.AzaxView"
+      attribute="removeNodeXpath"
+      name="removeNodeXpath"
+      permission="zope2.View"
+      />
+
   <!-- cancel submit -->
   <browser:page
       for=".interfaces.ISimpleContent"
@@ -212,15 +220,6 @@
       permission="zope2.View"
       />
 
-  <browser:page
-      for=".interfaces.ISimpleContent"
-      class=".azaxview.AzaxView"
-      attribute="removeNodeXpath"
-      name="removeNodeXpath"
-      permission="zope2.View"
-      />
-
-
   <!-- tree content -->
   <browser:page
       for=".interfaces.ISimpleContent"

From reebalazs at codespeak.net  Tue Jul 25 15:42:58 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 25 Jul 2006 15:42:58 +0200 (CEST)
Subject: [Kukit-checkins] r30525 - in kukit/kukit.js/trunk:
	3rd_party/ajaxslt kukit tests
Message-ID: <20060725134258.27E80100AC@code0.codespeak.net>

Author: reebalazs
Date: Tue Jul 25 15:42:55 2006
New Revision: 30525

Added:
   kukit/kukit.js/trunk/kukit/selectorreg.js
Removed:
   kukit/kukit.js/trunk/3rd_party/ajaxslt/
Modified:
   kukit/kukit.js/trunk/kukit/commandreg.js
   kukit/kukit.js/trunk/kukit/kukit.js
   kukit/kukit.js/trunk/tests/runner.html
   kukit/kukit.js/trunk/tests/runtests.sh
Log:
Selectors refactoring

- making selectors also fully pluggable incl. server side support

- changes on the js side of selector registry

	* the "default" selector type is now not a selector type,
      however it comes to effect when no type is specified
	  similarly to the previous behaviour

	* unregistered selector types will signal an error instead
	  of falling back to the default

	* Redefinition of selectors is not allowed

- move out the xslt stuff to an addon



Modified: kukit/kukit.js/trunk/kukit/commandreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/commandreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/commandreg.js	Tue Jul 25 15:42:55 2006
@@ -43,7 +43,7 @@
 kukit.cr._Command_execute_selector = function(node, parms, eventrule, eventinstance, orignode) {
     kukit.logDebug('Selector type: ' + this.selectorType);
     kukit.logDebug('Selector : ' + this.selector);
-    var selfunc = kukit.selectors.get(this.selectorType);
+    var selfunc = kukit.sr.selectorRegistry.get(this.selectorType);
     var nodes = selfunc(this.selector);
     if (!nodes || nodes.length == 0) {
         kukit.logError('Command found no nodes');

Modified: kukit/kukit.js/trunk/kukit/kukit.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kukit.js	(original)
+++ kukit/kukit.js/trunk/kukit/kukit.js	Tue Jul 25 15:42:55 2006
@@ -490,53 +490,3 @@
     }
 };
 
-/* selector registry */
- 
-kukit.selectors = {};
- 
-kukit.selectors._mapping = {};
-
-kukit.selectors.register = function(name, func) {
-    if (typeof(func) == 'undefined') {
-        throw 'Func is mandatory.';
-    }
-    kukit.selectors._mapping[name] = func;
-};
-
-kukit.selectors.get = function(name) {
-    var result = kukit.selectors._mapping[name];
-    if (!result && name != 'default')
-        return kukit.selectors.get('default');
-    return result;
-};
-
-kukit.selectors.register('htmlid', function(expr, node) {
-    if (!node)
-        node = document;
-    var nodes = [];
-    var node = node.getElementById(expr);
-    if (node)
-        nodes[nodes.length] = node;
-    kukit.logDebug('HTMLID nodes number: '+nodes.length);
-    return nodes;
-});
-
-kukit.selectors.register('css', function(expr, node) {
-    var nodes = cssQuery(expr, node);
-    kukit.logDebug('CSS nodes number: '+nodes.length);
-    return nodes;
-});
- 
-kukit.selectors.register('xpath', function(expr, node) {
-    if (!node)
-        node = document;
-    var xpath_res = xpathDomEval(expr, node);
-    kukit.logDebug('XPath nodes:'+xpath_res.stringValue());
-    var nodes = xpath_res.nodeSetValue();
-    kukit.logDebug('XPath nodes number: '+nodes.length);
-    return nodes;
-});
-
-kukit.selectors.register('default', kukit.selectors.get('css'));
-
-

Added: kukit/kukit.js/trunk/kukit/selectorreg.js
==============================================================================
--- (empty file)
+++ kukit/kukit.js/trunk/kukit/selectorreg.js	Tue Jul 25 15:42:55 2006
@@ -0,0 +1,65 @@
+
+/* Selector registration */
+
+kukit.sr = {};
+
+/* Selector registry 
+*
+*  available for plugin registration
+*
+*  usage:
+*
+*  kukit.sr.selectorRegistry.register(name, func);
+*
+*/
+
+kukit.sr.SelectorRegistry = function () {
+    this.mapping = {};
+};
+
+kukit.sr.SelectorRegistry.prototype.defaultSelectorType = 'css';
+
+kukit.sr.SelectorRegistry.prototype.register = function(name, func) {
+    if (typeof(func) == 'undefined') {
+        throw 'Func is mandatory.';
+    }
+    if (this.mapping[name]) {
+        // Do not allow redefinition
+        kukit.logError('Error : redefinition attempt of selector ' + name);
+        return;
+    }
+    this.mapping[name] = func;
+};
+
+kukit.sr.SelectorRegistry.prototype.get = function(name) {
+    if (! name) {
+        // if name is null or undefined or '',
+        // we use the default type.
+        name = this.defaultSelectorType;
+    }
+    var result = this.mapping[name];
+    if (typeof(result) == 'undefined') {
+        throw 'Unknown selector type "' + name + '"';
+    }
+    return result;
+};
+
+kukit.sr.selectorRegistry = new kukit.sr.SelectorRegistry();
+
+kukit.sr.selectorRegistry.register('htmlid', function(expr, node) {
+    if (!node)
+        node = document;
+    var nodes = [];
+    var node = node.getElementById(expr);
+    if (node)
+        nodes[nodes.length] = node;
+    kukit.logDebug('HTMLID nodes number: '+nodes.length);
+    return nodes;
+});
+
+kukit.sr.selectorRegistry.register('css', function(expr, node) {
+    var nodes = cssQuery(expr, node);
+    kukit.logDebug('CSS nodes number: '+nodes.length);
+    return nodes;
+});
+

Modified: kukit/kukit.js/trunk/tests/runner.html
==============================================================================
--- kukit/kukit.js/trunk/tests/runner.html	(original)
+++ kukit/kukit.js/trunk/tests/runner.html	Tue Jul 25 15:42:55 2006
@@ -23,6 +23,7 @@
         <script type="text/javascript" src="../kukit/actionreg.js"> </script>
         <script type="text/javascript" src="../kukit/dom.js"> </script>
         <script type="text/javascript" src="../kukit/commandreg.js"> </script>
+        <script type="text/javascript" src="../kukit/selectorreg.js"> </script>
         <script type="text/javascript" src="../kukit/forms.js"> </script>
         <script type="text/javascript" src="../kukit/plugin.js"> </script>
         <script type="text/javascript" src="test_tokenizer.js"> </script>

Modified: kukit/kukit.js/trunk/tests/runtests.sh
==============================================================================
--- kukit/kukit.js/trunk/tests/runtests.sh	(original)
+++ kukit/kukit.js/trunk/tests/runtests.sh	Tue Jul 25 15:42:55 2006
@@ -9,6 +9,7 @@
 	-f ../kukit/actionreg.js \
 	-f ../kukit/dom.js \
 	-f ../kukit/commandreg.js \
+	-f ../kukit/selectorreg.js \
 	-f ../kukit/forms.js \
 	-f ../kukit/plugin.js \
 	-f test_tokenizer.js \

From reebalazs at codespeak.net  Tue Jul 25 15:51:20 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 25 Jul 2006 15:51:20 +0200 (CEST)
Subject: [Kukit-checkins] r30527 - in kukit/azax/trunk: . plugins
Message-ID: <20060725135120.406EE10094@code0.codespeak.net>

Author: reebalazs
Date: Tue Jul 25 15:51:16 2006
New Revision: 30527

Added:
   kukit/azax/trunk/plugins/selector_type.py
Modified:
   kukit/azax/trunk/azaxview.py
   kukit/azax/trunk/commands.py
   kukit/azax/trunk/configure.zcml
   kukit/azax/trunk/interfaces.py
   kukit/azax/trunk/plugins/__init__.py
   kukit/azax/trunk/plugins/configure.py
   kukit/azax/trunk/plugins/configure.zcml
   kukit/azax/trunk/plugins/directives.py
   kukit/azax/trunk/plugins/meta.zcml
   kukit/azax/trunk/selectors.py
Log:
Selectors refactoring

- making selectors also fully pluggable incl. server side support

- changes on the js side of selector registry

	* the "default" selector type is now not a selector type,
      however it comes to effect when no type is specified
	  similarly to the previous behaviour

	* unregistered selector types will signal an error instead
	  of falling back to the default

	* Redefinition of selectors is not allowed

- move out the xslt stuff to an addon



Modified: kukit/azax/trunk/azaxview.py
==============================================================================
--- kukit/azax/trunk/azaxview.py	(original)
+++ kukit/azax/trunk/azaxview.py	Tue Jul 25 15:51:16 2006
@@ -58,9 +58,10 @@
     def getCommands(self):
         return self.commands
 
-    def getXpathSelector(self, selector):
-        return self.commands.getXpathSelector(selector)
-            
+    def getSelector(self, type, selector):
+        'Gets selector of given type'
+        return self.commands.getSelector(type, selector)
+
     def getCssSelector(self, selector):
         return self.commands.getCssSelector(selector)
             

Modified: kukit/azax/trunk/commands.py
==============================================================================
--- kukit/azax/trunk/commands.py	(original)
+++ kukit/azax/trunk/commands.py	Tue Jul 25 15:51:16 2006
@@ -28,11 +28,11 @@
 from zope.interface import implements
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from interfaces import IAzaxCommands, IAzaxCommand, IAzaxParam
-from plugins import Command
+import plugins
 from unicode_quirks import force_unicode
 from zope.interface import Interface
 import zope.component
-from selectors import XpathSelector, CssSelector, HtmlIdSelector
+from selectors import Selector, CssSelector, HtmlIdSelector
 
 class AzaxCommands(list):
     implements(IAzaxCommands)
@@ -48,15 +48,19 @@
         adapter = zope.component.getMultiAdapter((self, request), Interface, 'render')
         return adapter.render()
 
-    def getXpathSelector(self, selector):
-        return XpathSelector(selector)
-            
+    def getSelector(self, type, selector):
+        'Get a selector of a given type'
+        return Selector(type, selector)
+
+    # some more helpers...
+
     def getCssSelector(self, selector):
         return CssSelector(selector)
             
     def getHtmlIdSelector(self, selector):
         return HtmlIdSelector(selector)
 
+
 class AzaxParam:
     implements(IAzaxParam)
     
@@ -78,15 +82,17 @@
     implements(IAzaxCommand)
     
     def __init__(self, name, selector=None):
-        Command.checkRegistered(name)
+        plugins.Command.checkRegistered(name)
         if isinstance(selector, basestring): 
             self.selector = selector
             self.selectorType = ''
         else:
             if selector is not None:
+                plugins.SelectorType.checkRegistered(selector.type)
                 self.selector = selector.value
                 self.selectorType = selector.type
             else:
+                # XXX TODO get rid of these...
                 self.selector = 'dummy' #None
                 self.selectorType = 'dummy' #None
         self.name = name
@@ -150,7 +156,6 @@
     def getParams(self):
         return self.params
 
-
 class CommandView(object):
     '''View of a command.
     

Modified: kukit/azax/trunk/configure.zcml
==============================================================================
--- kukit/azax/trunk/configure.zcml	(original)
+++ kukit/azax/trunk/configure.zcml	Tue Jul 25 15:51:16 2006
@@ -19,6 +19,7 @@
         kukit/kukit/actionreg.js
         kukit/kukit/dom.js
         kukit/kukit/commandreg.js
+        kukit/kukit/selectorreg.js
         kukit/kukit/forms.js
         kukit/kukit/plugin.js"
     name="kukit.js"
@@ -35,25 +36,7 @@
     name="MochiKit.js"
   />
 
-  <browser:resource
-    file="kukit/3rd_party/ajaxslt/misc.js"
-    name="ajaxslt_misc.js"
-  />
-
-  <browser:resource
-    file="kukit/3rd_party/ajaxslt/dom.js"
-    name="ajaxslt_dom.js"
-  />
-
-  <browser:resource
-    file="kukit/3rd_party/ajaxslt/xpath.js"
-    name="ajaxslt_xpath.js"
-  />
-
-  <browser:resource
-    file="kukit/3rd_party/ajaxslt/xslt.js"
-    name="ajaxslt_xslt.js"
-  />
+<!-- testing support (XXX do we need this?) -->
 
   <browser:resource
     file="tests/js/runner.html"

Modified: kukit/azax/trunk/interfaces.py
==============================================================================
--- kukit/azax/trunk/interfaces.py	(original)
+++ kukit/azax/trunk/interfaces.py	Tue Jul 25 15:51:16 2006
@@ -30,9 +30,11 @@
     def render(self, request):
         'All methods must use this to return their command set'
 
-    def getXpathSelector(self, selector):
+    def getSelector(self, type, selector):
         'Return selector'
-            
+
+    # more helpers for the basic selectors
+
     def getCssSelector(self, selector):
         'Return selector'
             

Modified: kukit/azax/trunk/plugins/__init__.py
==============================================================================
--- kukit/azax/trunk/plugins/__init__.py	(original)
+++ kukit/azax/trunk/plugins/__init__.py	Tue Jul 25 15:51:16 2006
@@ -7,3 +7,4 @@
 from command import Command
 from event_type import EventType
 from event_action import EventAction
+from selector_type import SelectorType

Modified: kukit/azax/trunk/plugins/configure.py
==============================================================================
--- kukit/azax/trunk/plugins/configure.py	(original)
+++ kukit/azax/trunk/plugins/configure.py	Tue Jul 25 15:51:16 2006
@@ -3,6 +3,7 @@
 from command import Command
 from event_type import EventType
 from event_action import EventAction
+from selector_type import SelectorType
 from plugin import registerPlugin
 
 #class AzaxConfigurationError(Exception):
@@ -46,3 +47,16 @@
         callable = registerPlugin,
         args = (EventAction, name, jsfile),
         )
+
+def registerSelectorType(_context, name, jsfile=None):
+    'Directive that registers a selector type' 
+    
+    # check to see if the file exists
+    if jsfile is not None:
+        file(jsfile, 'rb').close()
+
+    _context.action(
+        discriminator = ('registerAzaxSelectorType', name, jsfile),
+        callable = registerPlugin,
+        args = (SelectorType, name, jsfile),
+        )

Modified: kukit/azax/trunk/plugins/configure.zcml
==============================================================================
--- kukit/azax/trunk/plugins/configure.zcml	(original)
+++ kukit/azax/trunk/plugins/configure.zcml	Tue Jul 25 15:51:16 2006
@@ -25,6 +25,11 @@
           jsfile="browser/my_plugins.js"
           />
   
+      <azax:registerSelectorType
+          name="myCustomSelectorType"
+          jsfile="browser/my_plugins.js"
+          />
+
      -->
 
      <!-- register core plugins 
@@ -159,4 +164,14 @@
         name="alert"
         />
 
+     <!-- Selector types -->
+
+    <azax:registerSelectorType
+        name="css"
+        />
+
+    <azax:registerSelectorType
+        name="htmlid"
+        />
+
 </configure>

Modified: kukit/azax/trunk/plugins/directives.py
==============================================================================
--- kukit/azax/trunk/plugins/directives.py	(original)
+++ kukit/azax/trunk/plugins/directives.py	Tue Jul 25 15:51:16 2006
@@ -46,3 +46,18 @@
          description=u"The path of the javascript file that defines the plugin",
          required=False,
          )
+
+class IRegisterSelectorTypeDirective(Interface):
+    'Register an AZAX selector type'
+    
+    name = TextLine(
+         title=u"Name",
+         description=u"The name of the selector type plugin.",
+         required=True,
+         )
+    
+    jsfile = Path(
+         title=u"Javascript file",
+         description=u"The path of the javascript file that defines the plugin",
+         required=False,
+         )

Modified: kukit/azax/trunk/plugins/meta.zcml
==============================================================================
--- kukit/azax/trunk/plugins/meta.zcml	(original)
+++ kukit/azax/trunk/plugins/meta.zcml	Tue Jul 25 15:51:16 2006
@@ -24,6 +24,12 @@
        handler=".configure.registerEventAction"
        />
 
+    <directive
+       name="registerSelectorType"
+       schema=".directives.IRegisterSelectorTypeDirective"
+       handler=".configure.registerSelectorType"
+       />
+
    </directives>
 
 </configure>

Added: kukit/azax/trunk/plugins/selector_type.py
==============================================================================
--- (empty file)
+++ kukit/azax/trunk/plugins/selector_type.py	Tue Jul 25 15:51:16 2006
@@ -0,0 +1,12 @@
+
+from plugin import Plugin
+
+class SelectorType(Plugin):
+    '''The selectortype plugin
+
+    '''
+
+    plugintype = 'selectortype'
+
+    def __init__(self, name, jsfile):
+        Plugin.__init__(self, name, jsfile)

Modified: kukit/azax/trunk/selectors.py
==============================================================================
--- kukit/azax/trunk/selectors.py	(original)
+++ kukit/azax/trunk/selectors.py	Tue Jul 25 15:51:16 2006
@@ -18,7 +18,6 @@
 # 02111-1307, USA.
 #
 
-XPATH_SELECTOR = 'xpath'
 CSS_SELECTOR = 'css'
 HTMLID_SELECTOR = 'htmlid' 
 
@@ -27,11 +26,16 @@
     def __init__(self, selector):
         self.value = selector
         
-class XpathSelector(SelectorBase):
-    type = XPATH_SELECTOR
-
 class CssSelector(SelectorBase):
     type = CSS_SELECTOR
         
 class HtmlIdSelector(SelectorBase):
     type = HTMLID_SELECTOR        
+
+# A generic (pluggable) selector
+
+class Selector(SelectorBase):
+
+    def __init__(self, type, selector):
+        self.type = type
+        SelectorBase.__init__(selector)

From reebalazs at codespeak.net  Tue Jul 25 15:52:08 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 25 Jul 2006 15:52:08 +0200 (CEST)
Subject: [Kukit-checkins] r30528 - kukit/azaxslt
Message-ID: <20060725135208.88BDB10094@code0.codespeak.net>

Author: reebalazs
Date: Tue Jul 25 15:52:07 2006
New Revision: 30528

Added:
   kukit/azaxslt/
Log:
init

From reebalazs at codespeak.net  Tue Jul 25 15:52:16 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 25 Jul 2006 15:52:16 +0200 (CEST)
Subject: [Kukit-checkins] r30529 - kukit/azaxslt/branch
Message-ID: <20060725135216.5593B10094@code0.codespeak.net>

Author: reebalazs
Date: Tue Jul 25 15:52:15 2006
New Revision: 30529

Added:
   kukit/azaxslt/branch/
Log:
init

From reebalazs at codespeak.net  Tue Jul 25 15:52:20 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 25 Jul 2006 15:52:20 +0200 (CEST)
Subject: [Kukit-checkins] r30530 - kukit/azaxslt/tag
Message-ID: <20060725135220.7EB891009D@code0.codespeak.net>

Author: reebalazs
Date: Tue Jul 25 15:52:19 2006
New Revision: 30530

Added:
   kukit/azaxslt/tag/
Log:
init

From reebalazs at codespeak.net  Tue Jul 25 15:52:56 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 25 Jul 2006 15:52:56 +0200 (CEST)
Subject: [Kukit-checkins] r30531 - in kukit/azaxslt/trunk: . browser
	browser/3rd_party browser/3rd_party/ajaxslt
Message-ID: <20060725135256.4469410094@code0.codespeak.net>

Author: reebalazs
Date: Tue Jul 25 15:52:52 2006
New Revision: 30531

Added:
   kukit/azaxslt/trunk/
   kukit/azaxslt/trunk/README
   kukit/azaxslt/trunk/__init__.py
   kukit/azaxslt/trunk/browser/
   kukit/azaxslt/trunk/browser/3rd_party/
   kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/
   kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/dom.js
   kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/misc.js
   kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/version.txt
   kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/xpath.js
   kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/xslt.js
   kukit/azaxslt/trunk/browser/plugin.js
   kukit/azaxslt/trunk/configure.zcml
Log:
init

Added: kukit/azaxslt/trunk/README
==============================================================================
--- (empty file)
+++ kukit/azaxslt/trunk/README	Tue Jul 25 15:52:52 2006
@@ -0,0 +1,8 @@
+
+This is an addon product for azax. It contains the registration
+of xpath selectors that can be used in commands.
+
+This is quite untested and is not suggested to be used at the
+moment. Originally this formed parts of kukit but we moved
+it out from the core.
+

Added: kukit/azaxslt/trunk/__init__.py
==============================================================================
--- (empty file)
+++ kukit/azaxslt/trunk/__init__.py	Tue Jul 25 15:52:52 2006
@@ -0,0 +1,4 @@
+'''\
+Module init
+'''
+

Added: kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/dom.js
==============================================================================
--- (empty file)
+++ kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/dom.js	Tue Jul 25 15:52:52 2006
@@ -0,0 +1,428 @@
+// Copyright 2005 Google Inc.
+// All Rights Reserved
+//
+// An XML parse and a minimal DOM implementation that just supportes
+// the subset of the W3C DOM that is used in the XSLT implementation.
+//
+// References: 
+//
+// [DOM] W3C DOM Level 3 Core Specification
+//       <http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/>.
+//
+// 
+// Author: Steffen Meschkat <mesch at google.com>
+
+// NOTE: The split() method in IE omits empty result strings. This is
+// utterly annoying. So we don't use it here.
+
+// Resolve entities in XML text fragments. According to the DOM
+// specification, the DOM is supposed to resolve entity references at
+// the API level. I.e. no entity references are passed through the
+// API. See "Entities and the DOM core", p.12, DOM 2 Core
+// Spec. However, different browsers actually pass very different
+// values at the API.
+//
+function xmlResolveEntities(s) {
+
+  var parts = stringSplit(s, '&');
+
+  var ret = parts[0];
+  for (var i = 1; i < parts.length; ++i) {
+    var rp = stringSplit(parts[i], ';');
+    if (rp.length == 1) {
+      // no entity reference: just a & but no ;
+      ret += parts[i];
+      continue;
+    }
+    
+    var ch;
+    switch (rp[0]) {
+      case 'lt': 
+        ch = '<';
+        break;
+      case 'gt': 
+        ch = '>';
+        break;
+      case 'amp': 
+        ch = '&';
+        break;
+      case 'quot': 
+        ch = '"';
+        break;
+      case 'apos': 
+        ch = '\'';
+        break;
+      case 'nbsp': 
+        ch = String.fromCharCode(160);
+        break;
+      default:
+        // Cool trick: let the DOM do the entity decoding. We assign
+        // the entity text through non-W3C DOM properties and read it
+        // through the W3C DOM. W3C DOM access is specified to resolve
+        // entities. 
+        var span = window.document.createElement('span');
+        span.innerHTML = '&' + rp[0] + '; ';
+        ch = span.childNodes[0].nodeValue.charAt(0);
+    }
+    ret += ch + rp[1];
+  }
+
+  return ret;
+}
+
+
+// Parses the given XML string with our custom, JavaScript XML parser. Written
+// by Steffen Meschkat (mesch at google.com).
+function xmlParse(xml) {
+  Timer.start('xmlparse');
+  var regex_empty = /\/$/;
+
+  // See also <http://www.w3.org/TR/REC-xml/#sec-common-syn> for
+  // allowed chars in a tag and attribute name. TODO(mesch): the
+  // following is still not completely correct.
+
+  var regex_tagname = /^([\w:-]*)/;
+  var regex_attribute = /([\w:-]+)\s?=\s?('([^\']*)'|"([^\"]*)")/g;
+
+  var xmldoc = new XDocument();
+  var root = xmldoc;
+
+  // For the record: in Safari, we would create native DOM nodes, but
+  // in Opera that is not possible, because the DOM only allows HTML
+  // element nodes to be created, so we have to do our own DOM nodes.
+
+  // xmldoc = document.implementation.createDocument('','',null);
+  // root = xmldoc; // .createDocumentFragment();
+  // NOTE(mesch): using the DocumentFragment instead of the Document
+  // crashes my Safari 1.2.4 (v125.12).
+  var stack = [];
+
+  var parent = root;
+  stack.push(parent);
+
+  var x = stringSplit(xml, '<');
+  for (var i = 1; i < x.length; ++i) {
+    var xx = stringSplit(x[i], '>');
+    var tag = xx[0];
+    var text = xmlResolveEntities(xx[1] || '');
+
+    if (tag.charAt(0) == '/') {
+      stack.pop();
+      parent = stack[stack.length-1];
+
+    } else if (tag.charAt(0) == '?') {
+      // Ignore XML declaration and processing instructions
+    } else if (tag.charAt(0) == '!') {
+      // Ignore notation and comments
+    } else {
+      var empty = tag.match(regex_empty);
+      var tagname = regex_tagname.exec(tag)[1];
+      var node = xmldoc.createElement(tagname);
+
+      var att;
+      while (att = regex_attribute.exec(tag)) {
+        var val = xmlResolveEntities(att[3] || att[4] || '');
+        node.setAttribute(att[1], val);
+      }
+      
+      if (empty) {
+        parent.appendChild(node);
+      } else {
+        parent.appendChild(node);
+        parent = node;
+        stack.push(node);
+      }
+    }
+
+    if (text && parent != root) {
+      parent.appendChild(xmldoc.createTextNode(text));
+    }
+  }
+
+  Timer.end('xmlparse');
+  return root;
+}
+
+
+// Our W3C DOM Node implementation. Note we call it XNode because we
+// can't define the identifier Node. We do this mostly for Opera,
+// where we can't reuse the HTML DOM for parsing our own XML, and for
+// Safari, where it is too expensive to have the template processor
+// operate on native DOM nodes.
+function XNode(type, name, value, owner) {
+  this.attributes = [];
+  this.childNodes = [];
+
+  XNode.init.call(this, type, name, value, owner);
+}
+
+// Don't call as method, use apply() or call().
+XNode.init = function(type, name, value, owner) {
+  this.nodeType = type - 0;
+  this.nodeName = '' + name;
+  this.nodeValue = '' + value;
+  this.ownerDocument = owner;
+
+  this.firstChild = null;
+  this.lastChild = null;
+  this.nextSibling = null;
+  this.previousSibling = null;
+  this.parentNode = null;
+}
+
+XNode.unused_ = [];
+
+XNode.recycle = function(node) {
+  if (!node) {
+    return;
+  }
+
+  if (node.constructor == XDocument) {
+    XNode.recycle(node.documentElement);
+    return;
+  }
+
+  if (node.constructor != this) {
+    return;
+  }
+
+  XNode.unused_.push(node);
+  for (var a = 0; a < node.attributes.length; ++a) {
+    XNode.recycle(node.attributes[a]);
+  }
+  for (var c = 0; c < node.childNodes.length; ++c) {
+    XNode.recycle(node.childNodes[c]);
+  }
+  node.attributes.length = 0;
+  node.childNodes.length = 0;
+  XNode.init.call(node, 0, '', '', null);
+}
+
+XNode.create = function(type, name, value, owner) {
+  if (XNode.unused_.length > 0) {
+    var node = XNode.unused_.pop();
+    XNode.init.call(node, type, name, value, owner);
+    return node;
+  } else {
+    return new XNode(type, name, value, owner);
+  }
+}
+
+XNode.prototype.appendChild = function(node) {
+  // firstChild
+  if (this.childNodes.length == 0) {
+    this.firstChild = node;
+  }
+
+  // previousSibling
+  node.previousSibling = this.lastChild;
+
+  // nextSibling
+  node.nextSibling = null;
+  if (this.lastChild) {
+    this.lastChild.nextSibling = node;
+  }
+
+  // parentNode
+  node.parentNode = this;
+
+  // lastChild
+  this.lastChild = node;
+
+  // childNodes
+  this.childNodes.push(node);
+}
+
+
+XNode.prototype.replaceChild = function(newNode, oldNode) {
+  if (oldNode == newNode) {
+    return;
+  }
+
+  for (var i = 0; i < this.childNodes.length; ++i) {
+    if (this.childNodes[i] == oldNode) {
+      this.childNodes[i] = newNode;
+      
+      var p = oldNode.parentNode;
+      oldNode.parentNode = null;
+      newNode.parentNode = p;
+      
+      p = oldNode.previousSibling;
+      oldNode.previousSibling = null;
+      newNode.previousSibling = p;
+      if (newNode.previousSibling) {
+        newNode.previousSibling.nextSibling = newNode;
+      }
+      
+      p = oldNode.nextSibling;
+      oldNode.nextSibling = null;
+      newNode.nextSibling = p;
+      if (newNode.nextSibling) {
+        newNode.nextSibling.previousSibling = newNode;
+      }
+
+      if (this.firstChild == oldNode) {
+        this.firstChild = newNode;
+      }
+
+      if (this.lastChild == oldNode) {
+        this.lastChild = newNode;
+      }
+
+      break;
+    }
+  }
+}
+
+XNode.prototype.insertBefore = function(newNode, oldNode) {
+  if (oldNode == newNode) {
+    return;
+  }
+
+  if (oldNode.parentNode != this) {
+    return;
+  }
+
+  if (newNode.parentNode) {
+    newNode.parentNode.removeChild(newNode);
+  }
+
+  var newChildren = [];
+  for (var i = 0; i < this.childNodes.length; ++i) {
+    var c = this.childNodes[i];
+    if (c == oldNode) {
+      newChildren.push(newNode);
+
+      newNode.parentNode = this;
+
+      newNode.previousSibling = oldNode.previousSibling;
+      oldNode.previousSibling = newNode;
+      if (newNode.previousSibling) {
+        newNode.previousSibling.nextSibling = newNode;
+      }
+      
+      newNode.nextSibling = oldNode;
+
+      if (this.firstChild == oldNode) {
+        this.firstChild = newNode;
+      }
+    }
+    newChildren.push(c);
+  }
+  this.childNodes = newChildren;
+}
+
+XNode.prototype.removeChild = function(node) {
+  var newChildren = [];
+  for (var i = 0; i < this.childNodes.length; ++i) {
+    var c = this.childNodes[i];
+    if (c != node) {
+      newChildren.push(c);
+    } else {
+      if (c.previousSibling) {
+        c.previousSibling.nextSibling = c.nextSibling;
+      }
+      if (c.nextSibling) {
+        c.nextSibling.previousSibling = c.previousSibling;
+      }
+      if (this.firstChild == c) {
+        this.firstChild = c.nextSibling;
+      }
+      if (this.lastChild == c) {
+        this.lastChild = c.previousSibling;
+      }
+    }
+  }
+  this.childNodes = newChildren;
+}
+
+
+XNode.prototype.hasAttributes = function() {
+  return this.attributes.length > 0;
+}
+
+
+XNode.prototype.setAttribute = function(name, value) {
+  for (var i = 0; i < this.attributes.length; ++i) {
+    if (this.attributes[i].nodeName == name) {
+      this.attributes[i].nodeValue = '' + value;
+      return;
+    }
+  }
+  this.attributes.push(new XNode(DOM_ATTRIBUTE_NODE, name, value));
+}
+
+
+XNode.prototype.getAttribute = function(name) {
+  for (var i = 0; i < this.attributes.length; ++i) {
+    if (this.attributes[i].nodeName == name) {
+      return this.attributes[i].nodeValue;
+    }
+  }
+  return null;
+}
+
+XNode.prototype.removeAttribute = function(name) {
+  var a = [];
+  for (var i = 0; i < this.attributes.length; ++i) {
+    if (this.attributes[i].nodeName != name) {
+      a.push(this.attributes[i]);
+    }
+  }
+  this.attributes = a;
+}
+
+
+function XDocument() {
+  XNode.call(this, DOM_DOCUMENT_NODE, '#document', null, this);
+  this.documentElement = null;
+}
+
+XDocument.prototype = new XNode(DOM_DOCUMENT_NODE, '#document');
+
+XDocument.prototype.clear = function() {
+  XNode.recycle(this.documentElement);
+  this.documentElement = null;
+}
+
+XDocument.prototype.appendChild = function(node) {
+  XNode.prototype.appendChild.call(this, node);
+  this.documentElement = this.childNodes[0];
+}
+
+XDocument.prototype.createElement = function(name) {
+  return XNode.create(DOM_ELEMENT_NODE, name, null, this);
+}
+
+XDocument.prototype.createDocumentFragment = function() {
+  return XNode.create(DOM_DOCUMENT_FRAGMENT_NODE, '#document-fragment',
+                    null, this);
+}
+
+XDocument.prototype.createTextNode = function(value) {
+  return XNode.create(DOM_TEXT_NODE, '#text', value, this);
+}
+
+XDocument.prototype.createAttribute = function(name) {
+  return XNode.create(DOM_ATTRIBUTE_NODE, name, null, this);
+}
+
+XDocument.prototype.createComment = function(data) {
+  return XNode.create(DOM_COMMENT_NODE, '#comment', data, this);
+}
+
+XNode.prototype.getElementsByTagName = function(name, list) {
+  if (!list) {
+    list = [];
+  }
+
+  if (this.nodeName == name) {
+    list.push(this);
+  }
+
+  for (var i = 0; i < this.childNodes.length; ++i) {
+    this.childNodes[i].getElementsByTagName(name, list);
+  }
+
+  return list;
+}

Added: kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/misc.js
==============================================================================
--- (empty file)
+++ kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/misc.js	Tue Jul 25 15:52:52 2006
@@ -0,0 +1,255 @@
+// Copyright 2005 Google Inc.
+// All Rights Reserved
+//
+// Miscellania that support the ajaxslt implementation.
+//
+// Author: Steffen Meschkat <mesch at google.com>
+//
+
+function el(i) {
+  return document.getElementById(i);
+}
+
+function px(x) {
+  return x + 'px';
+}
+
+// Split a string s at all occurrences of character c. This is like
+// the split() method of the string object, but IE omits empty
+// strings, which violates the invariant (s.split(x).join(x) == s).
+function stringSplit(s, c) {
+  var a = s.indexOf(c);
+  if (a == -1) {
+    return [ s ];
+  }
+  
+  var parts = [];
+  parts.push(s.substr(0,a));
+  while (a != -1) {
+    var a1 = s.indexOf(c, a + 1);
+    if (a1 != -1) {
+      parts.push(s.substr(a + 1, a1 - a - 1));
+    } else {
+      parts.push(s.substr(a + 1));
+    } 
+    a = a1;
+  }
+
+  return parts;
+}
+
+// Returns the text value if a node; for nodes without children this
+// is the nodeValue, for nodes with children this is the concatenation
+// of the value of all children.
+function xmlValue(node) {
+  if (!node) {
+    return '';
+  }
+
+  var ret = '';
+  if (node.nodeType == DOM_TEXT_NODE ||
+      node.nodeType == DOM_CDATA_SECTION_NODE ||
+      node.nodeType == DOM_ATTRIBUTE_NODE) {
+    ret += node.nodeValue;
+
+  } else if (node.nodeType == DOM_ELEMENT_NODE ||
+             node.nodeType == DOM_DOCUMENT_NODE ||
+             node.nodeType == DOM_DOCUMENT_FRAGMENT_NODE) {
+    for (var i = 0; i < node.childNodes.length; ++i) {
+      ret += arguments.callee(node.childNodes[i]);
+    }
+  }
+  return ret;
+}
+
+// Returns the representation of a node as XML text.
+function xmlText(node) {
+  var ret = '';
+  if (node.nodeType == DOM_TEXT_NODE) {
+    ret += xmlEscapeText(node.nodeValue);
+    
+  } else if (node.nodeType == DOM_ELEMENT_NODE) {
+    ret += '<' + node.nodeName;
+    for (var i = 0; i < node.attributes.length; ++i) {
+      var a = node.attributes[i];
+      if (a && a.nodeName && a.nodeValue) {
+        ret += ' ' + a.nodeName;
+        ret += '="' + xmlEscapeAttr(a.nodeValue) + '"';
+      }
+    }
+
+    if (node.childNodes.length == 0) {
+      ret += '/>';
+
+    } else {
+      ret += '>';
+      for (var i = 0; i < node.childNodes.length; ++i) {
+        ret += arguments.callee(node.childNodes[i]);
+      }
+      ret += '</' + node.nodeName + '>';
+    }
+    
+  } else if (node.nodeType == DOM_DOCUMENT_NODE || 
+             node.nodeType == DOM_DOCUMENT_FRAGMENT_NODE) {
+    for (var i = 0; i < node.childNodes.length; ++i) {
+      ret += arguments.callee(node.childNodes[i]);
+    }
+  }
+  
+  return ret;
+}
+
+// Applies the given function to each element of the array.
+function mapExec(array, func) {
+  for (var i = 0; i < array.length; ++i) {
+    func(array[i]);
+  }
+}
+
+// Returns an array that contains the return value of the given
+// function applied to every element of the input array.
+function mapExpr(array, func) {
+  var ret = [];
+  for (var i = 0; i < array.length; ++i) {
+    ret.push(func(array[i]));
+  }
+  return ret;
+};
+
+// Reverses the given array in place.
+function reverseInplace(array) {
+  for (var i = 0; i < array.length / 2; ++i) {
+    var h = array[i];
+    var ii = array.length - i - 1;
+    array[i] = array[ii];
+    array[ii] = h;
+  }
+}
+
+// Shallow-copies an array.
+function copyArray(dst, src) { 
+  for (var i = 0; i < src.length; ++i) {
+    dst.push(src[i]);
+  }
+}
+
+function assert(b) {
+  if (!b) {
+    throw 'assertion failed';
+  }
+}
+
+// Based on
+// <http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1950641247>
+var DOM_ELEMENT_NODE = 1;
+var DOM_ATTRIBUTE_NODE = 2;
+var DOM_TEXT_NODE = 3;
+var DOM_CDATA_SECTION_NODE = 4;
+var DOM_ENTITY_REFERENCE_NODE = 5;
+var DOM_ENTITY_NODE = 6;
+var DOM_PROCESSING_INSTRUCTION_NODE = 7;
+var DOM_COMMENT_NODE = 8;
+var DOM_DOCUMENT_NODE = 9;
+var DOM_DOCUMENT_TYPE_NODE = 10;
+var DOM_DOCUMENT_FRAGMENT_NODE = 11;
+var DOM_NOTATION_NODE = 12;
+
+
+var xpathdebug = false; // trace xpath parsing
+var xsltdebug = false; // trace xslt processing
+
+
+// Escape XML special markup chracters: tag delimiter < > and entity
+// reference start delimiter &. The escaped string can be used in XML
+// text portions (i.e. between tags).
+function xmlEscapeText(s) {
+  return s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+
+// Escape XML special markup characters: tag delimiter < > entity
+// reference start delimiter & and quotes ". The escaped string can be
+// used in double quoted XML attribute value portions (i.e. in
+// attributes within start tags).
+function xmlEscapeAttr(s) {
+  return xmlEscapeText(s).replace(/\"/g, '&quot;');
+}
+
+// Escape markup in XML text, but don't touch entity references. The
+// escaped string can be used as XML text (i.e. between tags).
+function xmlEscapeTags(s) {
+  return s.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+
+// An implementation of the debug log. 
+
+var logging__ = true;
+
+function Log() {};
+
+Log.lines = [];
+
+Log.write = function(s) {
+  if (logging__) {
+    this.lines.push(xmlEscapeText(s));
+    this.show();
+  }
+};
+
+// Writes the given XML with every tag on a new line.
+Log.writeXML = function(xml) {
+  if (logging__) {
+    var s0 = xml.replace(/</g, '\n<');
+    var s1 = xmlEscapeText(s0);
+    var s2 = s1.replace(/\s*\n(\s|\n)*/g, '<br/>');
+    this.lines.push(s2);
+    this.show();
+  }
+}
+
+// Writes without any escaping
+Log.writeRaw = function(s) {
+  if (logging__) {
+    this.lines.push(s);
+    this.show();
+  }
+}
+
+Log.clear = function() {
+  if (logging__) {
+    var l = this.div();
+    l.innerHTML = '';
+    this.lines = [];
+  }
+}
+
+Log.show = function() {
+  var l = this.div();
+  l.innerHTML += this.lines.join('<br/>') + '<br/>';
+  this.lines = [];
+  l.scrollTop = l.scrollHeight;
+}
+
+Log.div = function() {
+  var l = document.getElementById('log');
+  if (!l) {
+    l = document.createElement('div');
+    l.id = 'log';
+    l.style.position = 'absolute';
+    l.style.right = '5px';
+    l.style.top = '5px';
+    l.style.width = '250px';
+    l.style.height = '150px';
+    l.style.overflow = 'auto';
+    l.style.backgroundColor = '#f0f0f0';
+    l.style.border = '1px solid gray';
+    l.style.fontSize = '10px';
+    l.style.padding = '5px';
+    document.body.appendChild(l);
+  }
+  return l;
+}
+
+
+function Timer() {}
+Timer.start = function() {}
+Timer.end = function() {}

Added: kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/version.txt
==============================================================================
--- (empty file)
+++ kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/version.txt	Tue Jul 25 15:52:52 2006
@@ -0,0 +1,2 @@
+ajaxslt-0.4
+

Added: kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/xpath.js
==============================================================================
--- (empty file)
+++ kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/xpath.js	Tue Jul 25 15:52:52 2006
@@ -0,0 +1,2185 @@
+// Copyright 2005 Google Inc.
+// All Rights Reserved
+//
+// An XPath parser and evaluator written in JavaScript. The
+// implementation is complete except for functions handling
+// namespaces.
+//
+// Reference: [XPATH] XPath Specification
+// <http://www.w3.org/TR/1999/REC-xpath-19991116>.
+//
+//
+// The API of the parser has several parts:
+//
+// 1. The parser function xpathParse() that takes a string and returns
+// an expession object.
+//
+// 2. The expression object that has an evaluate() method to evaluate the
+// XPath expression it represents. (It is actually a hierarchy of
+// objects that resembles the parse tree, but an application will call
+// evaluate() only on the top node of this hierarchy.)
+//
+// 3. The context object that is passed as an argument to the evaluate()
+// method, which represents the DOM context in which the expression is
+// evaluated.
+//
+// 4. The value object that is returned from evaluate() and represents
+// values of the different types that are defined by XPath (number,
+// string, boolean, and node-set), and allows to convert between them.
+//
+// These parts are near the top of the file, the functions and data
+// that are used internally follow after them.
+//
+//
+// TODO(mesch): add jsdoc comments. Use more coherent naming.
+//
+//
+// Author: Steffen Meschkat <mesch at google.com>
+
+
+// The entry point for the parser.
+//
+// @param expr a string that contains an XPath expression.
+// @return an expression object that can be evaluated with an
+// expression context.
+
+function xpathParse(expr) {
+  if (xpathdebug) {
+    Log.write('XPath parse ' + expr);
+  }
+  xpathParseInit();
+
+  var cached = xpathCacheLookup(expr);
+  if (cached) {
+    if (xpathdebug) {
+      Log.write(' ... cached');
+    }
+    return cached;
+  }
+
+  // Optimize for a few common cases: simple attribute node tests
+  // (@id), simple element node tests (page), variable references
+  // ($address), numbers (4), multi-step path expressions where each
+  // step is a plain element node test
+  // (page/overlay/locations/location).
+  
+  if (expr.match(/^(\$|@)?\w+$/i)) {
+    var ret = makeSimpleExpr(expr);
+    xpathParseCache[expr] = ret;
+    if (xpathdebug) {
+      Log.write(' ... simple');
+    }
+    return ret;
+  }
+
+  if (expr.match(/^\w+(\/\w+)*$/i)) {
+    var ret = makeSimpleExpr2(expr);
+    xpathParseCache[expr] = ret;
+    if (xpathdebug) {
+      Log.write(' ... simple 2');
+    }
+    return ret;
+  }
+
+  var cachekey = expr; // expr is modified during parse
+  if (xpathdebug) {
+    Timer.start('XPath parse', cachekey);
+  }
+
+  var stack = [];
+  var ahead = null;
+  var previous = null;
+  var done = false;
+
+  var parse_count = 0;
+  var lexer_count = 0;
+  var reduce_count = 0;
+  
+  while (!done) {
+    parse_count++;
+    expr = expr.replace(/^\s*/, '');
+    previous = ahead;
+    ahead = null;
+
+    var rule = null;
+    var match = '';
+    for (var i = 0; i < xpathTokenRules.length; ++i) {
+      var result = xpathTokenRules[i].re.exec(expr);
+      lexer_count++;
+      if (result && result.length > 0 && result[0].length > match.length) {
+        rule = xpathTokenRules[i];
+        match = result[0];
+        break;
+      }
+    }
+
+    // Special case: allow operator keywords to be element and
+    // variable names.
+
+    // NOTE(mesch): The parser resolves conflicts by looking ahead,
+    // and this is the only case where we look back to
+    // disambiguate. So this is indeed something different, and
+    // looking back is usually done in the lexer (via states in the
+    // general case, called "start conditions" in flex(1)). Also,the
+    // conflict resolution in the parser is not as robust as it could
+    // be, so I'd like to keep as much off the parser as possible (all
+    // these precedence values should be computed from the grammar
+    // rules and possibly associativity declarations, as in bison(1),
+    // and not explicitly set.
+
+    if (rule &&
+        (rule == TOK_DIV || 
+         rule == TOK_MOD ||
+         rule == TOK_AND || 
+         rule == TOK_OR) &&
+        (!previous || 
+         previous.tag == TOK_AT || 
+         previous.tag == TOK_DSLASH || 
+         previous.tag == TOK_SLASH ||
+         previous.tag == TOK_AXIS || 
+         previous.tag == TOK_DOLLAR)) {
+      rule = TOK_QNAME;
+    }
+
+    if (rule) {
+      expr = expr.substr(match.length);
+      if (xpathdebug) {
+        Log.write('token: ' + match + ' -- ' + rule.label);
+      }
+      ahead = {
+        tag: rule,
+        match: match,
+        prec: rule.prec ?  rule.prec : 0, // || 0 is removed by the compiler
+        expr: makeTokenExpr(match)
+      };
+
+    } else {
+      if (xpathdebug) {
+        Log.write('DONE');
+      }
+      done = true;
+    }
+
+    while (xpathReduce(stack, ahead)) {
+      reduce_count++;
+      if (xpathdebug) {
+        Log.write('stack: ' + stackToString(stack));
+      }
+    }
+  }
+
+  if (xpathdebug) {
+    Log.write(stackToString(stack));
+  }
+
+  if (stack.length != 1) {
+    throw 'XPath parse error ' + cachekey + ':\n' + stackToString(stack);
+  }
+
+  var result = stack[0].expr;
+  xpathParseCache[cachekey] = result;
+
+  if (xpathdebug) {
+    Timer.end('XPath parse', cachekey);
+  }
+
+  if (xpathdebug) {
+    Log.write('XPath parse: ' + parse_count + ' / ' + 
+              lexer_count + ' / ' + reduce_count);
+  }
+
+  return result;
+}
+
+var xpathParseCache = {};
+
+function xpathCacheLookup(expr) {
+  return xpathParseCache[expr];
+}
+
+function xpathReduce(stack, ahead) {
+  var cand = null;
+
+  if (stack.length > 0) {
+    var top = stack[stack.length-1];
+    var ruleset = xpathRules[top.tag.key];
+
+    if (ruleset) {
+      for (var i = 0; i < ruleset.length; ++i) {
+        var rule = ruleset[i];
+        var match = xpathMatchStack(stack, rule[1]);
+        if (match.length) {
+          cand = {
+            tag: rule[0],
+            rule: rule,
+            match: match
+          };
+          cand.prec = xpathGrammarPrecedence(cand);
+          break;
+        }
+      }
+    }
+  }
+
+  var ret;
+  if (cand && (!ahead || cand.prec > ahead.prec || 
+               (ahead.tag.left && cand.prec >= ahead.prec))) {
+    for (var i = 0; i < cand.match.matchlength; ++i) {
+      stack.pop();
+    }
+
+    if (xpathdebug) {
+      Log.write('reduce ' + cand.tag.label + ' ' + cand.prec +
+                ' ahead ' + (ahead ? ahead.tag.label + ' ' + ahead.prec + 
+                             (ahead.tag.left ? ' left' : '')
+                             : ' none '));
+    }
+
+    var matchexpr = mapExpr(cand.match, function(m) { return m.expr; });
+    cand.expr = cand.rule[3].apply(null, matchexpr);
+
+    stack.push(cand);
+    ret = true;
+
+  } else {
+    if (ahead) {
+      if (xpathdebug) {
+        Log.write('shift ' + ahead.tag.label + ' ' + ahead.prec + 
+                  (ahead.tag.left ? ' left' : '') +
+                  ' over ' + (cand ? cand.tag.label + ' ' + 
+                              cand.prec : ' none'));
+      }
+      stack.push(ahead);
+    }
+    ret = false;
+  }
+  return ret;
+}
+
+function xpathMatchStack(stack, pattern) {
+
+  // NOTE(mesch): The stack matches for variable cardinality are
+  // greedy but don't do backtracking. This would be an issue only
+  // with rules of the form A* A, i.e. with an element with variable
+  // cardinality followed by the same element. Since that doesn't
+  // occur in the grammar at hand, all matches on the stack are
+  // unambiguous.
+
+  var S = stack.length;
+  var P = pattern.length;
+  var p, s;
+  var match = [];
+  match.matchlength = 0;
+  var ds = 0;
+  for (p = P - 1, s = S - 1; p >= 0 && s >= 0; --p, s -= ds) {
+    ds = 0;
+    var qmatch = [];
+    if (pattern[p] == Q_MM) {
+      p -= 1;
+      match.push(qmatch);
+      while (s - ds >= 0 && stack[s - ds].tag == pattern[p]) {
+        qmatch.push(stack[s - ds]);
+        ds += 1;
+        match.matchlength += 1;
+      }
+
+    } else if (pattern[p] == Q_01) {
+      p -= 1;
+      match.push(qmatch);
+      while (s - ds >= 0 && ds < 2 && stack[s - ds].tag == pattern[p]) {
+        qmatch.push(stack[s - ds]);
+        ds += 1;
+        match.matchlength += 1;
+      }
+
+    } else if (pattern[p] == Q_1M) {
+      p -= 1;
+      match.push(qmatch);
+      if (stack[s].tag == pattern[p]) {
+        while (s - ds >= 0 && stack[s - ds].tag == pattern[p]) {
+          qmatch.push(stack[s - ds]);
+          ds += 1;
+          match.matchlength += 1;
+        }
+      } else {
+        return [];
+      }
+
+    } else if (stack[s].tag == pattern[p]) {
+      match.push(stack[s]);
+      ds += 1;
+      match.matchlength += 1;
+
+    } else {
+      return [];
+    }
+
+    reverseInplace(qmatch);
+    qmatch.expr = mapExpr(qmatch, function(m) { return m.expr; });
+  }
+
+  reverseInplace(match);
+
+  if (p == -1) {
+    return match;
+
+  } else {
+    return [];
+  }
+}
+
+function xpathTokenPrecedence(tag) {
+  return tag.prec || 2;
+}
+
+function xpathGrammarPrecedence(frame) {
+  var ret = 0;
+
+  if (frame.rule) { /* normal reduce */
+    if (frame.rule.length >= 3 && frame.rule[2] >= 0) {
+      ret = frame.rule[2];
+
+    } else {
+      for (var i = 0; i < frame.rule[1].length; ++i) {
+        var p = xpathTokenPrecedence(frame.rule[1][i]);
+        ret = Math.max(ret, p);
+      }
+    }
+  } else if (frame.tag) { /* TOKEN match */
+    ret = xpathTokenPrecedence(frame.tag);
+
+  } else if (frame.length) { /* Q_ match */
+    for (var j = 0; j < frame.length; ++j) {
+      var p = xpathGrammarPrecedence(frame[j]);
+      ret = Math.max(ret, p);
+    }
+  }
+
+  return ret;
+}
+
+function stackToString(stack) {
+  var ret = '';
+  for (var i = 0; i < stack.length; ++i) {
+    if (ret) {
+      ret += '\n';
+    }
+    ret += stack[i].tag.label;
+  }
+  return ret;
+}
+
+
+// XPath expression evaluation context. An XPath context consists of a
+// DOM node, a list of DOM nodes that contains this node, a number
+// that represents the position of the single node in the list, and a
+// current set of variable bindings. (See XPath spec.)
+//
+// The interface of the expression context:
+//
+//   Constructor -- gets the node, its position, the node set it
+//   belongs to, and a parent context as arguments. The parent context
+//   is used to implement scoping rules for variables: if a variable
+//   is not found in the current context, it is looked for in the
+//   parent context, recursively. Except for node, all arguments have
+//   default values: default position is 0, default node set is the
+//   set that contains only the node, and the default parent is null.
+//
+//     Notice that position starts at 0 at the outside interface;
+//     inside XPath expressions this shows up as position()=1.
+//
+//   clone() -- creates a new context with the current context as
+//   parent. If passed as argument to clone(), the new context has a
+//   different node, position, or node set. What is not passed is
+//   inherited from the cloned context.
+//
+//   setVariable(name, expr) -- binds given XPath expression to the
+//   name.
+//
+//   getVariable(name) -- what the name says.
+//
+//   setNode(node, position) -- sets the context to the new node and
+//   its corresponding position. Needed to implement scoping rules for
+//   variables in XPath. (A variable is visible to all subsequent
+//   siblings, not only to its children.)
+
+function ExprContext(node, position, nodelist, parent) {
+  this.node = node;
+  this.position = position || 0;
+  this.nodelist = nodelist || [ node ];
+  this.variables = {};
+  this.parent = parent || null;
+  this.root = parent ? parent.root : node.ownerDocument;
+}
+
+ExprContext.prototype.clone = function(node, position, nodelist) {
+  return new
+  ExprContext(node || this.node,
+              typeof position != 'undefined' ? position : this.position,
+              nodelist || this.nodelist, this);
+};
+
+ExprContext.prototype.setVariable = function(name, value) {
+  this.variables[name] = value;
+};
+
+ExprContext.prototype.getVariable = function(name) {
+  if (typeof this.variables[name] != 'undefined') {
+    return this.variables[name];
+
+  } else if (this.parent) {
+    return this.parent.getVariable(name);
+
+  } else {
+    return null;
+  }
+}
+
+ExprContext.prototype.setNode = function(node, position) {
+  this.node = node;
+  this.position = position;
+}
+
+
+// XPath expression values. They are what XPath expressions evaluate
+// to. Strangely, the different value types are not specified in the
+// XPath syntax, but only in the semantics, so they don't show up as
+// nonterminals in the grammar. Yet, some expressions are required to
+// evaluate to particular types, and not every type can be coerced
+// into every other type. Although the types of XPath values are
+// similar to the types present in JavaScript, the type coercion rules
+// are a bit peculiar, so we explicitly model XPath types instead of
+// mapping them onto JavaScript types. (See XPath spec.)
+//
+// The four types are:
+//
+//   StringValue
+//
+//   NumberValue
+//
+//   BooleanValue
+//
+//   NodeSetValue
+//
+// The common interface of the value classes consists of methods that
+// implement the XPath type coercion rules:
+//
+//   stringValue() -- returns the value as a JavaScript String,
+//
+//   numberValue() -- returns the value as a JavaScript Number,
+//
+//   booleanValue() -- returns the value as a JavaScript Boolean,
+//
+//   nodeSetValue() -- returns the value as a JavaScript Array of DOM
+//   Node objects.
+//
+
+function StringValue(value) {
+  this.value = value;
+  this.type = 'string';
+}
+
+StringValue.prototype.stringValue = function() {
+  return this.value;
+}
+
+StringValue.prototype.booleanValue = function() {
+  return this.value.length > 0;
+}
+
+StringValue.prototype.numberValue = function() {
+  return this.value - 0;
+}
+
+StringValue.prototype.nodeSetValue = function() {
+  throw this + ' ' + Error().stack;
+}
+
+function BooleanValue(value) {
+  this.value = value;
+  this.type = 'boolean';
+}
+
+BooleanValue.prototype.stringValue = function() {
+  return '' + this.value;
+}
+
+BooleanValue.prototype.booleanValue = function() {
+  return this.value;
+}
+
+BooleanValue.prototype.numberValue = function() {
+  return this.value ? 1 : 0;
+}
+
+BooleanValue.prototype.nodeSetValue = function() {
+  throw this + ' ' + Error().stack;
+}
+
+function NumberValue(value) {
+  this.value = value;
+  this.type = 'number';
+}
+
+NumberValue.prototype.stringValue = function() {
+  return '' + this.value;
+}
+
+NumberValue.prototype.booleanValue = function() {
+  return !!this.value;
+}
+
+NumberValue.prototype.numberValue = function() {
+  return this.value - 0;
+}
+
+NumberValue.prototype.nodeSetValue = function() {
+  throw this + ' ' + Error().stack;
+}
+
+function NodeSetValue(value) {
+  this.value = value;
+  this.type = 'node-set';
+}
+
+NodeSetValue.prototype.stringValue = function() {
+  if (this.value.length == 0) {
+    return '';
+  } else {
+    return xmlValue(this.value[0]);
+  }
+}
+
+NodeSetValue.prototype.booleanValue = function() {
+  return this.value.length > 0;
+}
+
+NodeSetValue.prototype.numberValue = function() {
+  return this.stringValue() - 0;
+}
+
+NodeSetValue.prototype.nodeSetValue = function() {
+  return this.value;
+};
+
+// XPath expressions. They are used as nodes in the parse tree and
+// possess an evaluate() method to compute an XPath value given an XPath
+// context. Expressions are returned from the parser. Teh set of
+// expression classes closely mirrors the set of non terminal symbols
+// in the grammar. Every non trivial nonterminal symbol has a
+// corresponding expression class.
+//
+// The common expression interface consists of the following methods:
+//
+// evaluate(context) -- evaluates the expression, returns a value.
+//
+// toString() -- returns the XPath text representation of the
+// expression (defined in xsltdebug.js).
+//
+// parseTree(indent) -- returns a parse tree representation of the
+// expression (defined in xsltdebug.js).
+
+function TokenExpr(m) {
+  this.value = m;
+}
+
+TokenExpr.prototype.evaluate = function() {
+  return new StringValue(this.value);
+};
+
+function LocationExpr() {
+  this.absolute = false;
+  this.steps = [];
+}
+
+LocationExpr.prototype.appendStep = function(s) {
+  this.steps.push(s);
+}
+
+LocationExpr.prototype.prependStep = function(s) {
+  var steps0 = this.steps;
+  this.steps = [ s ];
+  for (var i = 0; i < steps0.length; ++i) {
+    this.steps.push(steps0[i]);
+  }
+};
+
+LocationExpr.prototype.evaluate = function(ctx) {
+  var start;
+  if (this.absolute) {
+    start = ctx.root;
+
+  } else {
+    start = ctx.node;
+  }
+
+  var nodes = [];
+  xPathStep(nodes, this.steps, 0, start, ctx);
+  return new NodeSetValue(nodes);
+};
+
+function xPathStep(nodes, steps, step, input, ctx) {
+  var s = steps[step];
+  var ctx2 = ctx.clone(input);
+  var nodelist = s.evaluate(ctx2).nodeSetValue();
+
+  for (var i = 0; i < nodelist.length; ++i) {
+    if (step == steps.length - 1) {
+      nodes.push(nodelist[i]);
+    } else {
+      xPathStep(nodes, steps, step + 1, nodelist[i], ctx);
+    }
+  }
+}
+
+function StepExpr(axis, nodetest, predicate) {
+  this.axis = axis;
+  this.nodetest = nodetest;
+  this.predicate = predicate || [];
+}
+
+StepExpr.prototype.appendPredicate = function(p) {
+  this.predicate.push(p);
+}
+
+StepExpr.prototype.evaluate = function(ctx) {
+  var input = ctx.node;
+  var nodelist = [];
+
+  // NOTE(mesch): When this was a switch() statement, it didn't work
+  // in Safari/2.0. Not sure why though; it resulted in the JavaScript
+  // console output "undefined" (without any line number or so).
+
+  if (this.axis ==  xpathAxis.ANCESTOR_OR_SELF) {
+    nodelist.push(input);
+    for (var n = input.parentNode; n; n = input.parentNode) {
+      nodelist.push(n);
+    }
+
+  } else if (this.axis == xpathAxis.ANCESTOR) {
+    for (var n = input.parentNode; n; n = input.parentNode) {
+      nodelist.push(n);
+    }
+
+  } else if (this.axis == xpathAxis.ATTRIBUTE) {
+    copyArray(nodelist, input.attributes);
+
+  } else if (this.axis == xpathAxis.CHILD) {
+    copyArray(nodelist, input.childNodes);
+
+  } else if (this.axis == xpathAxis.DESCENDANT_OR_SELF) {
+    nodelist.push(input);
+    xpathCollectDescendants(nodelist, input);
+
+  } else if (this.axis == xpathAxis.DESCENDANT) {
+    xpathCollectDescendants(nodelist, input);
+
+  } else if (this.axis == xpathAxis.FOLLOWING) {
+    for (var n = input.parentNode; n; n = n.parentNode) {
+      for (var nn = n.nextSibling; nn; nn = nn.nextSibling) {
+        nodelist.push(nn);
+        xpathCollectDescendants(nodelist, nn);
+      }
+    }
+
+  } else if (this.axis == xpathAxis.FOLLOWING_SIBLING) {
+    //patched by GC
+    //for (var n = input.nextSibling; n; n = input.nextSibling) {
+    for (var n = input.nextSibling; n; n = n.nextSibling) {
+      nodelist.push(n);
+    }
+
+  } else if (this.axis == xpathAxis.NAMESPACE) {
+    alert('not implemented: axis namespace');
+
+  } else if (this.axis == xpathAxis.PARENT) {
+    if (input.parentNode) {
+      nodelist.push(input.parentNode);
+    }
+
+  } else if (this.axis == xpathAxis.PRECEDING) {
+    for (var n = input.parentNode; n; n = n.parentNode) {
+      for (var nn = n.previousSibling; nn; nn = nn.previousSibling) {
+        nodelist.push(nn);
+        xpathCollectDescendantsReverse(nodelist, nn);
+      }
+    }
+
+  } else if (this.axis == xpathAxis.PRECEDING_SIBLING) {
+    //patched by GC
+    //for (var n = input.previousSibling; n; n = input.previousSibling) {
+    for (var n = input.previousSibling; n; n = n.previousSibling) {
+      nodelist.push(n);
+    }
+
+  } else if (this.axis == xpathAxis.SELF) {
+    nodelist.push(input);
+
+  } else {
+    throw 'ERROR -- NO SUCH AXIS: ' + this.axis;
+  }
+
+  // process node test
+  var nodelist0 = nodelist;
+  nodelist = [];
+  for (var i = 0; i < nodelist0.length; ++i) {
+    var n = nodelist0[i];
+    if (this.nodetest.evaluate(ctx.clone(n, i, nodelist0)).booleanValue()) {
+      nodelist.push(n);
+    }
+  }
+
+  // process predicates
+  for (var i = 0; i < this.predicate.length; ++i) {
+    var nodelist0 = nodelist;
+    nodelist = [];
+    for (var ii = 0; ii < nodelist0.length; ++ii) {
+      var n = nodelist0[ii];
+      if (this.predicate[i].evaluate(ctx.clone(n, ii, nodelist0)).booleanValue()) {
+        nodelist.push(n);
+      }
+    }
+  }
+
+  return new NodeSetValue(nodelist);
+};
+
+function NodeTestAny() {
+  this.value = new BooleanValue(true);
+}
+
+NodeTestAny.prototype.evaluate = function(ctx) {
+  return this.value;
+};
+
+function NodeTestElement() {}
+
+NodeTestElement.prototype.evaluate = function(ctx) {
+  return new BooleanValue(ctx.node.nodeType == DOM_ELEMENT_NODE);
+}
+
+function NodeTestText() {}
+
+NodeTestText.prototype.evaluate = function(ctx) {
+  return new BooleanValue(ctx.node.nodeType == DOM_TEXT_NODE);
+}
+
+function NodeTestComment() {}
+
+NodeTestComment.prototype.evaluate = function(ctx) {
+  return new BooleanValue(ctx.node.nodeType == DOM_COMMENT_NODE);
+}
+
+function NodeTestPI(target) {
+  this.target = target;
+}
+
+NodeTestPI.prototype.evaluate = function(ctx) {
+  return new
+  BooleanValue(ctx.node.nodeType == DOM_PROCESSING_INSTRUCTION_NODE &&
+               (!this.target || ctx.node.nodeName == this.target));
+}
+
+function NodeTestNC(nsprefix) {
+  this.regex = new RegExp("^" + nsprefix + ":");
+  this.nsprefix = nsprefix;
+}
+
+NodeTestNC.prototype.evaluate = function(ctx) {
+  var n = ctx.node;
+  return new BooleanValue(this.regex.match(n.nodeName));
+}
+
+function NodeTestName(name) {
+  this.name = name;
+}
+
+NodeTestName.prototype.evaluate = function(ctx) {
+  var n = ctx.node;
+  return new BooleanValue(n.nodeName == this.name);
+}
+
+function PredicateExpr(expr) {
+  this.expr = expr;
+}
+
+PredicateExpr.prototype.evaluate = function(ctx) {
+  var v = this.expr.evaluate(ctx);
+  if (v.type == 'number') {
+    // NOTE(mesch): Internally, position is represented starting with
+    // 0, however in XPath position starts with 1. See functions
+    // position() and last().
+    return new BooleanValue(ctx.position == v.numberValue() - 1);
+  } else {
+    return new BooleanValue(v.booleanValue());
+  }
+};
+
+function FunctionCallExpr(name) {
+  this.name = name;
+  this.args = [];
+}
+
+FunctionCallExpr.prototype.appendArg = function(arg) {
+  this.args.push(arg);
+};
+
+FunctionCallExpr.prototype.evaluate = function(ctx) {
+  var fn = '' + this.name.value;
+  var f = this.xpathfunctions[fn];
+  if (f) {
+    return f.call(this, ctx);
+  } else {
+    Log.write('XPath NO SUCH FUNCTION ' + fn);
+    return new BooleanValue(false);
+  }
+};
+
+FunctionCallExpr.prototype.xpathfunctions = {
+  'last': function(ctx) {
+    assert(this.args.length == 0);
+    // NOTE(mesch): XPath position starts at 1.
+    return new NumberValue(ctx.nodelist.length);
+  },
+
+  'position': function(ctx) {
+    assert(this.args.length == 0);
+    // NOTE(mesch): XPath position starts at 1.
+    return new NumberValue(ctx.position + 1);
+  },
+
+  'count': function(ctx) {
+    assert(this.args.length == 1);
+    var v = this.args[0].evaluate(ctx);
+    return new NumberValue(v.nodeSetValue().length);
+  },
+
+  'id': function(ctx) {
+    assert(this.args.length == 1);
+    var e = this.args.evaluate(ctx);
+    var ret = [];
+    var ids;
+    if (e.type == 'node-set') {
+      ids = [];
+      for (var i = 0; i < e.length; ++i) {
+        var v = xmlValue(e[i]).split(/\s+/);
+        for (var ii = 0; ii < v.length; ++ii) {
+          ids.push(v[ii]);
+        }
+      }
+    } else {
+      ids = e.split(/\s+/);
+    }
+    var d = ctx.node.ownerDocument;
+    for (var i = 0; i < ids.length; ++i) {
+      var n = d.getElementById(ids[i]);
+      if (n) {
+        ret.push(n);
+      }
+    }
+    return new NodeSetValue(ret);
+  },
+
+  'local-name': function(ctx) {
+    alert('not implmented yet: XPath function local-name()');
+  },
+
+  'namespace-uri': function(ctx) {
+    alert('not implmented yet: XPath function namespace-uri()');
+  },
+
+  'name': function(ctx) {
+    assert(this.args.length == 1 || this.args.length == 0);
+    var n;
+    if (this.args.length == 0) {
+      n = [ ctx.node ];
+    } else {
+      n = this.args[0].evaluate(ctx).nodeSetValue();
+    }
+
+    if (n.length == 0) {
+      return new StringValue('');
+    } else {
+      return new StringValue(n[0].nodeName);
+    }
+  },
+
+  'string':  function(ctx) {
+    assert(this.args.length == 1 || this.args.length == 0);
+    if (this.args.length == 0) {
+      return new StringValue(new NodeSetValue([ ctx.node ]).stringValue());
+    } else {
+      return new StringValue(this.args[0].evaluate(ctx).stringValue());
+    }
+  },
+
+  'concat': function(ctx) {
+    var ret = '';
+    for (var i = 0; i < this.args.length; ++i) {
+      ret += this.args[i].evaluate(ctx).stringValue();
+    }
+    return new StringValue(ret);
+  },
+
+  'starts-with': function(ctx) {
+    assert(this.args.length == 2);
+    var s0 = this.args[0].evaluate(ctx).stringValue();
+    var s1 = this.args[1].evaluate(ctx).stringValue();
+    return new BooleanValue(s0.indexOf(s1) == 0);
+  },
+
+  'contains': function(ctx) {
+    assert(this.args.length == 2);
+    var s0 = this.args[0].evaluate(ctx).stringValue();
+    var s1 = this.args[1].evaluate(ctx).stringValue();
+    return new BooleanValue(s0.indexOf(s1) != -1);
+  },
+
+  'substring-before': function(ctx) {
+    assert(this.args.length == 2);
+    var s0 = this.args[0].evaluate(ctx).stringValue();
+    var s1 = this.args[1].evaluate(ctx).stringValue();
+    var i = s0.indexOf(s1);
+    var ret;
+    if (i == -1) {
+      ret = '';
+    } else {
+      ret = s0.substr(0,i);
+    }
+    return new StringValue(ret);
+  },
+
+  'substring-after': function(ctx) {
+    assert(this.args.length == 2);
+    var s0 = this.args[0].evaluate(ctx).stringValue();
+    var s1 = this.args[1].evaluate(ctx).stringValue();
+    var i = s0.indexOf(s1);
+    var ret;
+    if (i == -1) {
+      ret = '';
+    } else {
+      ret = s0.substr(i + s1.length);
+    }
+    return new StringValue(ret);
+  },
+
+  'substring': function(ctx) {
+    // NOTE: XPath defines the position of the first character in a
+    // string to be 1, in JavaScript this is 0 ([XPATH] Section 4.2).
+    assert(this.args.length == 2 || this.args.length == 3);
+    var s0 = this.args[0].evaluate(ctx).stringValue();
+    var s1 = this.args[1].evaluate(ctx).numberValue();
+    var ret;
+    if (this.args.length == 2) {
+      var i1 = Math.max(0, Math.round(s1) - 1);
+      ret = s0.substr(i1);
+
+    } else {
+      var s2 = this.args[2].evaluate(ctx).numberValue();
+      var i0 = Math.round(s1) - 1;
+      var i1 = Math.max(0, i0);
+      var i2 = Math.round(s2) - Math.max(0, -i0);
+      ret = s0.substr(i1, i2);
+    }
+    return new StringValue(ret);
+  },
+
+  'string-length': function(ctx) {
+    var s;
+    if (this.args.length > 0) {
+      s = this.args[0].evaluate(ctx).stringValue();
+    } else {
+      s = new NodeSetValue([ ctx.node ]).stringValue();
+    }
+    return new NumberValue(s.length);
+  },
+
+  'normalize-space': function(ctx) {
+    var s;
+    if (this.args.length > 0) {
+      s = this.args[0].evaluate(ctx).stringValue();
+    } else {
+      s = new NodeSetValue([ ctx.node ]).stringValue();
+    }
+    s = s.replace(/^\s*/,'').replace(/\s*$/,'').replace(/\s+/g, ' ');
+    return new StringValue(s);
+  },
+
+  'translate': function(ctx) {
+    assert(this.args.length == 3);
+    var s0 = this.args[0].evaluate(ctx).stringValue();
+    var s1 = this.args[1].evaluate(ctx).stringValue();
+    var s2 = this.args[2].evaluate(ctx).stringValue();
+
+    for (var i = 0; i < s1.length; ++i) {
+      s0 = s0.replace(new RegExp(s1.charAt(i), 'g'), s2.charAt(i));
+    }
+    return new StringValue(s0);
+  },
+
+  'boolean': function(ctx) {
+    assert(this.args.length == 1);
+    return new BooleanValue(this.args[0].evaluate(ctx).booleanValue());
+  },
+
+  'not': function(ctx) {
+    assert(this.args.length == 1);
+    var ret = !this.args[0].evaluate(ctx).booleanValue();
+    return new BooleanValue(ret);
+  },
+
+  'true': function(ctx) {
+    assert(this.args.length == 0);
+    return new BooleanValue(true);
+  },
+
+  'false': function(ctx) {
+    assert(this.args.length == 0);
+    return new BooleanValue(false);
+  },
+
+  'lang': function(ctx) {
+    assert(this.args.length == 1);
+    var lang = this.args[0].evaluate(ctx).stringValue();
+    var xmllang;
+    var n = ctx.node;
+    while (n && n != n.parentNode /* just in case ... */) {
+      xmllang = n.getAttribute('xml:lang');
+      if (xmllang) {
+        break;
+      }
+      n = n.parentNode;
+    }
+    if (!xmllang) {
+      return new BooleanValue(false);
+    } else {
+      var re = new RegExp('^' + lang + '$', 'i');
+      return new BooleanValue(xmllang.match(re) ||
+                              xmllang.replace(/_.*$/,'').match(re));
+    }
+  },
+
+  'number': function(ctx) {
+    assert(this.args.length == 1 || this.args.length == 0);
+
+    if (this.args.length == 1) {
+      return new NumberValue(this.args[0].evaluate(ctx).numberValue());
+    } else {
+      return new NumberValue(new NodeSetValue([ ctx.node ]).numberValue());
+    }
+  },
+
+  'sum': function(ctx) {
+    assert(this.args.length == 1);
+    var n = this.args[0].evaluate(ctx).nodeSetValue();
+    var sum = 0;
+    for (var i = 0; i < n.length; ++i) {
+      sum += xmlValue(n[i]) - 0;
+    }
+    return new NumberValue(sum);
+  },
+
+  'floor': function(ctx) {
+    assert(this.args.length == 1);
+    var num = this.args[0].evaluate(ctx).numberValue();
+    return new NumberValue(Math.floor(num));
+  },
+
+  'ceiling': function(ctx) {
+    assert(this.args.length == 1);
+    var num = this.args[0].evaluate(ctx).numberValue();
+    return new NumberValue(Math.ceil(num));
+  },
+
+  'round': function(ctx) {
+    assert(this.args.length == 1);
+    var num = this.args[0].evaluate(ctx).numberValue();
+    return new NumberValue(Math.round(num));
+  },
+
+  // TODO(mesch): The following functions are custom. There is a
+  // standard that defines how to add functions, which should be
+  // applied here.
+
+  'ext-join': function(ctx) {
+    assert(this.args.length == 2);
+    var nodes = this.args[0].evaluate(ctx).nodeSetValue();
+    var delim = this.args[1].evaluate(ctx).stringValue();
+    var ret = '';
+    for (var i = 0; i < nodes.length; ++i) {
+      if (ret) {
+        ret += delim;
+      }
+      ret += xmlValue(nodes[i]);
+    }
+    return new StringValue(ret);
+  },
+
+  // ext-if() evaluates and returns its second argument, if the
+  // boolean value of its first argument is true, otherwise it
+  // evaluates and returns its third argument.
+
+  'ext-if': function(ctx) {
+    assert(this.args.length == 3);
+    if (this.args[0].evaluate(ctx).booleanValue()) {
+      return this.args[1].evaluate(ctx);
+    } else {
+      return this.args[2].evaluate(ctx);
+    }
+  },
+
+  'ext-sprintf': function(ctx) {
+    assert(this.args.length >= 1);
+    var args = [];
+    for (var i = 0; i < this.args.length; ++i) {
+      args.push(this.args[i].evaluate(ctx).stringValue());
+    }
+    return new StringValue(sprintf.apply(null, args));
+  },
+
+  // ext-cardinal() evaluates its single argument as a number, and
+  // returns the current node that many times. It can be used in the
+  // select attribute to iterate over an integer range.
+  
+  'ext-cardinal': function(ctx) {
+    assert(this.args.length >= 1);
+    var c = this.args[0].evaluate(ctx).numberValue();
+    var ret = [];
+    for (var i = 0; i < c; ++i) {
+      ret.push(ctx.node);
+    }
+    return new NodeSetValue(ret);
+  }
+};
+
+function UnionExpr(expr1, expr2) {
+  this.expr1 = expr1;
+  this.expr2 = expr2;
+}
+
+UnionExpr.prototype.evaluate = function(ctx) {
+  var nodes1 = this.expr1.evaluate(ctx).nodeSetValue();
+  var nodes2 = this.expr2.evaluate(ctx).nodeSetValue();
+  var I1 = nodes1.length;
+  for (var i2 = 0; i2 < nodes2.length; ++i2) {
+    for (var i1 = 0; i1 < I1; ++i1) {
+      if (nodes1[i1] == nodes2[i2]) {
+        // break inner loop and continue outer loop, labels confuse
+        // the js compiler, so we don't use them here.
+        i1 = I1;
+      }
+    }
+    nodes1.push(nodes2[i2]);
+  }
+  return new NodeSetValue(nodes2);
+};
+
+function PathExpr(filter, rel) {
+  this.filter = filter;
+  this.rel = rel;
+}
+
+PathExpr.prototype.evaluate = function(ctx) {
+  var nodes = this.filter.evaluate(ctx).nodeSetValue();
+  var nodes1 = [];
+  for (var i = 0; i < nodes.length; ++i) {
+    var nodes0 = this.rel.evaluate(ctx.clone(nodes[i], i, nodes)).nodeSetValue();
+    for (var ii = 0; ii < nodes0.length; ++ii) {
+      nodes1.push(nodes0[ii]);
+    }
+  }
+  return new NodeSetValue(nodes1);
+};
+
+function FilterExpr(expr, predicate) {
+  this.expr = expr;
+  this.predicate = predicate;
+}
+
+FilterExpr.prototype.evaluate = function(ctx) {
+  var nodes = this.expr.evaluate(ctx).nodeSetValue();
+  for (var i = 0; i < this.predicate.length; ++i) {
+    var nodes0 = nodes;
+    nodes = [];
+    for (var j = 0; j < nodes0.length; ++j) {
+      var n = nodes0[j];
+      if (this.predicate[i].evaluate(ctx.clone(n, j, nodes0)).booleanValue()) {
+        nodes.push(n);
+      }
+    }
+  }
+
+  return new NodeSetValue(nodes);
+}
+
+function UnaryMinusExpr(expr) {
+  this.expr = expr;
+}
+
+UnaryMinusExpr.prototype.evaluate = function(ctx) {
+  return new NumberValue(-this.expr.evaluate(ctx).numberValue());
+};
+
+function BinaryExpr(expr1, op, expr2) {
+  this.expr1 = expr1;
+  this.expr2 = expr2;
+  this.op = op;
+}
+
+BinaryExpr.prototype.evaluate = function(ctx) {
+  var ret;
+  switch (this.op.value) {
+    case 'or':
+      ret = new BooleanValue(this.expr1.evaluate(ctx).booleanValue() ||
+                             this.expr2.evaluate(ctx).booleanValue());
+      break;
+
+    case 'and':
+      ret = new BooleanValue(this.expr1.evaluate(ctx).booleanValue() &&
+                             this.expr2.evaluate(ctx).booleanValue());
+      break;
+
+    case '+':
+      ret = new NumberValue(this.expr1.evaluate(ctx).numberValue() +
+                            this.expr2.evaluate(ctx).numberValue());
+      break;
+
+    case '-':
+      ret = new NumberValue(this.expr1.evaluate(ctx).numberValue() -
+                            this.expr2.evaluate(ctx).numberValue());
+      break;
+
+    case '*':
+      ret = new NumberValue(this.expr1.evaluate(ctx).numberValue() *
+                            this.expr2.evaluate(ctx).numberValue());
+      break;
+
+    case 'mod':
+      ret = new NumberValue(this.expr1.evaluate(ctx).numberValue() %
+                            this.expr2.evaluate(ctx).numberValue());
+      break;
+
+    case 'div':
+      ret = new NumberValue(this.expr1.evaluate(ctx).numberValue() /
+                            this.expr2.evaluate(ctx).numberValue());
+      break;
+
+    case '=':
+      ret = this.compare(ctx, function(x1, x2) { return x1 == x2; });
+      break;
+
+    case '!=':
+      ret = this.compare(ctx, function(x1, x2) { return x1 != x2; });
+      break;
+
+    case '<':
+      ret = this.compare(ctx, function(x1, x2) { return x1 < x2; });
+      break;
+
+    case '<=':
+      ret = this.compare(ctx, function(x1, x2) { return x1 <= x2; });
+      break;
+
+    case '>':
+      ret = this.compare(ctx, function(x1, x2) { return x1 > x2; });
+      break;
+
+    case '>=':
+      ret = this.compare(ctx, function(x1, x2) { return x1 >= x2; });
+      break;
+
+    default:
+      alert('BinaryExpr.evaluate: ' + this.op.value);
+  }
+  return ret;
+};
+
+BinaryExpr.prototype.compare = function(ctx, cmp) {
+  var v1 = this.expr1.evaluate(ctx);
+  var v2 = this.expr2.evaluate(ctx);
+
+  var ret;
+  if (v1.type == 'node-set' && v2.type == 'node-set') {
+    var n1 = v1.nodeSetValue();
+    var n2 = v2.nodeSetValue();
+    ret = false;
+    for (var i1 = 0; i1 < n1.length; ++i1) {
+      for (var i2 = 0; i2 < n2.length; ++i2) {
+        if (cmp(xmlValue(n1[i1]), xmlValue(n2[i2]))) {
+          ret = true;
+          // Break outer loop. Labels confuse the jscompiler and we
+          // don't use them.
+          i2 = n2.length;
+          i1 = n1.length;
+        }
+      }
+    }
+
+  } else if (v1.type == 'node-set' || v2.type == 'node-set') {
+
+    if (v1.type == 'number') {
+      var s = v1.numberValue();
+      var n = v2.nodeSetValue();
+
+      ret = false;
+      for (var i = 0;  i < n.length; ++i) {
+        var nn = xmlValue(n[i]) - 0;
+        if (cmp(s, nn)) {
+          ret = true;
+          break;
+        }
+      }
+
+    } else if (v2.type == 'number') {
+      var n = v1.nodeSetValue();
+      var s = v2.numberValue();
+
+      ret = false;
+      for (var i = 0;  i < n.length; ++i) {
+        var nn = xmlValue(n[i]) - 0;
+        if (cmp(nn, s)) {
+          ret = true;
+          break;
+        }
+      }
+
+    } else if (v1.type == 'string') {
+      var s = v1.stringValue();
+      var n = v2.nodeSetValue();
+
+      ret = false;
+      for (var i = 0;  i < n.length; ++i) {
+        var nn = xmlValue(n[i]);
+        if (cmp(s, nn)) {
+          ret = true;
+          break;
+        }
+      }
+
+    } else if (v2.type == 'string') {
+      var n = v1.nodeSetValue();
+      var s = v2.stringValue();
+
+      ret = false;
+      for (var i = 0;  i < n.length; ++i) {
+        var nn = xmlValue(n[i]);
+        if (cmp(nn, s)) {
+          ret = true;
+          break;
+        }
+      }
+
+    } else {
+      ret = cmp(v1.booleanValue(), v2.booleanValue());
+    }
+
+  } else if (v1.type == 'boolean' || v2.type == 'boolean') {
+    ret = cmp(v1.booleanValue(), v2.booleanValue());
+
+  } else if (v1.type == 'number' || v2.type == 'number') {
+    ret = cmp(v1.numberValue(), v2.numberValue());
+
+  } else {
+    ret = cmp(v1.stringValue(), v2.stringValue());
+  }
+
+  return new BooleanValue(ret);
+}
+
+function LiteralExpr(value) {
+  this.value = value;
+}
+
+LiteralExpr.prototype.evaluate = function(ctx) {
+  return new StringValue(this.value);
+};
+
+function NumberExpr(value) {
+  this.value = value;
+}
+
+NumberExpr.prototype.evaluate = function(ctx) {
+  return new NumberValue(this.value);
+};
+
+function VariableExpr(name) {
+  this.name = name;
+}
+
+VariableExpr.prototype.evaluate = function(ctx) {
+  return ctx.getVariable(this.name);
+}
+
+// Factory functions for semantic values (i.e. Expressions) of the
+// productions in the grammar. When a production is matched to reduce
+// the current parse state stack, the function is called with the
+// semantic values of the matched elements as arguments, and returns
+// another semantic value. The semantic value is a node of the parse
+// tree, an expression object with an evaluate() method that evaluates the
+// expression in an actual context. These factory functions are used
+// in the specification of the grammar rules, below.
+
+function makeTokenExpr(m) {
+  return new TokenExpr(m);
+}
+
+function passExpr(e) {
+  return e;
+}
+
+function makeLocationExpr1(slash, rel) {
+  rel.absolute = true;
+  return rel;
+}
+
+function makeLocationExpr2(dslash, rel) {
+  rel.absolute = true;
+  rel.prependStep(makeAbbrevStep(dslash.value));
+  return rel;
+}
+
+function makeLocationExpr3(slash) {
+  var ret = new LocationExpr();
+  ret.appendStep(makeAbbrevStep('.'));
+  ret.absolute = true;
+  return ret;
+}
+
+function makeLocationExpr4(dslash) {
+  var ret = new LocationExpr();
+  ret.absolute = true;
+  ret.appendStep(makeAbbrevStep(dslash.value));
+  return ret;
+}
+
+function makeLocationExpr5(step) {
+  var ret = new LocationExpr();
+  ret.appendStep(step);
+  return ret;
+}
+
+function makeLocationExpr6(rel, slash, step) {
+  rel.appendStep(step);
+  return rel;
+}
+
+function makeLocationExpr7(rel, dslash, step) {
+  rel.appendStep(makeAbbrevStep(dslash.value));
+  return rel;
+}
+
+function makeStepExpr1(dot) {
+  return makeAbbrevStep(dot.value);
+}
+
+function makeStepExpr2(ddot) {
+  return makeAbbrevStep(ddot.value);
+}
+
+function makeStepExpr3(axisname, axis, nodetest) {
+  return new StepExpr(axisname.value, nodetest);
+}
+
+function makeStepExpr4(at, nodetest) {
+  return new StepExpr('attribute', nodetest);
+}
+
+function makeStepExpr5(nodetest) {
+  return new StepExpr('child', nodetest);
+}
+
+function makeStepExpr6(step, predicate) {
+  step.appendPredicate(predicate);
+  return step;
+}
+
+function makeAbbrevStep(abbrev) {
+  switch (abbrev) {
+  case '//':
+    return new StepExpr('descendant-or-self', new NodeTestAny);
+
+  case '.':
+    return new StepExpr('self', new NodeTestAny);
+
+  case '..':
+    return new StepExpr('parent', new NodeTestAny);
+  }
+}
+
+function makeNodeTestExpr1(asterisk) {
+  return new NodeTestElement;
+}
+
+function makeNodeTestExpr2(ncname, colon, asterisk) {
+  return new NodeTestNC(ncname.value);
+}
+
+function makeNodeTestExpr3(qname) {
+  return new NodeTestName(qname.value);
+}
+
+function makeNodeTestExpr4(typeo, parenc) {
+  var type = typeo.value.replace(/\s*\($/, '');
+  switch(type) {
+  case 'node':
+    return new NodeTestAny;
+
+  case 'text':
+    return new NodeTestText;
+
+  case 'comment':
+    return new NodeTestComment;
+
+  case 'processing-instruction':
+    return new NodeTestPI;
+  }
+}
+
+function makeNodeTestExpr5(typeo, target, parenc) {
+  var type = typeo.replace(/\s*\($/, '');
+  if (type != 'processing-instruction') {
+    throw type + ' ' + Error().stack;
+  }
+  return new NodeTestPI(target.value);
+}
+
+function makePredicateExpr(pareno, expr, parenc) {
+  return new PredicateExpr(expr);
+}
+
+function makePrimaryExpr(pareno, expr, parenc) {
+  return expr;
+}
+
+function makeFunctionCallExpr1(name, pareno, parenc) {
+  return new FunctionCallExpr(name);
+}
+
+function makeFunctionCallExpr2(name, pareno, arg1, args, parenc) {
+  var ret = new FunctionCallExpr(name);
+  ret.appendArg(arg1);
+  for (var i = 0; i < args.length; ++i) {
+    ret.appendArg(args[i]);
+  }
+  return ret;
+}
+
+function makeArgumentExpr(comma, expr) {
+  return expr;
+}
+
+function makeUnionExpr(expr1, pipe, expr2) {
+  return new UnionExpr(expr1, expr2);
+}
+
+function makePathExpr1(filter, slash, rel) {
+  return new PathExpr(filter, rel);
+}
+
+function makePathExpr2(filter, dslash, rel) {
+  rel.prependStep(makeAbbrevStep(dslash.value));
+  return new PathExpr(filter, rel);
+}
+
+function makeFilterExpr(expr, predicates) {
+  if (predicates.length > 0) {
+    return new FilterExpr(expr, predicates);
+  } else {
+    return expr;
+  }
+}
+
+function makeUnaryMinusExpr(minus, expr) {
+  return new UnaryMinusExpr(expr);
+}
+
+function makeBinaryExpr(expr1, op, expr2) {
+  return new BinaryExpr(expr1, op, expr2);
+}
+
+function makeLiteralExpr(token) {
+  // remove quotes from the parsed value:
+  var value = token.value.substring(1, token.value.length - 1);
+  return new LiteralExpr(value);
+}
+
+function makeNumberExpr(token) {
+  return new NumberExpr(token.value);
+}
+
+function makeVariableReference(dollar, name) {
+  return new VariableExpr(name.value);
+}
+
+// Used before parsing for optimization of common simple cases. See
+// the begin of xpathParse() for which they are.
+function makeSimpleExpr(expr) {
+  if (expr.charAt(0) == '$') {
+    return new VariableExpr(expr.substr(1));
+  } else if (expr.charAt(0) == '@') {
+    var a = new NodeTestName(expr.substr(1));
+    var b = new StepExpr('attribute', a);
+    var c = new LocationExpr();
+    c.appendStep(b);
+    return c;
+  } else if (expr.match(/^[0-9]+$/)) {
+    return new NumberExpr(expr);
+  } else {
+    var a = new NodeTestName(expr);
+    var b = new StepExpr('child', a);
+    var c = new LocationExpr();
+    c.appendStep(b);
+    return c;
+  }
+}
+
+function makeSimpleExpr2(expr) {
+  var steps = expr.split('/');
+  var c = new LocationExpr();
+  for (var i in steps) {
+    var a = new NodeTestName(steps[i]);
+    var b = new StepExpr('child', a);
+    c.appendStep(b);
+  }
+  return c;
+}
+
+// The axes of XPath expressions.
+
+var xpathAxis = {
+  ANCESTOR_OR_SELF: 'ancestor-or-self',
+  ANCESTOR: 'ancestor',
+  ATTRIBUTE: 'attribute',
+  CHILD: 'child',
+  DESCENDANT_OR_SELF: 'descendant-or-self',
+  DESCENDANT: 'descendant',
+  FOLLOWING_SIBLING: 'following-sibling',
+  FOLLOWING: 'following',
+  NAMESPACE: 'namespace',
+  PARENT: 'parent',
+  PRECEDING_SIBLING: 'preceding-sibling',
+  PRECEDING: 'preceding',
+  SELF: 'self'
+};
+
+var xpathAxesRe = [
+    xpathAxis.ANCESTOR_OR_SELF,
+    xpathAxis.ANCESTOR,
+    xpathAxis.ATTRIBUTE,
+    xpathAxis.CHILD,
+    xpathAxis.DESCENDANT_OR_SELF,
+    xpathAxis.DESCENDANT,
+    xpathAxis.FOLLOWING_SIBLING,
+    xpathAxis.FOLLOWING,
+    xpathAxis.NAMESPACE,
+    xpathAxis.PARENT,
+    xpathAxis.PRECEDING_SIBLING,
+    xpathAxis.PRECEDING,
+    xpathAxis.SELF
+].join('|');
+
+
+// The tokens of the language. The label property is just used for
+// generating debug output. The prec property is the precedence used
+// for shift/reduce resolution. Default precedence is 0 as a lookahead
+// token and 2 on the stack. TODO(mesch): this is certainly not
+// necessary and too complicated. Simplify this!
+
+// NOTE: tabular formatting is the big exception, but here it should
+// be OK.
+
+var TOK_PIPE =   { label: "|",   prec:   17, re: new RegExp("^\\|") };
+var TOK_DSLASH = { label: "//",  prec:   19, re: new RegExp("^//")  };
+var TOK_SLASH =  { label: "/",   prec:   30, re: new RegExp("^/")   };
+var TOK_AXIS =   { label: "::",  prec:   20, re: new RegExp("^::")  };
+var TOK_COLON =  { label: ":",   prec: 1000, re: new RegExp("^:")  };
+var TOK_AXISNAME = { label: "[axis]", re: new RegExp('^(' + xpathAxesRe + ')') };
+var TOK_PARENO = { label: "(",   prec:   34, re: new RegExp("^\\(") };
+var TOK_PARENC = { label: ")",               re: new RegExp("^\\)") };
+var TOK_DDOT =   { label: "..",  prec:   34, re: new RegExp("^\\.\\.") };
+var TOK_DOT =    { label: ".",   prec:   34, re: new RegExp("^\\.") };
+var TOK_AT =     { label: "@",   prec:   34, re: new RegExp("^@")   };
+
+var TOK_COMMA =  { label: ",",               re: new RegExp("^,") };
+
+var TOK_OR =     { label: "or",  prec:   10, re: new RegExp("^or\\b") };
+var TOK_AND =    { label: "and", prec:   11, re: new RegExp("^and\\b") };
+var TOK_EQ =     { label: "=",   prec:   12, re: new RegExp("^=")   };
+var TOK_NEQ =    { label: "!=",  prec:   12, re: new RegExp("^!=")  };
+var TOK_GE =     { label: ">=",  prec:   13, re: new RegExp("^>=")  };
+var TOK_GT =     { label: ">",   prec:   13, re: new RegExp("^>")   };
+var TOK_LE =     { label: "<=",  prec:   13, re: new RegExp("^<=")  };
+var TOK_LT =     { label: "<",   prec:   13, re: new RegExp("^<")   };
+var TOK_PLUS =   { label: "+",   prec:   14, re: new RegExp("^\\+"), left: true };
+var TOK_MINUS =  { label: "-",   prec:   14, re: new RegExp("^\\-"), left: true };
+var TOK_DIV =    { label: "div", prec:   15, re: new RegExp("^div\\b"), left: true };
+var TOK_MOD =    { label: "mod", prec:   15, re: new RegExp("^mod\\b"), left: true };
+
+var TOK_BRACKO = { label: "[",   prec:   32, re: new RegExp("^\\[") };
+var TOK_BRACKC = { label: "]",               re: new RegExp("^\\]") };
+var TOK_DOLLAR = { label: "$",               re: new RegExp("^\\$") };
+
+var TOK_NCNAME = { label: "[ncname]", re: new RegExp('^[a-z][-\\w]*','i') };
+
+var TOK_ASTERISK = { label: "*", prec: 15, re: new RegExp("^\\*"), left: true };
+var TOK_LITERALQ = { label: "[litq]", prec: 20, re: new RegExp("^'[^\\']*'") };
+var TOK_LITERALQQ = {
+  label: "[litqq]",
+  prec: 20,
+  re: new RegExp('^"[^\\"]*"')
+};
+
+var TOK_NUMBER  = {
+  label: "[number]",
+  prec: 35,
+  re: new RegExp('^\\d+(\\.\\d*)?') };
+
+var TOK_QNAME = {
+  label: "[qname]",
+  re: new RegExp('^([a-z][-\\w]*:)?[a-z][-\\w]*','i')
+};
+
+var TOK_NODEO = {
+  label: "[nodetest-start]",
+  re: new RegExp('^(processing-instruction|comment|text|node)\\(')
+};
+
+// The table of the tokens of our grammar, used by the lexer: first
+// column the tag, second column a regexp to recognize it in the
+// input, third column the precedence of the token, fourth column a
+// factory function for the semantic value of the token.
+//
+// NOTE: order of this list is important, because the first match
+// counts. Cf. DDOT and DOT, and AXIS and COLON.
+
+var xpathTokenRules = [
+    TOK_DSLASH,
+    TOK_SLASH,
+    TOK_DDOT,
+    TOK_DOT,
+    TOK_AXIS,
+    TOK_COLON,
+    TOK_AXISNAME,
+    TOK_NODEO,
+    TOK_PARENO,
+    TOK_PARENC,
+    TOK_BRACKO,
+    TOK_BRACKC,
+    TOK_AT,
+    TOK_COMMA,
+    TOK_OR,
+    TOK_AND,
+    TOK_NEQ,
+    TOK_EQ,
+    TOK_GE,
+    TOK_GT,
+    TOK_LE,
+    TOK_LT,
+    TOK_PLUS,
+    TOK_MINUS,
+    TOK_ASTERISK,
+    TOK_PIPE,
+    TOK_MOD,
+    TOK_DIV,
+    TOK_LITERALQ,
+    TOK_LITERALQQ,
+    TOK_NUMBER,
+    TOK_QNAME,
+    TOK_NCNAME,
+    TOK_DOLLAR
+];
+
+// All the nonterminals of the grammar. The nonterminal objects are
+// identified by object identity; the labels are used in the debug
+// output only.
+var XPathLocationPath = { label: "LocationPath" };
+var XPathRelativeLocationPath = { label: "RelativeLocationPath" };
+var XPathAbsoluteLocationPath = { label: "AbsoluteLocationPath" };
+var XPathStep = { label: "Step" };
+var XPathNodeTest = { label: "NodeTest" };
+var XPathPredicate = { label: "Predicate" };
+var XPathLiteral = { label: "Literal" };
+var XPathExpr = { label: "Expr" };
+var XPathPrimaryExpr = { label: "PrimaryExpr" };
+var XPathVariableReference = { label: "Variablereference" };
+var XPathNumber = { label: "Number" };
+var XPathFunctionCall = { label: "FunctionCall" };
+var XPathArgumentRemainder = { label: "ArgumentRemainder" };
+var XPathPathExpr = { label: "PathExpr" };
+var XPathUnionExpr = { label: "UnionExpr" };
+var XPathFilterExpr = { label: "FilterExpr" };
+var XPathDigits = { label: "Digits" };
+
+var xpathNonTerminals = [
+    XPathLocationPath,
+    XPathRelativeLocationPath,
+    XPathAbsoluteLocationPath,
+    XPathStep,
+    XPathNodeTest,
+    XPathPredicate,
+    XPathLiteral,
+    XPathExpr,
+    XPathPrimaryExpr,
+    XPathVariableReference,
+    XPathNumber,
+    XPathFunctionCall,
+    XPathArgumentRemainder,
+    XPathPathExpr,
+    XPathUnionExpr,
+    XPathFilterExpr,
+    XPathDigits
+];
+
+// Quantifiers that are used in the productions of the grammar.
+var Q_01 = { label: "?" };
+var Q_MM = { label: "*" };
+var Q_1M = { label: "+" };
+
+// Tag for left associativity (right assoc is implied by undefined).
+var ASSOC_LEFT = true;
+
+// The productions of the grammar. Columns of the table:
+//
+// - target nonterminal,
+// - pattern,
+// - precedence,
+// - semantic value factory
+//
+// The semantic value factory is a function that receives parse tree
+// nodes from the stack frames of the matched symbols as arguments and
+// returns an a node of the parse tree. The node is stored in the top
+// stack frame along with the target object of the rule. The node in
+// the parse tree is an expression object that has an evaluate() method
+// and thus evaluates XPath expressions.
+//
+// The precedence is used to decide between reducing and shifting by
+// comparing the precendence of the rule that is candidate for
+// reducing with the precedence of the look ahead token. Precedence of
+// -1 means that the precedence of the tokens in the pattern is used
+// instead. TODO: It shouldn't be necessary to explicitly assign
+// precedences to rules.
+
+var xpathGrammarRules =
+  [
+   [ XPathLocationPath, [ XPathRelativeLocationPath ], 18,
+     passExpr ],
+   [ XPathLocationPath, [ XPathAbsoluteLocationPath ], 18,
+     passExpr ],
+
+   [ XPathAbsoluteLocationPath, [ TOK_SLASH, XPathRelativeLocationPath ], 18, 
+     makeLocationExpr1 ],
+   [ XPathAbsoluteLocationPath, [ TOK_DSLASH, XPathRelativeLocationPath ], 18,
+     makeLocationExpr2 ],
+
+   [ XPathAbsoluteLocationPath, [ TOK_SLASH ], 0,
+     makeLocationExpr3 ],
+   [ XPathAbsoluteLocationPath, [ TOK_DSLASH ], 0,
+     makeLocationExpr4 ],
+
+   [ XPathRelativeLocationPath, [ XPathStep ], 31,
+     makeLocationExpr5 ],
+   [ XPathRelativeLocationPath,
+     [ XPathRelativeLocationPath, TOK_SLASH, XPathStep ], 31,
+     makeLocationExpr6 ],
+   [ XPathRelativeLocationPath,
+     [ XPathRelativeLocationPath, TOK_DSLASH, XPathStep ], 31,
+     makeLocationExpr7 ],
+
+   [ XPathStep, [ TOK_DOT ], 33,
+     makeStepExpr1 ],
+   [ XPathStep, [ TOK_DDOT ], 33,
+     makeStepExpr2 ],
+   [ XPathStep,
+     [ TOK_AXISNAME, TOK_AXIS, XPathNodeTest ], 33,
+     makeStepExpr3 ],
+   [ XPathStep, [ TOK_AT, XPathNodeTest ], 33,
+     makeStepExpr4 ],
+   [ XPathStep, [ XPathNodeTest ], 33,
+     makeStepExpr5 ],
+   [ XPathStep, [ XPathStep, XPathPredicate ], 33,
+     makeStepExpr6 ],
+
+   [ XPathNodeTest, [ TOK_ASTERISK ], 33,
+     makeNodeTestExpr1 ],
+   [ XPathNodeTest, [ TOK_NCNAME, TOK_COLON, TOK_ASTERISK ], 33,
+     makeNodeTestExpr2 ],
+   [ XPathNodeTest, [ TOK_QNAME ], 33,
+     makeNodeTestExpr3 ],
+   [ XPathNodeTest, [ TOK_NODEO, TOK_PARENC ], 33,
+     makeNodeTestExpr4 ],
+   [ XPathNodeTest, [ TOK_NODEO, XPathLiteral, TOK_PARENC ], 33,
+     makeNodeTestExpr5 ],
+
+   [ XPathPredicate, [ TOK_BRACKO, XPathExpr, TOK_BRACKC ], 33,
+     makePredicateExpr ],
+
+   [ XPathPrimaryExpr, [ XPathVariableReference ], 33,
+     passExpr ],
+   [ XPathPrimaryExpr, [ TOK_PARENO, XPathExpr, TOK_PARENC ], 33,
+     makePrimaryExpr ],
+   [ XPathPrimaryExpr, [ XPathLiteral ], 30,
+     passExpr ],
+   [ XPathPrimaryExpr, [ XPathNumber ], 30,
+     passExpr ],
+   [ XPathPrimaryExpr, [ XPathFunctionCall ], 30,
+     passExpr ],
+
+   [ XPathFunctionCall, [ TOK_QNAME, TOK_PARENO, TOK_PARENC ], -1,
+     makeFunctionCallExpr1 ],
+   [ XPathFunctionCall,
+     [ TOK_QNAME, TOK_PARENO, XPathExpr, XPathArgumentRemainder, Q_MM,
+       TOK_PARENC ], -1,
+     makeFunctionCallExpr2 ],
+   [ XPathArgumentRemainder, [ TOK_COMMA, XPathExpr ], -1,
+     makeArgumentExpr ],
+
+   [ XPathUnionExpr, [ XPathPathExpr ], 20,
+     passExpr ],
+   [ XPathUnionExpr, [ XPathUnionExpr, TOK_PIPE, XPathPathExpr ], 20,
+     makeUnionExpr ],
+
+   [ XPathPathExpr, [ XPathLocationPath ], 20, 
+     passExpr ], 
+   [ XPathPathExpr, [ XPathFilterExpr ], 19, 
+     passExpr ], 
+   [ XPathPathExpr, 
+     [ XPathFilterExpr, TOK_SLASH, XPathRelativeLocationPath ], 20,
+     makePathExpr1 ],
+   [ XPathPathExpr,
+     [ XPathFilterExpr, TOK_DSLASH, XPathRelativeLocationPath ], 20,
+     makePathExpr2 ],
+
+   [ XPathFilterExpr, [ XPathPrimaryExpr, XPathPredicate, Q_MM ], 20,
+     makeFilterExpr ], 
+
+   [ XPathExpr, [ XPathPrimaryExpr ], 16,
+     passExpr ],
+   [ XPathExpr, [ XPathUnionExpr ], 16,
+     passExpr ],
+
+   [ XPathExpr, [ TOK_MINUS, XPathExpr ], -1,
+     makeUnaryMinusExpr ],
+
+   [ XPathExpr, [ XPathExpr, TOK_OR, XPathExpr ], -1,
+     makeBinaryExpr ],
+   [ XPathExpr, [ XPathExpr, TOK_AND, XPathExpr ], -1,
+     makeBinaryExpr ],
+
+   [ XPathExpr, [ XPathExpr, TOK_EQ, XPathExpr ], -1,
+     makeBinaryExpr ],
+   [ XPathExpr, [ XPathExpr, TOK_NEQ, XPathExpr ], -1,
+     makeBinaryExpr ],
+
+   [ XPathExpr, [ XPathExpr, TOK_LT, XPathExpr ], -1,
+     makeBinaryExpr ],
+   [ XPathExpr, [ XPathExpr, TOK_LE, XPathExpr ], -1,
+     makeBinaryExpr ],
+   [ XPathExpr, [ XPathExpr, TOK_GT, XPathExpr ], -1,
+     makeBinaryExpr ],
+   [ XPathExpr, [ XPathExpr, TOK_GE, XPathExpr ], -1,
+     makeBinaryExpr ],
+
+   [ XPathExpr, [ XPathExpr, TOK_PLUS, XPathExpr ], -1,
+     makeBinaryExpr, ASSOC_LEFT ],
+   [ XPathExpr, [ XPathExpr, TOK_MINUS, XPathExpr ], -1,
+     makeBinaryExpr, ASSOC_LEFT ],
+
+   [ XPathExpr, [ XPathExpr, TOK_ASTERISK, XPathExpr ], -1,
+     makeBinaryExpr, ASSOC_LEFT ],
+   [ XPathExpr, [ XPathExpr, TOK_DIV, XPathExpr ], -1,
+     makeBinaryExpr, ASSOC_LEFT ],
+   [ XPathExpr, [ XPathExpr, TOK_MOD, XPathExpr ], -1,
+     makeBinaryExpr, ASSOC_LEFT ],
+
+   [ XPathLiteral, [ TOK_LITERALQ ], -1,
+     makeLiteralExpr ],
+   [ XPathLiteral, [ TOK_LITERALQQ ], -1,
+     makeLiteralExpr ],
+
+   [ XPathNumber, [ TOK_NUMBER ], -1,
+     makeNumberExpr ],
+
+   [ XPathVariableReference, [ TOK_DOLLAR, TOK_QNAME ], 200,
+     makeVariableReference ]
+   ];
+
+// That function computes some optimizations of the above data
+// structures and will be called right here. It merely takes the
+// counter variables out of the global scope.
+
+var xpathRules = [];
+
+function xpathParseInit() {
+  if (xpathRules.length) {
+    return;
+  }
+
+  // Some simple optimizations for the xpath expression parser: sort
+  // grammar rules descending by length, so that the longest match is
+  // first found.
+
+  xpathGrammarRules.sort(function(a,b) {
+    var la = a[1].length;
+    var lb = b[1].length;
+    if (la < lb) {
+      return 1;
+    } else if (la > lb) {
+      return -1;
+    } else {
+      return 0;
+    }
+  });
+
+  var k = 1;
+  for (var i = 0; i < xpathNonTerminals.length; ++i) {
+    xpathNonTerminals[i].key = k++;
+  }
+
+  for (i = 0; i < xpathTokenRules.length; ++i) {
+    xpathTokenRules[i].key = k++;
+  }
+
+  Log.write('XPath parse INIT: ' + k + ' rules');
+
+  // Another slight optimization: sort the rules into bins according
+  // to the last element (observing quantifiers), so we can restrict
+  // the match against the stack to the subest of rules that match the
+  // top of the stack.
+  //
+  // TODO(mesch): What we actually want is to compute states as in
+  // bison, so that we don't have to do any explicit and iterated
+  // match against the stack.
+
+  function push_(array, position, element) {
+    if (!array[position]) {
+      array[position] = [];
+    }
+    array[position].push(element);
+  }
+
+  for (i = 0; i < xpathGrammarRules.length; ++i) {
+    var rule = xpathGrammarRules[i];
+    var pattern = rule[1];
+
+    for (var j = pattern.length - 1; j >= 0; --j) {
+      if (pattern[j] == Q_1M) {
+        push_(xpathRules, pattern[j-1].key, rule);
+        break;
+        
+      } else if (pattern[j] == Q_MM || pattern[j] == Q_01) {
+        push_(xpathRules, pattern[j-1].key, rule);
+        --j;
+
+      } else {
+        push_(xpathRules, pattern[j].key, rule);
+        break;
+      }
+    }
+  }
+
+  Log.write('XPath parse INIT: ' + xpathRules.length + ' rule bins');
+  
+  var sum = 0;
+  mapExec(xpathRules, function(i) {
+    if (i) {
+      sum += i.length;
+    }
+  });
+  
+  Log.write('XPath parse INIT: ' + (sum / xpathRules.length) + ' average bin size');
+}
+
+// Local utility functions that are used by the lexer or parser.
+
+function xpathCollectDescendants(nodelist, node) {
+  for (var n = node.firstChild; n; n = n.nextSibling) {
+    nodelist.push(n);
+    arguments.callee(nodelist, n);
+  }
+}
+
+function xpathCollectDescendantsReverse(nodelist, node) {
+  for (var n = node.lastChild; n; n = n.previousSibling) {
+    nodelist.push(n);
+    arguments.callee(nodelist, n);
+  }
+}
+
+
+// The entry point for the library: match an expression against a DOM
+// node. Returns an XPath value.
+function xpathDomEval(expr, node) {
+  var expr1 = xpathParse(expr);
+  var ret = expr1.evaluate(new ExprContext(node));
+  return ret;
+}
+
+// Utility function to sort a list of nodes. Used by xsltSort() and
+// nxslSelect().
+function xpathSort(input, sort) {
+  if (sort.length == 0) {
+    return;
+  }
+
+  var sortlist = [];
+
+  for (var i = 0; i < input.nodelist.length; ++i) {
+    var node = input.nodelist[i];
+    var sortitem = { node: node, key: [] };
+    var context = input.clone(node, 0, [ node ]);
+    
+    for (var j = 0; j < sort.length; ++j) {
+      var s = sort[j];
+      var value = s.expr.evaluate(context);
+
+      var evalue;
+      if (s.type == 'text') {
+        evalue = value.stringValue();
+      } else if (s.type == 'number') {
+        evalue = value.numberValue();
+      }
+      sortitem.key.push({ value: evalue, order: s.order });
+    }
+
+    // Make the sort stable by adding a lowest priority sort by
+    // id. This is very convenient and furthermore required by the
+    // spec ([XSLT] - Section 10 Sorting).
+    sortitem.key.push({ value: i, order: 'ascending' });
+
+    sortlist.push(sortitem);
+  }
+
+  sortlist.sort(xpathSortByKey);
+
+  var nodes = [];
+  for (var i = 0; i < sortlist.length; ++i) {
+    nodes.push(sortlist[i].node);
+  }
+  input.nodelist = nodes;
+  input.setNode(nodes[0], 0);
+}
+
+
+// Sorts by all order criteria defined. According to the JavaScript
+// spec ([ECMA] Section 11.8.5), the compare operators compare strings
+// as strings and numbers as numbers.
+//
+// NOTE: In browsers which do not follow the spec, this breaks only in
+// the case that numbers should be sorted as strings, which is very
+// uncommon.
+
+function xpathSortByKey(v1, v2) {
+  // NOTE: Sort key vectors of different length never occur in
+  // xsltSort.
+
+  for (var i = 0; i < v1.key.length; ++i) {
+    var o = v1.key[i].order == 'descending' ? -1 : 1;
+    if (v1.key[i].value > v2.key[i].value) {
+      return +1 * o;
+    } else if (v1.key[i].value < v2.key[i].value) {
+      return -1 * o;
+    }
+  }
+
+  return 0;
+}

Added: kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/xslt.js
==============================================================================
--- (empty file)
+++ kukit/azaxslt/trunk/browser/3rd_party/ajaxslt/xslt.js	Tue Jul 25 15:52:52 2006
@@ -0,0 +1,636 @@
+// Copyright 2005 Google Inc.
+// All Rights Reserved
+//
+//
+// An XSL-T processor written in JavaScript. The implementation is NOT
+// complete; some xsl element are left out.
+//
+// References:
+//
+// [XSLT] XSL-T Specification
+// <http://www.w3.org/TR/1999/REC-xslt-19991116>.
+//
+// [ECMA] ECMAScript Language Specification
+// <http://www.ecma-international.org/publications/standards/Ecma-262.htm>.
+//
+// The XSL processor API has one entry point, the function
+// xsltProcessContext(). It receives as arguments the starting point in the
+// input document as an XPath expression context, the DOM root node of
+// the XSL-T stylesheet, and a DOM node that receives the output.
+//
+// NOTE: Actually, XSL-T processing according to the specification is
+// defined as operation on text documents, not as operation on DOM
+// trees. So, strictly speaking, this implementation is not an XSL-T
+// processor, but the processing engine that needs to be complemented
+// by an XML parser and serializer in order to be complete. Those two
+// are found in the file xml.js.
+//
+//
+// TODO(mesch): add jsdoc comments. Use more coherent naming. Finish
+// remaining XSLT features.
+//
+//
+// Author: Steffen Meschkat <mesch at google.com>
+
+
+// The exported entry point of the XSL-T processor, as explained
+// above.
+//
+// @param xmlDoc The input document root, as DOM node.
+// @param template The stylesheet document root, as DOM node.
+// @return the processed document, as XML text in a string.
+
+function xsltProcess(xmlDoc, stylesheet) {
+  if (xsltdebug) {
+    Log.write('XML STYLESHEET:');
+    Log.writeXML(xmlText(stylesheet));
+    Log.write('XML INPUT:');
+    Log.writeXML(xmlText(xmlDoc));
+  }
+
+  var output = (new XDocument).createDocumentFragment();
+  xsltProcessContext(new ExprContext(xmlDoc), stylesheet, output);
+
+  var ret = xmlText(output);
+
+  if (xsltdebug) {
+    Log.write('HTML OUTPUT:');
+    Log.writeXML(ret);
+  }
+
+  return ret;
+}
+
+// The main entry point of the XSL-T processor, as explained above.
+//
+// @param input The input document root, as XPath ExprContext.
+// @param template The stylesheet document root, as DOM node.
+// @param the root of the generated output, as DOM node.
+
+function xsltProcessContext(input, template, output) {
+
+  var nodename = template.nodeName.split(/:/);
+  if (nodename.length == 1 || nodename[0] != 'xsl') {
+    xsltPassThrough(input, template, output);
+
+  } else {
+    switch(nodename[1]) {
+    case 'apply-imports':
+      alert('not implemented: ' + nodename[1]);
+      break;
+
+    case 'apply-templates':
+      var select = xmlGetAttribute(template, 'select');
+      var nodes;
+      if (select) {
+        nodes = xpathEval(select,input).nodeSetValue();
+      } else {
+        nodes = input.node.childNodes;
+      }
+
+      var sortContext = input.clone(nodes[0], 0, nodes);
+      xsltWithParam(sortContext, template);
+      xsltSort(sortContext, template);
+
+      var mode = xmlGetAttribute(template, 'mode');
+      var top = template.ownerDocument.documentElement;
+      for (var i = 0; i < top.childNodes.length; ++i) {
+        var c = top.childNodes[i];
+        if (c.nodeType == DOM_ELEMENT_NODE &&
+            c.nodeName == 'xsl:template' &&
+            c.getAttribute('mode') == mode) {
+          for (var j = 0; j < sortContext.nodelist.length; ++j) {
+            var nj = sortContext.nodelist[j];
+            xsltProcessContext(sortContext.clone(nj, j), c, output);
+          }
+        }
+      }
+      break;
+
+    case 'attribute':
+      var nameexpr = xmlGetAttribute(template, 'name');
+      var name = xsltAttributeValue(nameexpr, input);
+      var node = output.ownerDocument.createDocumentFragment();
+      xsltChildNodes(input, template, node);
+      var value = xmlValue(node);
+      output.setAttribute(name, value);
+      break;
+
+    case 'attribute-set':
+      alert('not implemented: ' + nodename[1]);
+      break;
+
+    case 'call-template':
+      var name = xmlGetAttribute(template, 'name');
+      var top = template.ownerDocument.documentElement;
+
+      var paramContext = input.clone();
+      xsltWithParam(paramContext, template);
+
+      for (var i = 0; i < top.childNodes.length; ++i) {
+        var c = top.childNodes[i];
+        if (c.nodeType == DOM_ELEMENT_NODE &&
+            c.nodeName == 'xsl:template' &&
+            c.getAttribute('name') == name) {
+          xsltChildNodes(paramContext, c, output);
+          break;
+        }
+      }
+      break;
+
+    case 'choose':
+      xsltChoose(input, template, output);
+      break;
+
+    case 'comment':
+      var node = output.ownerDocument.createDocumentFragment();
+      xsltChildNodes(input, template, node);
+      var commentData = xmlValue(node);
+      var commentNode = output.ownerDocument.createComment(commentData);
+      output.appendChild(commentNode);
+      break;
+
+    case 'copy':
+      if (input.node.nodeType == DOM_ELEMENT_NODE) {
+        var node = output.ownerDocument.createElement(input.node.nodeName);
+        output.appendChild(node);
+        xsltChildNodes(input, template, node);
+
+      } else if (input.node.nodeType == DOM_ATTRIBUTE_NODE) {
+        var node = output.ownerDocument.createAttribute(input.node.nodeName);
+        node.nodeValue = input.node.nodeValue;
+        output.setAttribute(node);
+      }
+      break;
+
+    case 'copy-of':
+      var select = xmlGetAttribute(template, 'select');
+      var value = xpathEval(select, input);
+      if (value.type == 'node-set') {
+        var nodes = value.nodeSetValue();
+        for (var i = 0; i < nodes.length; ++i) {
+          xsltCopyOf(output, nodes[i]);
+        }
+
+      } else {
+        var node = output.ownerDocument.createTextNode(value.stringValue());
+        output.appendChild(node);
+      }
+      break;
+
+    case 'decimal-format':
+      alert('not implemented: ' + nodename[1]);
+      break;
+
+    case 'element':
+      var nameexpr = xmlGetAttribute(template, 'name');
+      var name = xsltAttributeValue(nameexpr, input);
+      var node = output.ownerDocument.createElement(name);
+      output.appendChild(node);
+      xsltChildNodes(input, template, node);
+      break;
+
+    case 'fallback':
+      alert('not implemented: ' + nodename[1]);
+      break;
+
+    case 'for-each':
+      var sortContext = input.clone();
+      xsltSort(sortContext, template);
+      xsltForEach(sortContext, template, output);
+      break;
+
+    case 'if':
+      var test = xmlGetAttribute(template, 'test');
+      if (xpathEval(test, input).booleanValue()) {
+        xsltChildNodes(input, template, output);
+      }
+      break;
+
+    case 'import':
+      alert('not implemented: ' + nodename[1]);
+      break;
+
+    case 'include':
+      alert('not implemented: ' + nodename[1]);
+      break;
+
+    case 'key':
+      alert('not implemented: ' + nodename[1]);
+      break;
+
+    case 'message':
+      alert('not implemented: ' + nodename[1]);
+      break;
+
+    case 'namespace-alias':
+      alert('not implemented: ' + nodename[1]);
+      break;
+
+    case 'number':
+      alert('not implemented: ' + nodename[1]);
+      break;
+
+    case 'otherwise':
+      alert('error if here: ' + nodename[1]);
+      break;
+
+    case 'output':
+      // Ignored. -- Since we operate on the DOM, and all further use
+      // of the output of the XSL transformation is determined by the
+      // browser that we run in, this parameter is not applicable to
+      // this implementation.
+      break;
+
+    case 'preserve-space':
+      alert('not implemented: ' + nodename[1]);
+      break;
+
+    case 'processing-instruction':
+      alert('not implemented: ' + nodename[1]);
+      break;
+
+    case 'sort':
+      // just ignore -- was handled by xsltSort()
+      break;
+
+    case 'strip-space':
+      alert('not implemented: ' + nodename[1]);
+      break;
+
+    case 'stylesheet':
+    case 'transform':
+      xsltChildNodes(input, template, output);
+      break;
+
+    case 'template':
+      var match = xmlGetAttribute(template, 'match');
+      if (match && xpathMatch(match, input)) {
+        xsltChildNodes(input, template, output);
+      }
+      break;
+
+    case 'text':
+      var text = xmlValue(template);
+      var node = output.ownerDocument.createTextNode(text);
+      output.appendChild(node);
+      break;
+
+    case 'value-of':
+      var select = xmlGetAttribute(template, 'select');
+      var value = xpathEval(select, input).stringValue();
+      var node = output.ownerDocument.createTextNode(value);
+      output.appendChild(node);
+      break;
+
+    case 'param':
+      xsltVariable(input, template, false);
+      break;
+
+    case 'variable':
+      xsltVariable(input, template, true);
+      break;
+
+    case 'when':
+      alert('error if here: ' + nodename[1]);
+      break;
+
+    case 'with-param':
+      alert('error if here: ' + nodename[1]);
+      break;
+
+    default:
+      alert('error if here: ' + nodename[1]);
+      break;
+    }
+  }
+}
+
+
+// Sets parameters defined by xsl:with-param child nodes of the
+// current template node, in the current input context. This happens
+// before the operation specified by the current template node is
+// executed.
+
+function xsltWithParam(input, template) {
+  for (var i = 0; i < template.childNodes.length; ++i) {
+    var c = template.childNodes[i];
+    if (c.nodeType == DOM_ELEMENT_NODE && c.nodeName == 'xsl:with-param') {
+      xsltVariable(input, c, true);
+    }
+  }
+}
+
+
+// Orders the current node list in the input context according to the
+// sort order specified by xsl:sort child nodes of the current
+// template node. This happens before the operation specified by the
+// current template node is executed.
+//
+// TODO(mesch): case-order is not implemented.
+//
+// NOTE: this was tested using driving directions, as follows:
+//
+// <xsl:apply-templates select="segments/segment">
+//  <xsl:sort select="substring-before(@distance,'&#160;')"
+//            order="descending" data-type="number"/>
+//  <xsl:sort select="node()"/>
+// </xsl:apply-templates>
+// 
+// TODO(mesch): write a unit test.
+
+function xsltSort(input, template) {
+  var sort = [];
+  for (var i = 0; i < template.childNodes.length; ++i) {
+    var c = template.childNodes[i];
+    if (c.nodeType == DOM_ELEMENT_NODE && c.nodeName == 'xsl:sort') {
+      var select = xmlGetAttribute(c, 'select');
+      var expr = xpathParse(select);
+      var type = xmlGetAttribute(c, 'data-type') || 'text';
+      var order = xmlGetAttribute(c, 'order') || 'ascending';
+      sort.push({ expr: expr, type: type, order: order });
+    }
+  }
+
+  xpathSort(input, sort);
+}
+
+
+// Evaluates a variable or parameter and set it in the current input
+// context. Implements xsl:variable, xsl:param, and xsl:with-param.
+//
+// @param override flag that defines if the value computed here
+// overrides the one already in the input context if that is the
+// case. I.e. decides if this is a default value or a local
+// value. xsl:variable and xsl:with-param override; xsl:param doesn't.
+
+function xsltVariable(input, template, override) {
+  var name = xmlGetAttribute(template, 'name');
+  var select = xmlGetAttribute(template, 'select');
+
+  var value;
+
+  if (template.childNodes.length > 0) {
+    var root = input.node.ownerDocument.createDocumentFragment();
+    xsltChildNodes(input, template, root);
+    value = new NodeSetValue([root]);
+
+  } else if (select) {
+    value = xpathEval(select, input);
+
+  } else {
+    value = new StringValue('');
+  }
+
+  if (override || !input.getVariable(name)) {
+    input.setVariable(name, value);
+  }
+}
+
+
+// Implements xsl:chose and its child nodes xsl:when and
+// xsl:otherwise.
+
+function xsltChoose(input, template, output) {
+  for (var i = 0; i < template.childNodes.length; ++i) {
+    var childNode = template.childNodes[i];
+    if (childNode.nodeType != DOM_ELEMENT_NODE) {
+      continue;
+
+    } else if (childNode.nodeName == 'xsl:when') {
+      var test = xmlGetAttribute(childNode, 'test');
+      if (xpathEval(test, input).booleanValue()) {
+        xsltChildNodes(input, childNode, output);
+        break;
+      }
+
+    } else if (childNode.nodeName == 'xsl:otherwise') {
+      xsltChildNodes(input, childNode, output);
+      break;
+    }
+  }
+}
+
+
+// Implements xsl:for-each.
+
+function xsltForEach(input, template, output) {
+  var select = xmlGetAttribute(template, 'select');
+  var nodes = xpathEval(select, input).nodeSetValue();
+  for (var i = 0; i < nodes.length; ++i) {
+    var context = input.clone(nodes[i], i, nodes);
+    xsltChildNodes(context, template, output);
+  }
+}
+
+
+// Traverses the template node tree. Calls the main processing
+// function with the current input context for every child node of the
+// current template node.
+
+function xsltChildNodes(input, template, output) {
+  // Clone input context to keep variables declared here local to the
+  // siblings of the children.
+  var context = input.clone();
+  for (var i = 0; i < template.childNodes.length; ++i) {
+    xsltProcessContext(context, template.childNodes[i], output);
+  }
+}
+
+
+// Passes template text to the output. The current template node does
+// not specify an XSL-T operation and therefore is appended to the
+// output with all its attributes. Then continues traversing the
+// template node tree.
+
+function xsltPassThrough(input, template, output) {
+  if (template.nodeType == DOM_TEXT_NODE) {
+    if (xsltPassText(template)) {
+      var node = output.ownerDocument.createTextNode(template.nodeValue);
+      output.appendChild(node);
+    }
+
+  } else if (template.nodeType == DOM_ELEMENT_NODE) {
+    var node = output.ownerDocument.createElement(template.nodeName);
+    for (var i = 0; i < template.attributes.length; ++i) {
+      var a = template.attributes[i];
+      if (a) {
+        var name = a.nodeName;
+        var value = xsltAttributeValue(a.nodeValue, input);
+        node.setAttribute(name, value);
+      }
+    }
+    output.appendChild(node);
+    xsltChildNodes(input, template, node);
+
+  } else {
+    // This applies also to the DOCUMENT_NODE of the XSL stylesheet,
+    // so we don't have to treat it specially.
+    xsltChildNodes(input, template, output);
+  }
+}
+
+// Determines if a text node in the XSLT template document is to be
+// stripped according to XSLT whitespace stipping rules.
+//
+// See [XSLT], section 3.4.
+//
+// TODO(mesch): Whitespace stripping on the input document is
+// currently not implemented.
+
+function xsltPassText(template) {
+  if (!template.nodeValue.match(/^\s*$/)) {
+    return true;
+  }
+
+  var element = template.parentNode;
+  if (element.nodeName == 'xsl:text') {
+    return true;
+  }
+
+  while (element && element.nodeType == DOM_ELEMENT_NODE) {
+    var xmlspace = element.getAttribute('xml:space');
+    if (xmlspace) {
+      if (xmlspace == 'default') {
+        return false;
+      } else if (xmlspace == 'preserve') {
+        return true;
+      }
+    }
+
+    element = element.parentNode;
+  }
+
+  return false;
+}
+
+// Evaluates an XSL-T attribute value template. Attribute value
+// templates are attributes on XSL-T elements that contain XPath
+// expressions in braces {}. The XSL-T expressions are evaluated in
+// the current input context. NOTE(mesch): We are using stringSplit()
+// instead of string.split() for IE compatibility, see comment on
+// stringSplit().
+
+function xsltAttributeValue(value, context) {
+  var parts = stringSplit(value, '{');
+  if (parts.length == 1) {
+    return value;
+  }
+
+  var ret = '';
+  for (var i = 0; i < parts.length; ++i) {
+    var rp = stringSplit(parts[i], '}');
+    if (rp.length != 2) {
+      // first literal part of the value
+      ret += parts[i];
+      continue;
+    }
+
+    var val = xpathEval(rp[0], context).stringValue();
+    ret += val + rp[1];
+  }
+
+  return ret;
+}
+
+
+// Wrapper function to access attribute values of template element
+// nodes. Currently this calls xmlResolveEntities because in some DOM
+// implementations the return value of node.getAttributeValue()
+// contains unresolved XML entities, although the DOM spec requires
+// that entity references are resolved by te DOM.
+
+function xmlGetAttribute(node, name) {
+  // TODO(mesch): This should not be necessary if the DOM is working
+  // correctly. The DOM is responsible for resolving entities, not the
+  // application.
+  var value = node.getAttribute(name);
+  if (value) {
+    return xmlResolveEntities(value);
+  } else {
+    return value;
+  }
+};
+
+
+// Implements xsl:copy-of for node-set values of the select
+// expression. Recurses down the source node tree, which is part of
+// the input document.
+//
+// @param dst the node being copied to, part of output document,
+// @param src the node being copied, part in input document,
+
+function xsltCopyOf(dst, src) {
+  if (src.nodeType == DOM_TEXT_NODE) {
+    var node = dst.ownerDocument.createTextNode(src.nodeValue);
+    dst.appendChild(node);
+
+  } else if (src.nodeType == DOM_ATTRIBUTE_NODE) {
+    dst.setAttribute(src.nodeName, src.nodeValue);
+
+  } else if (src.nodeType == DOM_ELEMENT_NODE) {
+    var node = dst.ownerDocument.createElement(src.nodeName);
+    dst.appendChild(node);
+
+    // Recursion is implemented by the function calling itself via
+    // arguments.callee, independent of its name. Very convenient for
+    // renaming the function.
+
+    for (var i = 0; i < src.attributes.length; ++i) {
+      arguments.callee(node, src.attributes[i]);
+    }
+
+    for (var i = 0; i < src.childNodes.length; ++i) {
+      arguments.callee(node, src.childNodes[i]);
+    }
+
+  } else if (src.nodeType == DOM_DOCUMENT_FRAGMENT_NODE ||
+             src.nodeType == DOM_DOCUMENT_NODE) {
+    for (var i = 0; i < src.childNodes.length; ++i) {
+      arguments.callee(dst, src.childNodes[i]);
+    }
+  }
+}
+
+
+// Evaluates an XPath expression in the current input context as a
+// match (see [XSLT] section 5.2, paragraph 1).
+
+function xpathMatch(match, context) {
+  var expr = xpathParse(match);
+
+  var ret;
+  // Shortcut for the most common case.
+  if (expr.steps && !expr.absolute && expr.steps.length == 1 &&
+      expr.steps[0].axis == 'child' && expr.steps[0].predicate.length == 0) {
+    ret = expr.steps[0].nodetest.evaluate(context).booleanValue();
+
+  } else {
+
+    ret = false;
+    var node = context.node;
+
+    while (!ret && node) {
+      var result = expr.evaluate(context.clone(node,0,[node])).nodeSetValue();
+      for (var i = 0; i < result.length; ++i) {
+        if (result[i] == context.node) {
+          ret = true;
+          break;
+        }
+      }
+      node = node.parentNode;
+    }
+  }
+
+  return ret;
+}
+
+
+// Parses and then evaluates the given XPath expression in the given
+// input context. Notice that parsed xpath expressions are cached.
+
+function xpathEval(select, context) {
+  var expr = xpathParse(select);
+  var ret = expr.evaluate(context);
+  return ret;
+}

Added: kukit/azaxslt/trunk/browser/plugin.js
==============================================================================
--- (empty file)
+++ kukit/azaxslt/trunk/browser/plugin.js	Tue Jul 25 15:52:52 2006
@@ -0,0 +1,13 @@
+
+/* Selector registration */
+
+kukit.sr.selectorRegistry.register('xpath', function(expr, node) {
+    if (!node)
+        node = document;
+    var xpath_res = xpathDomEval(expr, node);
+    kukit.logDebug('XPath nodes:'+xpath_res.stringValue());
+    var nodes = xpath_res.nodeSetValue();
+    kukit.logDebug('XPath nodes number: '+nodes.length);
+    return nodes;
+});
+

Added: kukit/azaxslt/trunk/configure.zcml
==============================================================================
--- (empty file)
+++ kukit/azaxslt/trunk/configure.zcml	Tue Jul 25 15:52:52 2006
@@ -0,0 +1,35 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+     xmlns:browser="http://namespaces.zope.org/browser"
+     xmlns:azax="http://namespaces.zope.org/azax"
+     >
+     
+     <!-- Js resources -->
+
+    <browser:resource
+        file="browser/3rd_party/ajaxslt/misc.js"
+        name="ajaxslt_misc.js"
+        />
+
+    <browser:resource
+        file="browser/3rd_party/ajaxslt/dom.js"
+        name="ajaxslt_dom.js"
+        />
+
+    <browser:resource
+        file="browser/3rd_party/ajaxslt/xpath.js"
+        name="ajaxslt_xpath.js"
+        />
+
+    <browser:resource
+        file="browser/3rd_party/ajaxslt/xslt.js"
+        name="ajaxslt_xslt.js"
+        />
+
+     <!-- Selector types -->
+
+    <azax:registerSelectorType
+        name="xpath"
+        jsfile="browser/plugin.js"
+        />
+
+</configure>