From reebalazs at codespeak.net  Wed Aug  2 11:31:55 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Wed,  2 Aug 2006 11:31:55 +0200 (CEST)
Subject: [Kukit-checkins] r30878 - in kukit/kukit.js/trunk: kukit tests
Message-ID: <20060802093155.7331A10083@code0.codespeak.net>

Author: reebalazs
Date: Wed Aug  2 11:31:51 2006
New Revision: 30878

Added:
   kukit/kukit.js/trunk/kukit/requestmanager.js
   kukit/kukit.js/trunk/kukit/utils.js
   kukit/kukit.js/trunk/tests/test_utils.js
Modified:
   kukit/kukit.js/trunk/kukit/kukit.js
   kukit/kukit.js/trunk/kukit/tokenizer.js
   kukit/kukit.js/trunk/tests/runner.html
   kukit/kukit.js/trunk/tests/runtests.js
   kukit/kukit.js/trunk/tests/runtests.sh
   kukit/kukit.js/trunk/tests/test_kssparser.js
   kukit/kukit.js/trunk/tests/test_tokenizer.js
Log:
Refactoring request manager

Modified: kukit/kukit.js/trunk/kukit/kukit.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kukit.js	(original)
+++ kukit/kukit.js/trunk/kukit/kukit.js	Wed Aug  2 11:31:51 2006
@@ -1,190 +1,3 @@
-/* Create kukit namespace */
-
-if (typeof(kukit) == 'undefined') {
-    var kukit = {};
-}
-
-/* check whether the logging stuff of MochiKit is available */
-try {
-    MochiKit.Logging.log('Initializing kukit');
-    kukit.log = MochiKit.Logging.log;
-    kukit.logError = MochiKit.Logging.logError;
-    kukit.logDebug = MochiKit.Logging.logDebug;
-    kukit.logFatal = MochiKit.Logging.logFatal;
-    kukit.logWarning = MochiKit.Logging.logWarning;
-} catch(e) {
-    kukit.log = function(str){};
-    kukit.logError = kukit.log;
-    kukit.logDebug = kukit.log;
-    kukit.logFatal = kukit.log;
-    kukit.logWarning = kukit.log;
-}
-
-/* 
-* Exception factory 
-*
-* Create exception types:
-*
-* myError = kukit.exceptionFactory("myError", "My special error: ");
-*
-* Throwing:
-*
-* throw new myError("There was an error in my program.");
-*
-* Catching example:
-*
-*   ...
-*    } catch(e) {
-*        if (e.name == 'JSONRPCError') {
-*            ...
-*        } else {
-*            throw(e);
-*        }
-*    }
-*
-*/
-
-// XXX TODO what about IE or other browsers?
-// - on IE6, the error text is not printed.
-
-kukit.exceptionFactory = function(name) {
-    var exc = function (arg1, arg2, arg3, arg4, arg5) {
-        var kw = this.__init__(name, arg1, arg2, arg3, arg4, arg5);
-        var err = new Error(kw.message);
-        for (var key in kw) {
-            err[key] = kw[key];
-        }
-        // number is an IE-only property
-        if (typeof err.number == 'number') {
-            // show sensible error on IE
-            err.toString = function () {
-                return this.name + ': ' + this.message;
-            }
-        }
-        return err
-    }
-    exc.prototype.__init__ = function(name, message) {
-        var kw = {};
-        kw.name = name;
-        kw.message = message;
-        return kw;
-    }
-    return exc
-};
-
-/* Request manager */
-
-kukit.RequestManager = function (name, maxNr) {
-    this.waitingQueue = new kukit.FifoQueue();
-    this.sentNr = 0;
-    if (typeof(name) == undefined) {
-        name = null;
-    }
-    this.name = name;
-    var namestr = '';
-    if (name != null) {
-        namestr = '[' + name + '] '
-        }
-    this.namestr = namestr;
-    if (typeof(maxNr) != undefined && maxNr != null) {
-        this.maxNr = maxNr;
-    }
-};
-
-// max request number
-kukit.RequestManager.prototype.maxNr = 4;
-
-kukit.RequestManager.prototype.getInfo = function() {
-    return '(RQ: ' + this.sentNr + ' OUT, ' + this.waitingQueue.size() + ' WAI)';
-};
-
-kukit.RequestManager.prototype.log = function(txt) {
-    kukit.logDebug('RequestManager ' + this.namestr + txt + ' ' + this.getInfo());
-};
-
-kukit.RequestManager.prototype.pushWaitingRequest = function(func, url) {
-    this.waitingQueue.push([func, url]);
-};
-
-kukit.RequestManager.prototype.popWaitingRequest = function() {
-    return this.waitingQueue.pop();
-};
-
-kukit.RequestManager.prototype.isWaitingRequestQueueEmpty = function() {
-    return this.waitingQueue.empty();
-};
-
-kukit.RequestManager.prototype.pushSentRequest = function(func, url) {
-    // we do not store the elems, since they are not needed now
-    this.sentNr = this.sentNr + 1;
-};
-
-kukit.RequestManager.prototype.popSentRequest = function() {
-    this.sentNr = this.sentNr - 1;
-};
-
-kukit.RequestManager.prototype.isSentRequestQueueFull = function() {
-    return (this.sentNr >= this.maxNr)
-};
-
-/* request manager notification API */
-
-kukit.RequestManager.prototype.notifyServer = function(func, url) {
-    // func must be a partial (e.g. use Mochikit or wrap up)
-    // here url is only for the logging
-    if (! this.isSentRequestQueueFull()) {
-        // can be sent if we are not over the limit.
-        this.pushSentRequest(func, url);
-        this.log('Notify server at ' + url);
-        func();
-    } else {
-        this.pushWaitingRequest(func, url);
-        this.log('Queue server notification at ' + url);
-    }
-};
-
-kukit.RequestManager.prototype.receivedResult = function() {
-    // must be called when one result arrived
-    // Mark that we have one less request out.
-    this.popSentRequest();
-    if (! this.isWaitingRequestQueueEmpty()) {
-        // see if we can send another request in place of the received one
-        // request is waiting, send it.
-        var waiting = this.popWaitingRequest();
-        var func = waiting[0];
-        var url = waiting[1];
-        this.pushSentRequest(func, url);
-        this.log("Send queued notification to server at " + url);
-        func();
-    } else {
-        this.log("Request queue empty.");
-    }
-};
-
-/* simple FIFO queue */
-
-kukit.FifoQueue = function () {
-    this.reset();
-};
-
-kukit.FifoQueue.prototype.reset = function() {
-    this.elements = new Array();
-};
-kukit.FifoQueue.prototype.push = function(obj) {
-    this.elements.push(obj);
-};
-kukit.FifoQueue.prototype.pop = function() {
-    return this.elements.shift();
-};
-kukit.FifoQueue.prototype.empty = function() {
-    return ! this.elements.length;
-};
-kukit.FifoQueue.prototype.size = function() {
-    return this.elements.length;
-};
-kukit.FifoQueue.prototype.front = function() {
-    return this.elements[0];
-};
 
 /* State vars srorage. This can be used from kss via a method. */
 
@@ -192,7 +5,7 @@
 
 /* instantiate request manager */
 
-kukit.requestManager = new kukit.RequestManager();
+kukit.requestManager = new kukit.rm.RequestManager();
 
 kukit.RuleSheetLink = function(href, res_type) {
     this.href = href;
@@ -365,33 +178,33 @@
 
 kukit.processResult = function(domDoc, backparms) {
     var domXml = domDoc.responseXML;
-    kukit.requestManager.receivedResult();
-        if (!domXml) {
-            kukit.logError('Error : no kukit response');
-            return;
-        }
-        // Opera <= 8.5 does not have the parseError attribute, so check for it first
-        if (domXml.parseError && (domXml.parseError != 0)) {
-            kukit.logError(Sarissa.getParseErrorText(domXml));
-            return;
-        }
-        if (domXml.getElementsByTagNameNS) { 
-            commands = domXml.getElementsByTagNameNS("http://www.kukit.org/commands/1.0",
-               "command");
-        } else {
-            //IE does not know DOM2
-            commands = domXml.getElementsByTagName("kukit:command");
-        }  
-        if (commands.length == 0) {
-            kukit.logWarning('No commands in kukit response');
-            return;
-        }
-        var command_processor = new kukit.CommandProcessor();
-        command_processor.parseCommands(commands, domDoc);
-        command_processor.executeCommands(backparms);
+    if (!domXml) {
+        // This will happen in case there are errors in the response
+        kukit.logError('Error : no kukit response');
+        return;
+    }
+    // Opera <= 8.5 does not have the parseError attribute, so check for it first
+    if (domXml.parseError && (domXml.parseError != 0)) {
+        kukit.logError(Sarissa.getParseErrorText(domXml));
+        return;
+    }
+    if (domXml.getElementsByTagNameNS) { 
+        commands = domXml.getElementsByTagNameNS("http://www.kukit.org/commands/1.0",
+           "command");
+    } else {
+        //IE does not know DOM2
+        commands = domXml.getElementsByTagName("kukit:command");
+    }  
+    if (commands.length == 0) {
+        kukit.logWarning('No commands in kukit response');
+        return;
+    }
+    var command_processor = new kukit.CommandProcessor();
+    command_processor.parseCommands(commands, domDoc);
+    command_processor.executeCommands(backparms);
 };
 
-kukit.CommandExecutionError = kukit.exceptionFactory('CommandExecutionError');
+kukit.CommandExecutionError = kukit.ut.exceptionFactory('CommandExecutionError');
 kukit.CommandExecutionError.prototype.__superinit__ = kukit.CommandExecutionError.prototype.__init__; 
 kukit.CommandExecutionError.prototype.__init__ = function(name, e, command) {
     var kw = this.__superinit__(name, '');

Added: kukit/kukit.js/trunk/kukit/requestmanager.js
==============================================================================
--- (empty file)
+++ kukit/kukit.js/trunk/kukit/requestmanager.js	Wed Aug  2 11:31:51 2006
@@ -0,0 +1,107 @@
+
+/* Request manager */
+
+kukit.rm = {};
+
+kukit.rm.RequestManager = function (name, maxNr) {
+    this.waitingQueue = new kukit.ut.FifoQueue();
+    this.freeSlotQueue = new kukit.ut.FifoQueue();
+    this.sentNr = 0;
+    if (typeof(name) == undefined) {
+        name = null;
+    }
+    this.name = name;
+    var namestr = '';
+    if (name != null) {
+        namestr = '[' + name + '] '
+        }
+    this.namestr = namestr;
+    if (typeof(maxNr) != undefined && maxNr != null) {
+        this.maxNr = maxNr;
+    }
+    for (var i=0; i<this.maxNr; i++) {
+        this.freeSlotQueue.push(i);
+    }
+};
+
+// max request number
+kukit.rm.RequestManager.prototype.maxNr = 4;
+
+kukit.rm.RequestManager.prototype.getInfo = function() {
+    return '(RQ: ' + this.sentNr + ' OUT, ' + this.waitingQueue.size() + ' WAI)';
+};
+
+kukit.rm.RequestManager.prototype.log = function(txt) {
+    kukit.logDebug('RequestManager ' + this.namestr + txt + ' ' + this.getInfo());
+};
+
+kukit.rm.RequestManager.prototype.pushWaitingRequest = function(func, url) {
+    this.waitingQueue.push([func, url]);
+};
+
+kukit.rm.RequestManager.prototype.popWaitingRequest = function() {
+    return this.waitingQueue.pop();
+};
+
+kukit.rm.RequestManager.prototype.isWaitingRequestQueueEmpty = function() {
+    return this.waitingQueue.empty();
+};
+
+kukit.rm.RequestManager.prototype.pushSentRequest = function(func, url) {
+    this.sentNr += 1;
+    var slot = this.freeSlotQueue.pop();
+    // Wrap up the callback func
+    var self = this;
+    var wrapped = function() {
+        // calls result processing
+        self.receivedResult(slot);
+        // calls the callback
+        func();
+    };
+    return wrapped;
+};
+
+kukit.rm.RequestManager.prototype.popSentRequest = function(slot) {
+    this.freeSlotQueue.push(slot);
+    this.sentNr -= 1;
+};
+
+kukit.rm.RequestManager.prototype.isSentRequestQueueFull = function() {
+    return this.freeSlotQueue.empty();
+};
+
+kukit.rm.RequestManager.prototype.receivedResult = function(slot) {
+    // called automatically when the result gets processed.
+    // Mark that we have one less request out.
+    this.popSentRequest(slot);
+    if (! this.isWaitingRequestQueueEmpty()) {
+        // see if we can send another request in place of the received one
+        // request is waiting, send it.
+        var waiting = this.popWaitingRequest();
+        var func = waiting[0];
+        var url = waiting[1];
+        var wrapped = this.pushSentRequest(func, url);
+        this.log("Send queued notification to server at " + url);
+        wrapped();
+    } else {
+        this.log("Request queue empty.");
+    }
+};
+
+
+/* request manager notification API */
+
+kukit.rm.RequestManager.prototype.notifyServer = function(func, url) {
+    // func must be a partial (e.g. use Mochikit or wrap up)
+    // here url is only for the logging
+    if (! this.isSentRequestQueueFull()) {
+        // can be sent if we are not over the limit.
+        var wrapped = this.pushSentRequest(func, url);
+        this.log('Notify server at ' + url);
+        wrapped();
+    } else {
+        this.pushWaitingRequest(func, url);
+        this.log('Queue server notification at ' + url);
+    }
+};
+

Modified: kukit/kukit.js/trunk/kukit/tokenizer.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/tokenizer.js	(original)
+++ kukit/kukit.js/trunk/kukit/tokenizer.js	Wed Aug  2 11:31:51 2006
@@ -2,7 +2,7 @@
 /* Simple but effective tokenizing parser engine */
 
 kukit.tk = {};
-kukit.tk.ParsingError = kukit.exceptionFactory('ParsingError');
+kukit.tk.ParsingError = kukit.ut.exceptionFactory('ParsingError');
 kukit.tk.ParsingError.prototype.__superinit__ = kukit.tk.ParsingError.prototype.__init__; 
 kukit.tk.ParsingError.prototype.__init__ = function(name, message, errpos) {
     var kw = this.__superinit__(name, message);

Added: kukit/kukit.js/trunk/kukit/utils.js
==============================================================================
--- (empty file)
+++ kukit/kukit.js/trunk/kukit/utils.js	Wed Aug  2 11:31:51 2006
@@ -0,0 +1,158 @@
+/* Create kukit namespace */
+
+if (typeof(kukit) == 'undefined') {
+    var kukit = {};
+}
+
+/* check whether the logging stuff of MochiKit is available */
+try {
+    MochiKit.Logging.log('Initializing kukit');
+    kukit.log = MochiKit.Logging.log;
+    kukit.logError = MochiKit.Logging.logError;
+    kukit.logDebug = MochiKit.Logging.logDebug;
+    kukit.logFatal = MochiKit.Logging.logFatal;
+    kukit.logWarning = MochiKit.Logging.logWarning;
+} catch(e) {
+    kukit.log = function(str){};
+    kukit.logError = kukit.log;
+    kukit.logDebug = kukit.log;
+    kukit.logFatal = kukit.log;
+    kukit.logWarning = kukit.log;
+}
+/* utilities */
+
+kukit.ut = {};
+
+/* 
+* Exception factory 
+*
+* Create exception types:
+*
+* myError = kukit.ut.exceptionFactory("myError", "My special error: ");
+*
+* Throwing:
+*
+* throw new myError("There was an error in my program.");
+*
+* Catching example:
+*
+*   ...
+*    } catch(e) {
+*        if (e.name == 'JSONRPCError') {
+*            ...
+*        } else {
+*            throw(e);
+*        }
+*    }
+*
+*/
+
+// XXX TODO what about IE or other browsers?
+// - on IE6, the error text is not printed.
+
+kukit.ut.exceptionFactory = function(name) {
+    var exc = function (arg1, arg2, arg3, arg4, arg5) {
+        var kw = this.__init__(name, arg1, arg2, arg3, arg4, arg5);
+        var err = new Error(kw.message);
+        for (var key in kw) {
+            err[key] = kw[key];
+        }
+        // number is an IE-only property
+        if (typeof err.number == 'number') {
+            // show sensible error on IE
+            err.toString = function () {
+                return this.name + ': ' + this.message;
+            }
+        }
+        return err
+    }
+    exc.prototype.__init__ = function(name, message) {
+        var kw = {};
+        kw.name = name;
+        kw.message = message;
+        return kw;
+    }
+    return exc
+};
+
+
+/* simple FIFO queue */
+
+kukit.ut.FifoQueue = function () {
+    this.reset();
+};
+
+kukit.ut.FifoQueue.prototype.reset = function() {
+    this.elements = new Array();
+};
+
+kukit.ut.FifoQueue.prototype.push = function(obj) {
+    this.elements.push(obj);
+};
+
+kukit.ut.FifoQueue.prototype.pop = function() {
+    return this.elements.shift();
+};
+
+kukit.ut.FifoQueue.prototype.empty = function() {
+    return ! this.elements.length;
+};
+
+kukit.ut.FifoQueue.prototype.size = function() {
+    return this.elements.length;
+};
+
+kukit.ut.FifoQueue.prototype.front = function() {
+    return this.elements[0];
+};
+
+/* simple sorted queue */
+
+kukit.ut.SortedQueue = function (comparefunc) {
+    // comparefunc(left, right) determines the order by returning -1 if left should 
+    // occur before right, +1 if left should occur after right or 
+    // 0 if left and right  have no preference as to order.
+    // If comparefunc is not specified or is undefined, the default order specified by < used.
+    if (comparefunc) {
+        this.comparefunc = comparefunc;
+    }
+    this.reset();
+};
+
+kukit.ut.SortedQueue.prototype.comparefunc = function(a, b) {
+    if (a < b) return -1;
+    else if (a > b) return +1;
+    else return 0;
+};
+
+kukit.ut.SortedQueue.prototype.reset = function() {
+    this.elements = new Array();
+};
+
+kukit.ut.SortedQueue.prototype.push = function(obj) {
+    // Find the position of the object.
+    var i = 0;
+    while (i < this.elements.length && this.comparefunc(this.elements[i], obj) == -1) {
+        i ++;
+    }
+    // and insert it there
+    this.elements.splice(i, 0, obj);
+};
+
+kukit.ut.SortedQueue.prototype.pop = function() {
+    // takes minimal element
+    return this.elements.shift();
+};
+
+kukit.ut.SortedQueue.prototype.empty = function() {
+    return ! this.elements.length;
+};
+
+kukit.ut.SortedQueue.prototype.size = function() {
+    return this.elements.length;
+};
+
+kukit.ut.SortedQueue.prototype.front = function() {
+    return this.elements[0];
+};
+

Modified: kukit/kukit.js/trunk/tests/runner.html
==============================================================================
--- kukit/kukit.js/trunk/tests/runner.html	(original)
+++ kukit/kukit.js/trunk/tests/runner.html	Wed Aug  2 11:31:51 2006
@@ -15,6 +15,8 @@
         </style>
         <script type="text/javascript" src="ecmaunit.js"> </script>
         <script type="text/javascript" src="unittestUtilities.js"> </script>
+        <script type="text/javascript" src="../kukit/utils.js"> </script>
+        <script type="text/javascript" src="../kukit/requestmanager.js"> </script>
         <script type="text/javascript" src="../kukit/kukit.js"> </script>
         <script type="text/javascript" src="../kukit/tokenizer.js"> </script>
         <script type="text/javascript" src="../kukit/resourcedata.js"> </script>
@@ -26,6 +28,7 @@
         <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_utils.js"> </script>
         <script type="text/javascript" src="test_tokenizer.js"> </script>
         <script type="text/javascript" src="test_kssparser.js"> </script>
       </head>

Modified: kukit/kukit.js/trunk/tests/runtests.js
==============================================================================
--- kukit/kukit.js/trunk/tests/runtests.js	(original)
+++ kukit/kukit.js/trunk/tests/runtests.js	Wed Aug  2 11:31:51 2006
@@ -17,6 +17,7 @@
 function runTests() {
     var reporter = new StdoutReporter;
     var testsuite = new TestSuite(reporter);
+    testsuite.registerTest(kukit.UtilsTestCase);
     testsuite.registerTest(kukit.TokenizerTestCase);
     testsuite.registerTest(kukit.KssParserTestCase);
     testsuite.runSuite();

Modified: kukit/kukit.js/trunk/tests/runtests.sh
==============================================================================
--- kukit/kukit.js/trunk/tests/runtests.sh	(original)
+++ kukit/kukit.js/trunk/tests/runtests.sh	Wed Aug  2 11:31:51 2006
@@ -1,6 +1,8 @@
 js \
 	-f ecmaunit.js \
 	-f unittestUtilities.js \
+	-f ../kukit/utils.js \
+	-f ../kukit/requestmanager.js \
 	-f ../kukit/kukit.js \
 	-f ../kukit/tokenizer.js \
 	-f ../kukit/resourcedata.js \
@@ -12,6 +14,7 @@
 	-f ../kukit/selectorreg.js \
 	-f ../kukit/forms.js \
 	-f ../kukit/plugin.js \
+	-f test_utils.js \
 	-f test_tokenizer.js \
 	-f test_kssparser.js \
 	runtests.js

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	Wed Aug  2 11:31:51 2006
@@ -8,26 +8,6 @@
     this.setUp = function() {
     };
     
-    this.printDebug = function(parser, prefix) {
-        if (typeof(prefix) == "undefined") {
-            prefix = '';
-            print('########################');
-        }
-        for (var i=0; i<parser.result.length; i++) {
-            var txt = '';
-            if (parser.result[i].txt) {
-                txt = ' "' + parser.result[i].txt + '"';
-            }
-            print (prefix + '#' + i + ': [' + parser.result[i].symbol + ']' + txt);
-            if (parser.result[i].result) {
-                this.printDebug(parser.result[i],  prefix + '#' + i);
-            }
-        }
-        if (!prefix) {
-            print('');
-        }
-    };
-
     this.assertKssParmValueEquals = function(a, b, reason) {
         if (typeof(reason) == 'undefined') {
             reason = '';

Modified: kukit/kukit.js/trunk/tests/test_tokenizer.js
==============================================================================
--- kukit/kukit.js/trunk/tests/test_tokenizer.js	(original)
+++ kukit/kukit.js/trunk/tests/test_tokenizer.js	Wed Aug  2 11:31:51 2006
@@ -4,34 +4,6 @@
 
 kukit.TokenizerTestCaseBase = function() {
    
-    this.assertDictEquals = function(a, b, reason) {
-        if (typeof(reason) == 'undefined') {
-            reason = '';
-        } else {
-            reason += ', ';
-        }
-        for (var key in a) {
-            this.assertNotEquals(typeof(b[key]), 'undefined', reason + 'key ' + key + ' missing from dict 2');
-            this.assertEquals(a[key], b[key], reason + 'mismatch at key ' + key);
-        }
-        for (var key in b) {
-            this.assertNotEquals(typeof(a[key]), 'undefined', reason + 'key ' + key + ' missing from dict 1');
-            this.assertEquals(a[key], b[key], reason + 'mismatch at key ' + key);
-        }
-    };
-
-    this.assertListEquals = function(a, b, reason) {
-        if (typeof(reason) == 'undefined') {
-            reason = '';
-        } else {
-            reason += ', ';
-        }
-        this.assertEquals(a.length, b.length, reason + 'lists of different length');
-        for (var i=0; i<a.length; i++) {
-            this.assertEquals(a[i], b[i], reason + 'list values differ in position ' + i);
-        }
-    };
-    
     this.printDebug = function(parser, prefix) {
         if (typeof(prefix) == "undefined") {
             prefix = '';
@@ -73,7 +45,7 @@
     };
 };
 
-kukit.TokenizerTestCaseBase.prototype = new TestCase;
+kukit.TokenizerTestCaseBase.prototype = new kukit.UtilsTestCaseBase;
 
 kukit.TokenizerTestCase = function() {
     this.name = 'kukit.TokenizerTestCase';

Added: kukit/kukit.js/trunk/tests/test_utils.js
==============================================================================
--- (empty file)
+++ kukit/kukit.js/trunk/tests/test_utils.js	Wed Aug  2 11:31:51 2006
@@ -0,0 +1,122 @@
+if (typeof(kukit) == "undefined") {
+    var kukit = {};
+}
+
+kukit.UtilsTestCaseBase = function() {
+   
+    this.assertDictEquals = function(a, b, reason) {
+        if (typeof(reason) == 'undefined') {
+            reason = '';
+        } else {
+            reason += ', ';
+        }
+        for (var key in a) {
+            this.assertNotEquals(typeof(b[key]), 'undefined', reason + 'key ' + key + ' missing from dict 2');
+            this.assertEquals(a[key], b[key], reason + 'mismatch at key ' + key);
+        }
+        for (var key in b) {
+            this.assertNotEquals(typeof(a[key]), 'undefined', reason + 'key ' + key + ' missing from dict 1');
+            this.assertEquals(a[key], b[key], reason + 'mismatch at key ' + key);
+        }
+    };
+
+    this.assertListEquals = function(a, b, reason) {
+        if (typeof(reason) == 'undefined') {
+            reason = '';
+        } else {
+            reason += ', ';
+        }
+        this.assertEquals(a.length, b.length, reason + 'lists of different length');
+        for (var i=0; i<a.length; i++) {
+            this.assertEquals(a[i], b[i], reason + 'list values differ in position ' + i);
+        }
+    };
+    
+};
+
+kukit.UtilsTestCaseBase.prototype = new TestCase;
+
+kukit.UtilsTestCase = function() {
+    this.name = 'kukit.UtilsTestCase';
+
+    this.setUp = function() {
+    };
+
+    this.testFifoQueue = function() {
+        // Test the fifo queue
+        var q;
+
+        q = new kukit.ut.FifoQueue();
+        this.assertEquals(q.empty(), true);
+        this.assertEquals(q.size(), 0);
+        q.push(1);
+        q.push(3);
+        q.push(2);
+        q.push(4);
+        this.assertEquals(q.empty(), false);
+        this.assertEquals(q.size(), 4);
+        this.assertEquals(q.front(), 1);
+        this.assertListEquals(q.elements, [1, 3, 2, 4]);
+        this.assertEquals(q.pop(), 1);
+        this.assertEquals(q.pop(), 3);
+        this.assertEquals(q.pop(), 2);
+        this.assertEquals(q.pop(), 4);
+        this.assertEquals(q.empty(), true);
+        this.assertEquals(q.size(), 0);
+    };
+
+    this.testSortedQueue = function() {
+        // Test the sorted queue
+        var q;
+
+        q = new kukit.ut.SortedQueue();
+        this.assertEquals(q.empty(), true);
+        this.assertEquals(q.size(), 0);
+        q.push(1);
+        q.push(3);
+        q.push(2);
+        q.push(4);
+        this.assertEquals(q.empty(), false);
+        this.assertEquals(q.size(), 4);
+        this.assertEquals(q.front(), 1);
+        this.assertListEquals(q.elements, [1, 2, 3, 4]);
+        this.assertEquals(q.pop(), 1);
+        this.assertEquals(q.pop(), 2);
+        this.assertEquals(q.pop(), 3);
+        this.assertEquals(q.pop(), 4);
+        this.assertEquals(q.empty(), true);
+        this.assertEquals(q.size(), 0);
+
+        // reverse order
+        var comparefunc = function(a, b) {
+            if (a < b) return +1;
+            else if (a > b) return -1;
+            else return 0;
+        };
+        q = new kukit.ut.SortedQueue(comparefunc);
+        this.assertEquals(q.empty(), true);
+        this.assertEquals(q.size(), 0);
+        q.push(1);
+        q.push(3);
+        q.push(2);
+        q.push(4);
+        this.assertEquals(q.empty(), false);
+        this.assertEquals(q.size(), 4);
+        this.assertEquals(q.front(), 4);
+        this.assertListEquals(q.elements, [4, 3, 2, 1]);
+        this.assertEquals(q.pop(), 4);
+        this.assertEquals(q.pop(), 3);
+        this.assertEquals(q.pop(), 2);
+        this.assertEquals(q.pop(), 1);
+        this.assertEquals(q.empty(), true);
+        this.assertEquals(q.size(), 0);
+
+    };
+
+};
+    
+kukit.UtilsTestCase.prototype = new kukit.UtilsTestCaseBase;
+
+if (typeof(testcase_registry) != 'undefined') {
+    testcase_registry.registerTestCase(kukit.UtilsTestCase, 'kukit.UtilsTestCase');
+}

From reebalazs at codespeak.net  Wed Aug  2 11:32:11 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Wed,  2 Aug 2006 11:32:11 +0200 (CEST)
Subject: [Kukit-checkins] r30879 - kukit/azax/trunk
Message-ID: <20060802093211.A602910084@code0.codespeak.net>

Author: reebalazs
Date: Wed Aug  2 11:32:10 2006
New Revision: 30879

Modified:
   kukit/azax/trunk/configure.zcml
Log:
Refactoring request manager

Modified: kukit/azax/trunk/configure.zcml
==============================================================================
--- kukit/azax/trunk/configure.zcml	(original)
+++ kukit/azax/trunk/configure.zcml	Wed Aug  2 11:32:10 2006
@@ -11,7 +11,9 @@
   />
 
   <browser:concatresource
-    files="kukit/kukit/kukit.js
+    files="kukit/kukit/utils.js
+		kukit/kukit/requestmanager.js
+		kukit/kukit/kukit.js
         kukit/kukit/tokenizer.js
         kukit/kukit/resourcedata.js
         kukit/kukit/kssparser.js

From reebalazs at codespeak.net  Wed Aug  2 11:33:43 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Wed,  2 Aug 2006 11:33:43 +0200 (CEST)
Subject: [Kukit-checkins] r30880 - kukit/azax/trunk
Message-ID: <20060802093343.031AF10083@code0.codespeak.net>

Author: reebalazs
Date: Wed Aug  2 11:33:42 2006
New Revision: 30880

Modified:
   kukit/azax/trunk/configure.zcml
Log:
Fix

Modified: kukit/azax/trunk/configure.zcml
==============================================================================
--- kukit/azax/trunk/configure.zcml	(original)
+++ kukit/azax/trunk/configure.zcml	Wed Aug  2 11:33:42 2006
@@ -12,8 +12,8 @@
 
   <browser:concatresource
     files="kukit/kukit/utils.js
-		kukit/kukit/requestmanager.js
-		kukit/kukit/kukit.js
+        kukit/kukit/requestmanager.js
+        kukit/kukit/kukit.js
         kukit/kukit/tokenizer.js
         kukit/kukit/resourcedata.js
         kukit/kukit/kssparser.js
@@ -25,7 +25,7 @@
         kukit/kukit/forms.js
         kukit/kukit/plugin.js"
     name="kukit.js"
-	compress_level="none"
+    compress_level="none"
   />
 
   <browser:resource

From reebalazs at codespeak.net  Wed Aug  2 11:57:09 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Wed,  2 Aug 2006 11:57:09 +0200 (CEST)
Subject: [Kukit-checkins] r30883 - in kukit/azax/trunk: .
	plugins/json/browser
Message-ID: <20060802095709.C47C610087@code0.codespeak.net>

Author: reebalazs
Date: Wed Aug  2 11:57:05 2006
New Revision: 30883

Modified:
   kukit/azax/trunk/configure.zcml
   kukit/azax/trunk/plugins/json/browser/jsonkukit.js
Log:
Add copyright, set js compression

Modified: kukit/azax/trunk/configure.zcml
==============================================================================
--- kukit/azax/trunk/configure.zcml	(original)
+++ kukit/azax/trunk/configure.zcml	Wed Aug  2 11:57:05 2006
@@ -25,8 +25,11 @@
         kukit/kukit/forms.js
         kukit/kukit/plugin.js"
     name="kukit.js"
-    compress_level="none"
+    compress_level="safe"
   />
+  <!-- Replace with 
+    compress_level="none"
+	   for easier debugging. -->
 
   <browser:resource
     file="kukit/3rd_party/cssQuery.js"

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	Wed Aug  2 11:57:05 2006
@@ -1,5 +1,25 @@
 
 /*
+* Copyright (c) 2005-2006
+* Authors:
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
+
+/*
 * Supplemental script for json
 *
 * This gets included when json plugins are registered.

From reebalazs at codespeak.net  Wed Aug  2 11:57:21 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Wed,  2 Aug 2006 11:57:21 +0200 (CEST)
Subject: [Kukit-checkins] r30884 - in kukit/kukit.js/trunk: kukit tests
Message-ID: <20060802095721.CE7BA10087@code0.codespeak.net>

Author: reebalazs
Date: Wed Aug  2 11:57:16 2006
New Revision: 30884

Modified:
   kukit/kukit.js/trunk/kukit/actionreg.js
   kukit/kukit.js/trunk/kukit/commandreg.js
   kukit/kukit.js/trunk/kukit/dom.js
   kukit/kukit.js/trunk/kukit/eventreg.js
   kukit/kukit.js/trunk/kukit/forms.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/requestmanager.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
   kukit/kukit.js/trunk/kukit/selectorreg.js
   kukit/kukit.js/trunk/kukit/tokenizer.js
   kukit/kukit.js/trunk/kukit/utils.js
   kukit/kukit.js/trunk/tests/test_kssparser.js
   kukit/kukit.js/trunk/tests/test_tokenizer.js
   kukit/kukit.js/trunk/tests/test_utils.js
Log:
Add copyright, set js compression

Modified: kukit/kukit.js/trunk/kukit/actionreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/actionreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/actionreg.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Godefroid Chapelle <gotcha at bubblenet.be>
+*   Florian Schulze <florian.schulze at gmx.net>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
 
 /* Event registration */
 

Modified: kukit/kukit.js/trunk/kukit/commandreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/commandreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/commandreg.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Godefroid Chapelle <gotcha at bubblenet.be>
+*   Florian Schulze <florian.schulze at gmx.net>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
 
 /* Command registration */
 

Modified: kukit/kukit.js/trunk/kukit/dom.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/dom.js	(original)
+++ kukit/kukit.js/trunk/kukit/dom.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Godefroid Chapelle <gotcha at bubblenet.be>
+*   Florian Schulze <florian.schulze at gmx.net>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
 
 /* Generic dom helpers */
 

Modified: kukit/kukit.js/trunk/kukit/eventreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/eventreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/eventreg.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Godefroid Chapelle <gotcha at bubblenet.be>
+*   Florian Schulze <florian.schulze at gmx.net>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
 
 /* Event registration */
 

Modified: kukit/kukit.js/trunk/kukit/forms.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/forms.js	(original)
+++ kukit/kukit.js/trunk/kukit/forms.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Godefroid Chapelle <gotcha at bubblenet.be>
+*   Florian Schulze <florian.schulze at gmx.net>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
 
 /* Form handling utilities */
 

Modified: kukit/kukit.js/trunk/kukit/kssparser.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kssparser.js	(original)
+++ kukit/kukit.js/trunk/kukit/kssparser.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,23 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Martin Heidegger <mastakaneda at gmail.com>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
 
 /* Tokens of the kss parser */
 

Modified: kukit/kukit.js/trunk/kukit/kukit.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kukit.js	(original)
+++ kukit/kukit.js/trunk/kukit/kukit.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Godefroid Chapelle <gotcha at bubblenet.be>
+*   Florian Schulze <florian.schulze at gmx.net>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
 
 /* State vars srorage. This can be used from kss via a method. */
 

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Godefroid Chapelle <gotcha at bubblenet.be>
+*   Florian Schulze <florian.schulze at gmx.net>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
 
 /* Core plugins and utilities */
 

Modified: kukit/kukit.js/trunk/kukit/requestmanager.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/requestmanager.js	(original)
+++ kukit/kukit.js/trunk/kukit/requestmanager.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Godefroid Chapelle <gotcha at bubblenet.be>
+*   Florian Schulze <florian.schulze at gmx.net>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
 
 /* Request manager */
 

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Godefroid Chapelle <gotcha at bubblenet.be>
+*   Florian Schulze <florian.schulze at gmx.net>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
 
 /* Supplemental data that the parser builds up */
 

Modified: kukit/kukit.js/trunk/kukit/selectorreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/selectorreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/selectorreg.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Godefroid Chapelle <gotcha at bubblenet.be>
+*   Florian Schulze <florian.schulze at gmx.net>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
 
 /* Selector registration */
 

Modified: kukit/kukit.js/trunk/kukit/tokenizer.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/tokenizer.js	(original)
+++ kukit/kukit.js/trunk/kukit/tokenizer.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,23 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Martin Heidegger <mastakaneda at gmail.com>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
 
 /* Simple but effective tokenizing parser engine */
 

Modified: kukit/kukit.js/trunk/kukit/utils.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/utils.js	(original)
+++ kukit/kukit.js/trunk/kukit/utils.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,25 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Godefroid Chapelle <gotcha at bubblenet.be>
+*   Florian Schulze <florian.schulze at gmx.net>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
+
 /* Create kukit namespace */
 
 if (typeof(kukit) == 'undefined') {

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	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Martin Heidegger <mastakaneda at gmail.com>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
+
 if (typeof(kukit) == "undefined") {
     var kukit = {};
 }

Modified: kukit/kukit.js/trunk/tests/test_tokenizer.js
==============================================================================
--- kukit/kukit.js/trunk/tests/test_tokenizer.js	(original)
+++ kukit/kukit.js/trunk/tests/test_tokenizer.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Martin Heidegger <mastakaneda at gmail.com>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
+
 if (typeof(kukit) == "undefined") {
     var kukit = {};
 }

Modified: kukit/kukit.js/trunk/tests/test_utils.js
==============================================================================
--- kukit/kukit.js/trunk/tests/test_utils.js	(original)
+++ kukit/kukit.js/trunk/tests/test_utils.js	Wed Aug  2 11:57:16 2006
@@ -1,3 +1,23 @@
+/*
+* Copyright (c) 2005-2006
+* Authors:
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
+
 if (typeof(kukit) == "undefined") {
     var kukit = {};
 }

From reebalazs at codespeak.net  Sat Aug  5 19:47:07 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sat,  5 Aug 2006 19:47:07 +0200 (CEST)
Subject: [Kukit-checkins] r31030 - in kukit/kukit.js/trunk: kukit tests
Message-ID: <20060805174707.4237710079@code0.codespeak.net>

Author: reebalazs
Date: Sat Aug  5 19:47:04 2006
New Revision: 31030

Modified:
   kukit/kukit.js/trunk/kukit/actionreg.js
   kukit/kukit.js/trunk/kukit/commandreg.js
   kukit/kukit.js/trunk/kukit/plugin.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
   kukit/kukit.js/trunk/tests/test_kssparser.js
Log:
Action-command unifying, command name changes, kss parameter producers to camelCase

Modified: kukit/kukit.js/trunk/kukit/actionreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/actionreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/actionreg.js	Sat Aug  5 19:47:04 2006
@@ -32,11 +32,11 @@
 
 /* Action registry */
 
-kukit.ar.EventActionRegistry = function () {
+kukit.ar.ActionRegistry = function () {
     this.content = {};
 };
 
-kukit.ar.EventActionRegistry.prototype.register = function(name, func) {
+kukit.ar.ActionRegistry.prototype.register = function(name, func) {
     if (typeof(func) == 'undefined') {
         throw 'Func is mandatory.';
     }
@@ -48,12 +48,12 @@
     this.content[name] = func;
 };
 
-kukit.ar.EventActionRegistry.prototype.exists = function(name) {
+kukit.ar.ActionRegistry.prototype.exists = function(name) {
     var entry = this.content[name];
     return (typeof(entry) != 'undefined');
 };
 
-kukit.ar.EventActionRegistry.prototype.get = function(name) {
+kukit.ar.ActionRegistry.prototype.get = function(name) {
     var func = this.content[name];
     if (! func) {
         // not found
@@ -63,4 +63,4 @@
     return func;
 };
 
-kukit.ar.eventActionRegistry = new kukit.ar.EventActionRegistry();
+kukit.ar.actionRegistry = new kukit.ar.ActionRegistry();

Modified: kukit/kukit.js/trunk/kukit/commandreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/commandreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/commandreg.js	Sat Aug  5 19:47:04 2006
@@ -28,6 +28,28 @@
     this.content = {};
 };
 
+// This is the proposed way of registration, as we like all commands to be
+// client actions first.
+//
+// Examples:
+//
+// kukit.ar.actionRegistry.register('log', f1);
+// kukit.cr.commandRegistry.registerFromAction('log', kukit.cr.makeGlobalCommand);
+//
+// kukit.ar.actionRegistry.register('replaceInnerHTML', f2);
+// kukit.cr.commandRegistry.registerFromAction('replaceInnerHTML', kukit.cr.makeSelectorCommand);
+//
+kukit.cr.CommandRegistry.prototype.registerFromAction = function(srcname, factory, name) {
+    if (typeof(name) == 'undefined') {
+        // allows to set a different name as the action name, usable for backward
+        // compatibility setups
+        name = srcname;
+    }
+    // register a given action as a command, using the given vactor
+    var f = kukit.ar.actionRegistry.get(srcname);
+    factory(name, f);
+}
+
 kukit.cr.CommandRegistry.prototype.register = function(name, klass) {
     if (this.content[name]) {
         // Do not allow redefinition

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Sat Aug  5 19:47:04 2006
@@ -266,37 +266,13 @@
 
 /* Core actions
 *
-* The core local actions that can be executed on the client
+* The core client actions that can be executed on the client
 * side.
+*
+* They also get registered as commands
 */
 
-kukit.ar.eventActionRegistry.register("cascade", function (node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, ['name'], {'id': null, 'namespace': null}, 'cascade action');
-    var eventinstance;
-    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 {
-        // singleton by class
-        eventinstance = kukit.er.eventInstanceRegistry.getSingletonEventByName(parms.namespace, parms.name);
-    }
-    // marshall it, the rest of the parms will be passed
-    actionparms = {};
-    for (var key in parms) {
-        if (key != 'name' && key != 'id' && key != 'namespace') {
-            actionparms[key] = parms[key];
-        }
-    }
-    eventinstance.__trigger_event__(parms.name, actionparms, node);
-    }
-);
-
-
-kukit.ar.eventActionRegistry.register("logDebug", function (node, parms, eventrule) {
+kukit.ar.actionRegistry.register("logDebug", function (node, parms, eventrule) {
     parms = kukit.pl.completeParms(parms, [], {'message': 'Logging from Event'}, 'logDebug action');
     var nodeName = '<DOCUMENT>';
     if (node != null) {
@@ -305,8 +281,9 @@
     kukit.logDebug(parms.message + ', rule=#' + eventrule.getNr() + ', node=' + nodeName); 
     }
 );
+kukit.cr.commandRegistry.registerFromAction('logDebug', kukit.cr.makeGlobalCommand);
 
-kukit.ar.eventActionRegistry.register("log", function (node, parms, eventrule) {
+kukit.ar.actionRegistry.register("log", function (node, parms, eventrule) {
     parms = kukit.pl.completeParms(parms, [], {'message': 'Logging from Event'}, 'log action');
     var nodeName = '<DOCUMENT>';
     if (node != null) {
@@ -315,8 +292,9 @@
     kukit.log(parms.message + ', rule=#' + eventrule.getNr() + ', node=' + nodeName); 
     }
 );
+kukit.cr.commandRegistry.registerFromAction('log', kukit.cr.makeGlobalCommand);
 
-kukit.ar.eventActionRegistry.register("alert", function (node, parms, eventrule) {
+kukit.ar.actionRegistry.register("alert", function (node, parms, eventrule) {
     parms = kukit.pl.completeParms(parms, [], {'message': 'Logging from Event'}, 'alert action');
     var nodeName = '<DOCUMENT>';
     if (node != null) {
@@ -325,13 +303,16 @@
     alert(parms.message + ', rule=#' + eventrule.getNr() + ', node=' + nodeName); 
     }
 );
+kukit.cr.commandRegistry.registerFromAction('alert', kukit.cr.makeGlobalCommand);
 
-/* Core commands */
+/* Core commands 
+*
+* All the commands are also client actions.
+*/
 
-// innerHTML
 // accepts both string and dom.
-kukit.cr.makeSelectorCommand('setHtmlAsChild', function(node) {
-    parms = kukit.pl.completeParms(this.params, ['html'], {}, 'setHtmlAsChild command');
+kukit.ar.actionRegistry.register('replaceInnerHTML', function(node, parms, eventrule) {
+    parms = kukit.pl.completeParms(parms, ['html'], {}, 'replaceInnerHTML action');
     if (typeof(parms.html) == 'string') {
         node.innerHTML = parms.html;
     } else {
@@ -341,11 +322,11 @@
     }
     kukit.setupEvents(node);
 });
+kukit.cr.commandRegistry.registerFromAction('replaceInnerHTML', kukit.cr.makeSelectorCommand);
 
-// outerHTML ?
-// This seems to be untested.
-kukit.cr.makeSelectorCommand('replaceNode', function(node) {
-    parms = kukit.pl.completeParms(this.params, ['html'], {'selector': null}, 'replaceNode command');
+// XXX This seems to be untested.
+kukit.ar.actionRegistry.register('replaceHTML', function(node, parms, eventrule) {
+    parms = kukit.pl.completeParms(parms, ['html'], {'selector': null}, 'replaceHTML action');
     parms.html = kukit.dom.forceToDom(parms.html);
     var childNodes = parms.html.childNodes;
     var parentNode = node.parentNode;
@@ -366,14 +347,16 @@
     }
     kukit.setupEvents(parentNode);
 });
+kukit.cr.commandRegistry.registerFromAction('replaceHTML', kukit.cr.makeSelectorCommand);
 
-kukit.cr.makeSelectorCommand('setAttribute', function(node) {
-    parms = kukit.pl.completeParms(this.params, ['name', 'value'], {}, 'setAttribute command');
+kukit.ar.actionRegistry.register('setAttribute', function(node, parms, eventrule) {
+    parms = kukit.pl.completeParms(parms, ['name', 'value'], {}, 'setAttribute action');
     node.setAttribute(parms.name, parms.value);
 });
+kukit.cr.commandRegistry.registerFromAction('setAttribute', kukit.cr.makeSelectorCommand);
 
-kukit.cr.makeSelectorCommand('addAfter', function(node) {
-    parms = kukit.pl.completeParms(this.params, ['html'], {}, 'addAfter command');
+kukit.ar.actionRegistry.register('insertHTMLAfter', function(node, parms, eventrule) {
+    parms = kukit.pl.completeParms(parms, ['html'], {}, 'insertHTMLAfter action');
     parms.html = kukit.dom.forceToDom(parms.html);
     var content = document.importNode(parms.html, true);
     var parentNode = node.parentNode;
@@ -387,38 +370,42 @@
     kukit.logDebug("Inserted nodes length: "+inserted.length);
     kukit.setupEvents(node);
 });
+kukit.cr.commandRegistry.registerFromAction('insertHTMLAfter', kukit.cr.makeSelectorCommand);
 
-kukit.cr.makeSelectorCommand('removeNextSibling', function(node) {
-    parms = kukit.pl.completeParms(this.params, [], {}, 'removeNextSibling command');
+kukit.ar.actionRegistry.register('deleteNodeAfter', function(node, parms, eventrule) {
+    parms = kukit.pl.completeParms(parms, [], {}, 'deleteNodeAfter action');
     var parentNode = node.parentNode;
     var toNode = kukit.dom.getNextSiblingTag(node);
     if (toNode != null) {
         parentNode.removeChild(toNode);
     }  
 });
+kukit.cr.commandRegistry.registerFromAction('deleteNodeAfter', kukit.cr.makeSelectorCommand);
 
-kukit.cr.makeSelectorCommand('removePreviousSibling', function(node) {
-    parms = kukit.pl.completeParms(this.params, [], {}, 'removePreviousSibling command');
+kukit.ar.actionRegistry.register('deleteNodeBefore', function(node, parms, eventrule) {
+    parms = kukit.pl.completeParms(parms, [], {}, 'deleteNodeBefore action');
     var parentNode = node.parentNode;
     var toNode = kukit.dom.getPreviousSiblingTag(node);
     parentNode.removeChild(toNode);
 });
+kukit.cr.commandRegistry.registerFromAction('deleteNodeBefore', kukit.cr.makeSelectorCommand);
 
-kukit.cr.makeSelectorCommand('removeNode', function(node) {
-    parms = kukit.pl.completeParms(this.params, [], {}, 'removeNode command');
+kukit.ar.actionRegistry.register('deleteNode', function(node, parms, eventrule) {
+    parms = kukit.pl.completeParms(parms, [], {}, 'deleteNode action');
     var parentNode = node.parentNode;
     parentNode.removeChild(node);
 });
+kukit.cr.commandRegistry.registerFromAction('deleteNode', kukit.cr.makeSelectorCommand);
 
-kukit.cr.makeSelectorCommand('clearChildren', function(node) {
+kukit.ar.actionRegistry.register('clearChildNodes', function(node, parms, eventrule) {
     // TODO get rid of none
-    //parms = kukit.pl.completeParms(this.params, [], {}, 'clearChildren command');
-    parms = kukit.pl.completeParms(this.params, [], {'none': false}, 'clearChildren command');
+    parms = kukit.pl.completeParms(parms, [], {'none': false}, 'clearChildNodes action');
     kukit.dom.clearChildNodes(node);
 });
+kukit.cr.commandRegistry.registerFromAction('clearChildNodes', kukit.cr.makeSelectorCommand);
 
-kukit.cr.makeSelectorCommand('moveNodeAfter', function(node) {
-    parms = kukit.pl.completeParms(this.params, ['html_id'], {}, 'moveNodeAfter command');
+kukit.ar.actionRegistry.register('moveNodeAfter', function(node, parms, eventrule) {
+    parms = kukit.pl.completeParms(parms, ['html_id'], {}, 'moveNodeAfter action');
     var parentNode = node.parentNode;
     parentNode.removeChild(node);
       
@@ -431,33 +418,37 @@
         parentNode.insertBefore(node, nextNode);
     }
 });
+kukit.cr.commandRegistry.registerFromAction('moveNodeAfter', kukit.cr.makeSelectorCommand);
 
-kukit.cr.makeSelectorCommand('copyChildrenFrom', function(node) {
-    parms = kukit.pl.completeParms(this.params, ['html_id'], {}, 'copyChildrenFrom command');
+kukit.ar.actionRegistry.register('copyChildNodesFrom', function(node, parms, eventrule) {
+    parms = kukit.pl.completeParms(parms, ['html_id'], {}, 'copyChildNodesFrom action');
     var fromNode = document.getElementById(parms.html_id);
     Sarissa.copyChildNodes(fromNode, node);
 });
+kukit.cr.commandRegistry.registerFromAction('copyChildNodesFrom', kukit.cr.makeSelectorCommand);
 
-kukit.cr.makeSelectorCommand('copyChildrenTo', function(node) {
-    parms = kukit.pl.completeParms(this.params, ['html_id'], {}, 'copyChildrenTo command');
+kukit.ar.actionRegistry.register('copyChildNodesTo', function(node, parms, eventrule) {
+    parms = kukit.pl.completeParms(parms, ['html_id'], {}, 'copyChildNodesTo action');
     toNode = document.getElementById(parms.html_id);
     Sarissa.copyChildNodes(node, toNode);
 });
+kukit.cr.commandRegistry.registerFromAction('copyChildNodesTo', kukit.cr.makeSelectorCommand);
 
-kukit.cr.makeGlobalCommand('setStatevar', function(node) {
-    parms = kukit.pl.completeParms(this.params, ['varname', 'value'], {}, 'setStatevar command');
+kukit.ar.actionRegistry.register('setStateVar', function(node, parms, eventrule) {
+    parms = kukit.pl.completeParms(parms, ['varname', 'value'], {}, 'setStateVar action');
     kukit.statevars[parms.varname] = parms.value;
 });
+kukit.cr.commandRegistry.registerFromAction('setStateVar', kukit.cr.makeGlobalCommand);
 
-kukit.cr.makeGlobalCommand('triggerEvent', function (node, parms, eventrule, eventinstance) {
+kukit.ar.actionRegistry.register('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);
+    parms = kukit.pl.completeParms(parms, ['name'], {'id': null, 'namespace': null}, 'triggerEvent action', 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; 
+            throw 'Id and namespace are conflicting in triggerEvent action, rule=#' + eventrule.getNr() + ', node=' + node.nodeName; 
         }
     } else {
         if (eventinstance == null) {
@@ -474,4 +465,20 @@
     }
     eventinstance.__trigger_event__(parms.name, actionparms, node);
 });
+kukit.cr.commandRegistry.registerFromAction('triggerEvent', kukit.cr.makeSelectorCommand);
+
+// XXX Compatibility settings for old command names.
+// These will be removed as soon as all current use cases are changed.
+// XXX XXX XXX Do not use these as your code will break!
+//
+kukit.cr.commandRegistry.registerFromAction('replaceInnerHTML', kukit.cr.makeSelectorCommand, 'setHtmlAsChild');
+kukit.cr.commandRegistry.registerFromAction('replaceHTML', kukit.cr.makeSelectorCommand, 'replaceNode');
+kukit.cr.commandRegistry.registerFromAction('insertHTMLAfter', kukit.cr.makeSelectorCommand, 'addAfter');
+kukit.cr.commandRegistry.registerFromAction('deleteNodeAfter', kukit.cr.makeSelectorCommand, 'removeNextSibling');
+kukit.cr.commandRegistry.registerFromAction('deleteNodeBefore', kukit.cr.makeSelectorCommand, 'removePreviousSibling');
+kukit.cr.commandRegistry.registerFromAction('deleteNode', kukit.cr.makeSelectorCommand, 'removeNode');
+kukit.cr.commandRegistry.registerFromAction('clearChildNodes', kukit.cr.makeSelectorCommand, 'clearChildren');
+kukit.cr.commandRegistry.registerFromAction('copyChildNodesFrom', kukit.cr.makeSelectorCommand, 'copyChildrenFrom');
+kukit.cr.commandRegistry.registerFromAction('copyChildNodesTo', kukit.cr.makeSelectorCommand, 'copyChildrenTo');
+kukit.cr.commandRegistry.registerFromAction('setStateVar', kukit.cr.makeGlobalCommand, 'setStatevar');
 

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Sat Aug  5 19:47:04 2006
@@ -106,24 +106,25 @@
 kukit.rd.KssMethodValue.prototype.check = function() {
     // Check syntax
     switch (this.methodname) {
-        case 'formvar': {
+        case 'formVar': {
+            if (this.methodname == 'formvar')
             if (this.args.length != 2) {
-                throw 'formvar method needs 2 arguments (formname, varname)';
+                throw 'formVar method needs 2 arguments (formname, varname)';
             }
         } break;
-        case 'currentformvar': {
+        case 'currentFormVar': {
             if (this.args.length != 1) {
-                throw 'currentformvar method needs 1 argument (varname)';
+                throw 'currentFormVar method needs 1 argument (varname)';
             }
         } break;
-        case 'nodeattr': {
+        case 'nodeAttr': {
             if (this.args.length != 1) {
-                throw 'nodeattr method needs 1 argument (attrname)';
+                throw 'nodeAttr method needs 1 argument (attrname)';
             }
         } break;
-        case 'statevar': {
+        case 'stateVar': {
             if (this.args.length != 1) {
-                throw 'statevar method needs 1 argument (varname)';
+                throw 'stateVar method needs 1 argument (varname)';
             }
         } break;
         case 'pass': {
@@ -139,13 +140,13 @@
 kukit.rd.KssMethodValue.prototype.evaluate = function(parms, key, node, defaultparms) {
     // Evaluate into parms.
     switch (this.methodname) {
-        case 'formvar': {
+        case 'formVar': {
             parms[key] = kukit.fo.getFormVarFromNamedForm(this.args[0], this.args[1]);
         } break;
-        case 'currentformvar': {
+        case 'currentFormVar': {
             parms[key] = kukit.fo.getFormVarFromCurrentForm(node, this.args[0]);
         } break;
-        case 'nodeattr': {
+        case 'nodeAttr': {
             var argname =  this.args[0];
             // XXX this works but not for kukit:xxx args
             var value = node[argname];
@@ -157,7 +158,7 @@
             }
             parms[key] = value;
         } break;
-        case 'statevar': {
+        case 'stateVar': {
             var key2 = this.args[0];
             var value = kukit.statevars[key2];
             if (typeof(value) == 'undefined') {
@@ -434,7 +435,7 @@
 
 
 kukit.rd.executeClientAction = function(name, node, eventrule, parms, eventinstance) {
-    var func = kukit.ar.eventActionRegistry.get(name);
+    var func = kukit.ar.actionRegistry.get(name);
     func(node, parms, eventrule);
 };
 

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	Sat Aug  5 19:47:04 2006
@@ -175,43 +175,43 @@
         this.assertEquals(parser.value.txt, 'apples and oranges');
 
         // params ok
-        txt= "formvar(x, y) ";
+        txt= "formVar(x, y) ";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.propvalue(src, null, true);
         this.assertEquals(parser.finished, true);
         this.assertEquals(parser.value.isMethod, true);
-        this.assertEquals(parser.value.methodname, 'formvar');
+        this.assertEquals(parser.value.methodname, 'formVar');
         this.assertListEquals(parser.value.args, ['x', 'y']);
 
         // params ok
-        txt= "formvar(x, y)";
+        txt= "formVar(x, y)";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.propvalue(src, null, true);
         this.assertEquals(parser.finished, true);
         this.assertEquals(parser.value.isMethod, true);
-        this.assertEquals(parser.value.methodname, 'formvar');
+        this.assertEquals(parser.value.methodname, 'formVar');
         this.assertListEquals(parser.value.args, ['x', 'y']);
 
         //ok
-        txt= "   formvar   (x, y)";
+        txt= "   formVar   (x, y)";
         src = new kukit.tk.Cursor(txt);
         parser = new kukit.kssp.propvalue(src, null, true);
         this.assertEquals(parser.finished, true);
         this.assertEquals(parser.value.isMethod, true);
-        this.assertEquals(parser.value.methodname, 'formvar');
+        this.assertEquals(parser.value.methodname, 'formVar');
         this.assertListEquals(parser.value.args, ['x', 'y']);
 
-        txt= " a formvar(x, y)";
+        txt= " a formVar(x, y)";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.propvalue, src, null, true,
             'Method property value must have a one-word method name', 16);
 
-        txt= " 'formvar'(x, y)";
+        txt= " 'formVar'(x, y)";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.propvalue, src, null, true,
             'Excess characters after the property value', 16);
 
-        txt= "formvar(x, y) xxx";
+        txt= "formVar(x, y) xxx";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.propvalue, src, null, true,
             'Excess characters after the property value', 17);
@@ -611,14 +611,14 @@
             +"}\n"
             +"#calendar-previous a:click {\n"
             +"   action-server : kukitGetPreviousMonth /* place comment here*/;\n"
-            +"   kukitGetPreviousMonth-member: formvar(edit, 'f_member');\n"
+            +"   kukitGetPreviousMonth-member: formVar(edit, 'f_member');\n"
             +"}\n"
             +"#calendar-previous a:dnd-drag(shelve) {\n"
             +"   action-server : whatever\n"
             +"}\n"
             +"#button-one:annoyClicker-click(annoy-me) {\n"
             +"   action-server:     clickedButton;\n"
-            +"   clickedButton-id:  nodeattr(id);\n"
+            +"   clickedButton-id:  nodeAttr(id);\n"
             +"}\n"
             +"document:annoy(annoyMe) {\n"
             +"   action-client:    alert;\n"
@@ -705,7 +705,7 @@
         // rule 3
             // #calendar-previous a:click {
             //   kss-action : 'kukitresponse/kukitGetPreviousMonth' /* place comment here*/;
-            //   member: formvar(edit, 'f_member');
+            //   member: formVar(edit, 'f_member');
             // }
         rule = parser.eventRules[3];
         this.assertDictEquals(rule.parms, {});
@@ -719,7 +719,7 @@
         this.assertEquals(action.name, 'kukitGetPreviousMonth');
         this.assertEquals(action.error, null);
         this.assertKssParmEquals(action.parms, {
-                'member': new kukit.rd.KssMethodValue('formvar', ['edit', 'f_member'])
+                'member': new kukit.rd.KssMethodValue('formVar', ['edit', 'f_member'])
             });
          
         // rule 4
@@ -743,7 +743,7 @@
         // rule 5
             //#button-one:annoyClicker-click(annoyMe) {
             //   kss-action:     clickedButton;
-            //   id:             nodeattr(id);
+            //   id:             nodeAttr(id);
             //}
         rule = parser.eventRules[5];
         this.assertDictEquals(rule.parms, {});
@@ -757,7 +757,7 @@
         this.assertEquals(action.name, 'clickedButton');
         this.assertEquals(action.error, null);
         this.assertKssParmEquals(action.parms, {
-                'id': new kukit.rd.KssMethodValue('nodeattr', ['id'])
+                'id': new kukit.rd.KssMethodValue('nodeAttr', ['id'])
             });
 
         // rule 6

From reebalazs at codespeak.net  Sat Aug  5 19:48:28 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sat,  5 Aug 2006 19:48:28 +0200 (CEST)
Subject: [Kukit-checkins] r31031 - in kukit/azax/trunk: . plugins
Message-ID: <20060805174828.D740110079@code0.codespeak.net>

Author: reebalazs
Date: Sat Aug  5 19:48:24 2006
New Revision: 31031

Modified:
   kukit/azax/trunk/commands.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/plugins/plugin.py
Log:
Action-command unifying, command name changes, server side registration changes

Modified: kukit/azax/trunk/commands.py
==============================================================================
--- kukit/azax/trunk/commands.py	(original)
+++ kukit/azax/trunk/commands.py	Sat Aug  5 19:48:24 2006
@@ -82,7 +82,15 @@
     implements(IAzaxCommand)
     
     def __init__(self, name, selector=None):
-        plugins.Command.checkRegistered(name)
+        if plugins.Command.isRegistered(name):
+            # ok. XXX this will be deprecated
+            # All registerCommand commands are obsolete, by default
+            import warnings, textwrap
+            warnings.warn(textwrap.dedent('''\
+            The usage of the kss command "%s" is deprecated''' 
+                % (name, )), DeprecationWarning, 2)
+        else:
+            plugins.Action.checkRegisteredCommand(name)
         if isinstance(selector, basestring): 
             self.selector = selector
             self.selectorType = ''

Modified: kukit/azax/trunk/plugins/__init__.py
==============================================================================
--- kukit/azax/trunk/plugins/__init__.py	(original)
+++ kukit/azax/trunk/plugins/__init__.py	Sat Aug  5 19:48:24 2006
@@ -6,5 +6,5 @@
 from plugin import registerPlugin
 from command import Command
 from event_type import EventType
-from event_action import EventAction
+from action import Action
 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	Sat Aug  5 19:48:24 2006
@@ -2,16 +2,27 @@
 import os.path
 from command import Command
 from event_type import EventType
-from event_action import EventAction
+from action import Action
 from selector_type import SelectorType
 from plugin import registerPlugin
 
 #class AzaxConfigurationError(Exception):
 #    pass
 
+# XXX This will go away.
 def registerCommand(_context, name, jsfile=None):
     'Directive that registers a command' 
     
+    import warnings, textwrap
+    warnings.warn(textwrap.dedent('''\
+        
+          %s
+
+        The directive azax:registerCommand is deprecated and will be removed,
+        use azax:registerAction with command_factory="selector" or "global".'''
+        % _context.info),
+        DeprecationWarning)
+
     # check to see if the file exists
     if jsfile is not None:
         file(jsfile, 'rb').close()
@@ -35,17 +46,18 @@
         args = (EventType, name, jsfile),
         )
  
-def registerEventAction(_context, name, jsfile=None):
-    'Directive that registers an event action' 
+def registerAction(_context, name, jsfile=None, command_factory='none',
+        params_mandatory=[], params_optional=[], deprecated=None):
+    'Directive that registers an action.' 
     
     # check to see if the file exists
     if jsfile is not None:
         file(jsfile, 'rb').close()
 
     _context.action(
-        discriminator = ('registerAzaxEventAction', name, jsfile),
+        discriminator = ('registerAzaxAction', name, jsfile),
         callable = registerPlugin,
-        args = (EventAction, name, jsfile),
+        args = (Action, name, jsfile, command_factory, params_mandatory, params_optional, deprecated),
         )
 
 def registerSelectorType(_context, name, jsfile=None):

Modified: kukit/azax/trunk/plugins/configure.zcml
==============================================================================
--- kukit/azax/trunk/plugins/configure.zcml	(original)
+++ kukit/azax/trunk/plugins/configure.zcml	Sat Aug  5 19:48:24 2006
@@ -10,19 +10,17 @@
     
      <!-- example plugin registration
      
-     <azax:registerCommand
-          name="myCustomCommand"
-          jsfile="browser/my_plugins.js"
-          />
-          
       <azax:registerEventType
           name="myCustomEventType"
           jsfile="browser/my_plugins.js"
           />
   
-      <azax:registerEventAction
-          name="myCustomEventAction"
+      <azax:registerAction
+          name="myCustomAction"
           jsfile="browser/my_plugins.js"
+          command_factory="selector/global"
+          params_mandatory="param1 param2 ... paramN"
+          params_optional=""
           />
   
       <azax:registerSelectorType
@@ -35,54 +33,6 @@
      <!-- register core plugins 
           jsfile is omitted since these are defined in the core
      -->
-     
-     <azax:registerCommand
-          name="setHtmlAsChild"
-          />
-          
-     <azax:registerCommand
-          name="setAttribute"
-          />
-          
-     <azax:registerCommand
-          name="addAfter"
-          />
-          
-     <azax:registerCommand
-          name="removeNextSibling"
-          />
-          
-     <azax:registerCommand
-          name="removePreviousSibling"
-          />
-          
-     <azax:registerCommand
-          name="removeNode"
-          />
-          
-     <azax:registerCommand
-          name="clearChildren"
-          />
-          
-     <azax:registerCommand
-          name="moveNodeAfter"
-          />
-          
-     <azax:registerCommand
-          name="copyChildrenFrom"
-          />
-          
-     <azax:registerCommand
-          name="copyChildrenTo"
-          />
-
-     <azax:registerCommand
-          name="setStatevar"
-          />
-
-     <azax:registerCommand
-          name="triggerEvent"
-          />
           
      <!-- Event types -->
 
@@ -146,22 +96,179 @@
         name="load"
         />
         
-     <!-- Event actions -->
+     <!-- Client actions & commands -->
 	
-	<azax:registerEventAction
-        name="cascade"
-        />
-
-    <azax:registerEventAction
+    <azax:registerAction
         name="logDebug"
+        command_factory="global"
+        params_mandatory="message"
         />
 
-    <azax:registerEventAction
+    <azax:registerAction
         name="log"
+        command_factory="global"
+        params_mandatory="message"
         />
 
-    <azax:registerEventAction
+    <azax:registerAction
         name="alert"
+        command_factory="global"
+        params_mandatory="message"
+        />
+
+    <azax:registerAction
+        name="replaceInnerHTML"
+        command_factory="selector"
+        params_mandatory="html"
+        />
+
+    <azax:registerAction
+        name="replaceHTML"
+        command_factory="selector"
+        params_mandatory="html"
+        />
+
+    <azax:registerAction
+        name="appendHTML"
+        command_factory="selector"
+        params_mandatory="html"
+        />
+
+    <azax:registerAction
+        name="insertHTMLBefore"
+        command_factory="selector"
+        params_mandatory="html"
+        />
+
+    <azax:registerAction
+        name="insertHTMLAfter"
+        command_factory="selector"
+        params_mandatory="html"
+        />
+
+    <azax:registerAction
+        name="deleteNodeAfter"
+        command_factory="selector"
+        />
+
+    <azax:registerAction
+        name="deleteNodeBefore"
+        command_factory="selector"
+        />
+
+    <azax:registerAction
+        name="deleteNode"
+        command_factory="selector"
+        />
+
+    <azax:registerAction
+        name="clearChildNodes"
+        command_factory="selector"
+        />
+
+    <azax:registerAction
+        name="moveNodeAfter"
+        command_factory="selector"
+        params_mandatory="html_id"
+        />
+
+    <azax:registerAction
+        name="moveNodeBefore"
+        command_factory="selector"
+        params_mandatory="html_id"
+        />
+
+    <azax:registerAction
+        name="copyChildNodesFrom"
+        command_factory="selector"
+        params_mandatory="html_id"
+        />
+
+    <azax:registerAction
+        name="copyChildNodesTo"
+        command_factory="selector"
+        params_mandatory="html_id"
+        />
+
+    <azax:registerAction
+        name="setAttribute"
+        command_factory="selector"
+        params_mandatory="name value"
+        />
+
+    <azax:registerAction
+        name="setStateVar"
+        command_factory="global"
+        params_mandatory="varname value"
+        />
+
+    <azax:registerAction
+        name="triggerEvent"
+        command_factory="global"
+        params_mandatory="name"
+        params_optional="id namespace"
+        />
+
+    <!-- Old command names (XXX compatibility, to be deprecated) -->
+
+    <azax:registerAction
+        name="setHtmlAsChild"
+        command_factory="selector"
+        params_mandatory="html"
+        deprecated = "use setInnerHTML instead"
+        />
+          
+    <azax:registerAction
+        name="addAfter"
+        command_factory="selector"
+        params_mandatory="html"
+        deprecated = "use insertHTMLAfter instead"
+        />
+          
+    <azax:registerAction
+        name="removeNextSibling"
+        command_factory="selector"
+        deprecated = "use deleteNodeAfter instead"
+        />
+          
+    <azax:registerAction
+        name="removePreviousSibling"
+        command_factory="selector"
+        deprecated = "use deleteNodeBefore instead"
+        />
+          
+    <azax:registerAction
+        name="removeNode"
+        command_factory="selector"
+        deprecated = "use deleteNode instead"
+        />
+        />
+          
+    <azax:registerAction
+        name="clearChildren"
+        command_factory="selector"
+        deprecated = "use clearChildNodes instead"
+        />
+          
+    <azax:registerAction
+        name="copyChildrenFrom"
+        command_factory="selector"
+        params_mandatory="html_id"
+        deprecated = "use copyChildNodesFrom instead"
+        />
+          
+     <azax:registerAction
+        name="copyChildrenTo"
+        command_factory="selector"
+        params_mandatory="html_id"
+        deprecated = "use copyChildNodesTo instead"
+        />
+
+     <azax:registerAction
+        name="setStatevar"
+        command_factory="global"
+        params_mandatory="varname value"
+        deprecated = "use setInnerHTML instead"
         />
 
      <!-- Selector types -->

Modified: kukit/azax/trunk/plugins/directives.py
==============================================================================
--- kukit/azax/trunk/plugins/directives.py	(original)
+++ kukit/azax/trunk/plugins/directives.py	Sat Aug  5 19:48:24 2006
@@ -1,7 +1,8 @@
 from zope.interface import Interface
-from zope.schema import TextLine
-from zope.configuration.fields import Path
+from zope.schema import TextLine, Choice
+from zope.configuration.fields import Path, Tokens, PythonIdentifier
 
+# XXX this will go away
 class IRegisterCommandDirective(Interface):
     'Register an AZAX command plugin'
     
@@ -32,12 +33,12 @@
          required=False,
          )
     
-class IRegisterEventActionDirective(Interface):
-    'Register an AZAX event action'
+class IRegisterActionDirective(Interface):
+    'Register an AZAX action'
     
     name = TextLine(
          title=u"Name",
-         description=u"The name of the event action plugin.",
+         description=u"The name of the action plugin.",
          required=True,
          )
     
@@ -47,6 +48,33 @@
          required=False,
          )
 
+    command_factory = Choice(
+        title=u"Command factory type",
+        description=u"Command factory type, by default 'none'.",
+        values=(u'none', u'global', u'selector'),
+        required=False,
+        )
+
+    params_mandatory = Tokens(
+        title=u"Mandatory parameters",
+        description=u"Space separated list of mandatory parameter names",
+        value_type=PythonIdentifier(),
+        required=False,
+        )
+
+    params_optional = Tokens(
+        title=u"Optional parameters",
+        description=u"Comma separated list of optional parameter names",
+        value_type=PythonIdentifier(),
+        required=False,
+        )
+
+    deprecated = TextLine(
+         title=u"Deprecated",
+         description=u"The hint that we should give as warning about deprecation",
+         required=False,
+         )
+ 
 class IRegisterSelectorTypeDirective(Interface):
     'Register an AZAX selector type'
     

Modified: kukit/azax/trunk/plugins/meta.zcml
==============================================================================
--- kukit/azax/trunk/plugins/meta.zcml	(original)
+++ kukit/azax/trunk/plugins/meta.zcml	Sat Aug  5 19:48:24 2006
@@ -6,6 +6,7 @@
 
    <directives namespace="http://namespaces.zope.org/azax">
    
+     <!-- XXX This will go away. -->
      <directive
        name="registerCommand"
        schema=".directives.IRegisterCommandDirective"
@@ -19,9 +20,9 @@
        />
    
      <directive
-       name="registerEventAction"
-       schema=".directives.IRegisterEventActionDirective"
-       handler=".configure.registerEventAction"
+       name="registerAction"
+       schema=".directives.IRegisterActionDirective"
+       handler=".configure.registerAction"
        />
 
     <directive

Modified: kukit/azax/trunk/plugins/plugin.py
==============================================================================
--- kukit/azax/trunk/plugins/plugin.py	(original)
+++ kukit/azax/trunk/plugins/plugin.py	Sat Aug  5 19:48:24 2006
@@ -24,8 +24,13 @@
         'Tells if name is a registered plugin for the pluginclass'
         return getRegistry().isRegistered(cls.plugintype, name)
     isRegistered = classmethod(isRegistered)
-    
+
+    def getRegistered(cls, name):
+        'Gets the regustered plugin and raise error if not registered'
+        return getRegistry().getRegistered(cls.plugintype, name)
+    getRegistered = classmethod(getRegistered)   
+
     def checkRegistered(cls, name):
         'Check if name is a registered plugin and raise error otherwise'
-        getRegistry().checkRegistered(cls.plugintype, name)
+        cls.getRegistered(name)
     checkRegistered = classmethod(checkRegistered)

From reebalazs at codespeak.net  Sat Aug  5 19:49:23 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sat,  5 Aug 2006 19:49:23 +0200 (CEST)
Subject: [Kukit-checkins] r31032 - kukit/azaxdemo/trunk/browser
Message-ID: <20060805174923.5D55110079@code0.codespeak.net>

Author: reebalazs
Date: Sat Aug  5 19:49:20 2006
New Revision: 31032

Modified:
   kukit/azaxdemo/trunk/browser/azax_instant_edit.kss
   kukit/azaxdemo/trunk/browser/azax_tree.kss
   kukit/azaxdemo/trunk/browser/azax_two_select.kss
   kukit/azaxdemo/trunk/browser/cancel_submit.kss
   kukit/azaxdemo/trunk/browser/more_selectors.kss
Log:
kss parameter producer names changed to camelCase

Modified: kukit/azaxdemo/trunk/browser/azax_instant_edit.kss
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_instant_edit.kss	(original)
+++ kukit/azaxdemo/trunk/browser/azax_instant_edit.kss	Sat Aug  5 19:49:20 2006
@@ -1,10 +1,10 @@
 div#text:click {
     action-server: getInputField;
-    getInputField-value:      currentformvar(value);
+    getInputField-value:      currentFormVar(value);
 }
 
 input#save:click {
     action-server: saveText;
-    saveText-value:      currentformvar(value);
+    saveText-value:      currentFormVar(value);
 }
 

Modified: kukit/azaxdemo/trunk/browser/azax_tree.kss
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_tree.kss	(original)
+++ kukit/azaxdemo/trunk/browser/azax_tree.kss	Sat Aug  5 19:49:20 2006
@@ -1,9 +1,9 @@
 .state-expanded:click {
     action-server: collapseSubTree;
-    collapseSubTree-value: nodeattr("id");
+    collapseSubTree-value: nodeAttr("id");
 }
 
 .state-collapsed:click {
     action-server: expandSubTree;
-    expandSubTree-value: nodeattr("id");
+    expandSubTree-value: nodeAttr("id");
 }

Modified: kukit/azaxdemo/trunk/browser/azax_two_select.kss
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_two_select.kss	(original)
+++ kukit/azaxdemo/trunk/browser/azax_two_select.kss	Sat Aug  5 19:49:20 2006
@@ -1,4 +1,4 @@
 select#first:change {
     action-server: getCorrespondingSelect;
-    getCorrespondingSelect-value:      currentformvar(value);
+    getCorrespondingSelect-value:      currentFormVar(value);
 }

Modified: kukit/azaxdemo/trunk/browser/cancel_submit.kss
==============================================================================
--- kukit/azaxdemo/trunk/browser/cancel_submit.kss	(original)
+++ kukit/azaxdemo/trunk/browser/cancel_submit.kss	Sat Aug  5 19:49:20 2006
@@ -1,5 +1,5 @@
 input#submit:click {
     evt-click-preventdefault: true;
     action-server: save;
-    save-text_save: currentformvar(text_save);
+    save-text_save: currentFormVar(text_save);
 }

Modified: kukit/azaxdemo/trunk/browser/more_selectors.kss
==============================================================================
--- kukit/azaxdemo/trunk/browser/more_selectors.kss	(original)
+++ kukit/azaxdemo/trunk/browser/more_selectors.kss	Sat Aug  5 19:49:20 2006
@@ -4,7 +4,7 @@
 
 behaviour:annoyclicker-doit(annoyMe) {
     action-server:     clickedButton;
-    clickedButton-id:  nodeattr(id);
+    clickedButton-id:  nodeAttr(id);
 	action-client: log;
 	log-message: "Was here.";
 }
@@ -20,7 +20,7 @@
 
 behaviour:annoyclicker-doit(annoyYou) {
     action-server:     clickedButton;
-    clickedButton-id:  nodeattr(id);
+    clickedButton-id:  nodeAttr(id);
 }
 
 behaviour:annoyclicker-annoy(annoyYou) {

From reebalazs at codespeak.net  Sat Aug  5 21:00:15 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sat,  5 Aug 2006 21:00:15 +0200 (CEST)
Subject: [Kukit-checkins] r31038 - in kukit/azax/trunk: . plugins
Message-ID: <20060805190015.0FA4410083@code0.codespeak.net>

Author: reebalazs
Date: Sat Aug  5 21:00:12 2006
New Revision: 31038

Added:
   kukit/azax/trunk/plugins/action.py
Removed:
   kukit/azax/trunk/plugins/event_action.py
Modified:
   kukit/azax/trunk/azaxview.py
Log:
Fix command method deprecations on azaxview too+ fix renamed file

Modified: kukit/azax/trunk/azaxview.py
==============================================================================
--- kukit/azax/trunk/azaxview.py	(original)
+++ kukit/azax/trunk/azaxview.py	Sat Aug  5 21:00:12 2006
@@ -35,6 +35,7 @@
 from Products.Five import BrowserView
 from  commands import AzaxCommands, AzaxCommand
 from parsers import XmlParser, HtmlParser
+from zope.deprecation import deprecated
 
 class AzaxBaseView(BrowserView):
     """ Base azax view
@@ -72,10 +73,12 @@
     # default set of commands
     # --
     
-    def setHtmlAsChild(self, selector, new_value):
+    # XXX the list is not full: maybe complete them?
+    
+    def replaceInnerHTML(self, selector, new_value):
         """ see interfaces.py """
         new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
-        command = self.addCommand('setHtmlAsChild', selector)
+        command = self.addCommand('replaceInnerHTML', selector)
         data = command.addParam('html', new_value)
     
     def setAttribute(self, selector, name, value):
@@ -84,31 +87,31 @@
         data = command.addParam('name', name)
         data = command.addParam('value', value)
     
-    def addAfter(self, selector, new_value):
+    def insertHTMLAfter(self, selector, new_value):
         """ see interfaces.py """
         new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
-        command = self.addCommand('addAfter', selector)
+        command = self.addCommand('insertHTMLAfter', selector)
         data = command.addParam('html', new_value)
 
-    def clearChildren(self, selector):
+    def clearChildNodes(self, selector):
         """ see interfaces.py """
-        command = self.addCommand('clearChildren', selector)
-
-    def removeNode(self, selector):
+        command = self.addCommand('clearChildNodes', selector)
+    
+    def deleteNode(self, selector):
         """ see interfaces.py """
-        command = self.addCommand('removeNode', selector)
+        command = self.addCommand('deleteNode', selector)
 
-    def removeNextSibling(self, selector):
+    def deleteNodeAfter(self, selector):
         """ see interfaces.py """
-        command = self.addCommand('removeNextSibling', selector)
+        command = self.addCommand('deleteNodeAfter', selector)
 
-    def removePreviousSibling(self, selector):
+    def deleteNodeBefore(self, selector):
         """ see interfaces.py """
-        command = self.addCommand('removePreviousSibling', selector)
+        command = self.addCommand('deleteNodeBefore', selector)
 
-    def copyChildrenFrom(self, selector, id):
+    def copyChildNodesFrom(self, selector, id):
         """ see interfaces.py """
-        command = self.addCommand('copyChildrenFrom', selector)
+        command = self.addCommand('copyChildNodesFrom', selector)
         data = command.addParam('html_id', id)
 
     def moveNodeAfter(self, selector, id):
@@ -116,23 +119,38 @@
         command = self.addCommand('moveNodeAfter', selector)
         data = command.addParam('html_id', id)
 
-    def copyChildrenTo(self, selector, id):
+    def copyChildNodesTo(self, selector, id):
         """ see interfaces.py """
-        command = self.addCommand('copyChildrenTo', selector)
+        command = self.addCommand('copyChildNodesTo', selector)
         data = command.addParam('html_id', id)
 
-    def moveChildrenTo(self, selector, id):
+    def setStateVar(self, varname, value):
         """ see interfaces.py """
-        self.copyChildrenTo(selector, id)
-        self.clearChildren(selector)
-
-    def setStatevar(self, varname, value):
-        command = self.addCommand('setStatevar')
+        command = self.addCommand('setStateVar')
         command.addParam('varname', varname)
         command.addParam('value', value)
 
     def triggerEvent(self, name, **kw):
+        """ see interfaces.py """
         command = self.addCommand('triggerEvent')
         command.addParam('name', name)
         for key, value in kw.iteritems():
             command.addParam(key, value)
+    
+    # XXX Deprecated ones
+
+    def moveChildrenTo(self, selector, id):
+        """ see interfaces.py """
+        self.copyChildrenTo(selector, id)
+        self.clearChildren(selector)
+    moveChildrenTo = deprecated(moveChildrenTo, 'No more supported, use a sequence of copyChildrenTo and clearChildren')
+
+    setHtmlAsChild = deprecated(replaceInnerHTML, 'use replaceInnerHTML instead')
+    addAfter = deprecated(insertHTMLAfter, 'use insertHTMLAfter instead')
+    clearChildren = deprecated(clearChildNodes, 'use clearChildNodes instead')
+    removeNode = deprecated(deleteNode, 'use deleteNode instead')
+    removeNextSibling = deprecated(deleteNodeAfter, 'use deleteNodeAfter instead')
+    removePreviousSibling = deprecated(deleteNodeBefore, 'use deleteNodeBefore instead')
+    copyChildrenFrom = deprecated(copyChildNodesFrom, 'use copyChildNodesFrom instead')
+    copyChildrenTo = deprecated(copyChildNodesTo, 'use copyChildNodesTo instead')
+    setStatevar = deprecated(setStateVar, 'use setStateVar (capital V) instead')

Added: kukit/azax/trunk/plugins/action.py
==============================================================================
--- (empty file)
+++ kukit/azax/trunk/plugins/action.py	Sat Aug  5 21:00:12 2006
@@ -0,0 +1,34 @@
+
+from plugin import Plugin
+from registry import AzaxPluginError
+
+class Action(Plugin):
+    '''The action plugin
+
+    '''
+
+    plugintype = 'action'
+
+    def __init__(self, name, jsfile, command_factory, 
+            params_mandatory, params_optional, deprecated):
+        Plugin.__init__(self, name, jsfile)
+        self.command_factory = command_factory
+        self.params_mandatory = params_mandatory
+        self.params_optional = params_optional
+        self.deprecated = deprecated
+
+    def checkRegisteredCommand(cls, name):
+        command = cls.getRegistered(name)
+        # check if the action has a valid command factory
+        if command.command_factory == 'none':
+            raise AzaxPluginError, '"%s" is not a registered kss command (or missing command_factory?)' % (name, )
+        # issue deprecation warning, if necessary
+        command.check_deprecation()
+    checkRegisteredCommand = classmethod(checkRegisteredCommand)
+
+    def check_deprecation(self):
+        if self.deprecated:
+            import warnings, textwrap
+            warnings.warn(textwrap.dedent('''\
+            The usage of the kss command "%s" is deprecated,
+            %s''' % (self.name, self.deprecated)), DeprecationWarning, 2)

Deleted: /kukit/azax/trunk/plugins/event_action.py
==============================================================================
--- /kukit/azax/trunk/plugins/event_action.py	Sat Aug  5 21:00:12 2006
+++ (empty file)
@@ -1,13 +0,0 @@
-
-from plugin import Plugin
-
-class EventAction(Plugin):
-    '''The event action plugin
-
-    '''
-
-    plugintype = 'event_action'
-
-    def __init__(self, name, jsfile):
-        Plugin.__init__(self, name, jsfile)
-

From reebalazs at codespeak.net  Sat Aug  5 21:11:23 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sat,  5 Aug 2006 21:11:23 +0200 (CEST)
Subject: [Kukit-checkins] r31040 - kukit/azaxdemo/trunk
Message-ID: <20060805191123.AFBC510083@code0.codespeak.net>

Author: reebalazs
Date: Sat Aug  5 21:11:22 2006
New Revision: 31040

Modified:
   kukit/azaxdemo/trunk/azaxview.py
Log:
Change to new command names in azaxview

Modified: kukit/azaxdemo/trunk/azaxview.py
==============================================================================
--- kukit/azaxdemo/trunk/azaxview.py	(original)
+++ kukit/azaxdemo/trunk/azaxview.py	Sat Aug  5 21:11:22 2006
@@ -30,28 +30,29 @@
 
     def clearDivContent(self):
         """ clear div content """
-        self.clearChildren('div#demo')
+        self.clearChildNodes('div#demo')
         return self.render()
 
     def copyFromDivContent(self):
         """ copy div content """
-        self.copyChildrenFrom('div#copy', 'demo')
+        self.copyChildNodesFrom('div#copy', 'demo')
         return self.render()
 
     def copyToDivContent(self):
         """ copy div content """
-        self.copyChildrenTo('div#copy', 'demo')
+        self.copyChildNodesTo('div#copy', 'demo')
         return self.render()
 
     def moveToDivContent(self):
         """ copy div content """
-        self.moveChildrenTo('div#copy', 'demo')
+        self.copyChildNodesTo('div#copy', 'demo')
+        self.clearChildNodes('div#copy')
         return self.render()
 
     def getDivContent(self):
         """ returns div content """
-        self.setHtmlAsChild('div#demo', '<h1>it worked</h1>')
-        self.setHtmlAsChild('div#demo', '<h1>it worked&nbsp;again</h1>')
+        self.replaceInnerHTML('div#demo', '<h1>it worked</h1>')
+        self.replaceInnerHTML('div#demo', '<h1>it worked&nbsp;again</h1>')
         return self.render()
 
     def getCorrespondingSelect(self, value):
@@ -61,24 +62,24 @@
         mapping['animals']=['dog', 'cat', 'cow']
         mapping['machines']=['computer', 'car', 'airplane']
         result = ['<option>%s</option>' % item for item in mapping[value]]
-        self.setHtmlAsChild('select#second', ' '.join(result))
+        self.replaceInnerHTML('select#second', ' '.join(result))
         return self.render()
 
     def getAutoupdateMarkup(self):
         """ returns the current time """
-        self.setHtmlAsChild('div#update-wrapper', '<div id="update-area"></div>')
+        self.replaceInnerHTML('div#update-wrapper', '<div id="update-area"></div>')
         return self.render()
 
     def getCurrentTime(self):
         """ returns the current time """
-        self.setHtmlAsChild('div#update-area', "<p>%s</p>" % str(datetime.datetime.now()))
+        self.replaceInnerHTML('div#update-area', "<p>%s</p>" % str(datetime.datetime.now()))
         return self.render()
         
     def getInputField(self, value):
         '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', 
+        self.replaceInnerHTML('div#text', 
                             '<div><input type="text" name="value" value="'+value+'" /></div>' \
                             '<input type="button" value="save" id="save" />'
                            )
@@ -88,30 +89,31 @@
         '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+'" />')
+        self.relpaceInnerHTML('div#text', value+'<input type="hidden" name="value" value="'+value+'" />')
         return self.render()
     
     def expandSubTree(self, value):
         'Expands given subtree'
-        self.setHtmlAsChild('#text', 'works, expand %s' % value)
+        self.replaceInnerHTML('#text', 'works, expand %s' % value)
         return self.render()
         
     def collapseSubTree(self, value):
         'Collapses given subtree'
-        self.setHtmlAsChild('#text', 'works, collapse %s' % value)
+        self.replaceInnerHTML('#text', 'works, collapse %s' % value)
         return self.render()
 
     def cancelSubmitSave(self, 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'))
+        self.replaceInnerHTML('div#async', 'Async saved %s' % unicode(text_save, 'utf'))
         return self.render()
 
     def removeNodeXpath(self):
+        # XXX the xpath selector is now moved out of the core, see suppl, product "azaxslt"
         sel = self.getSelector('xpath', "//P[@id='xpath']/following-sibling::*[position()=1]")
-        self.removeNode(sel)
+        self.deleteNode(sel)
         return self.render()
        
     def clickedButton(self, id):
         'Show status of the button clicked'
-        self.setHtmlAsChild('#update-status', "<p>Button <b>%s</b> clicked. <i>%s</i></p>" % (id, datetime.datetime.now()))
+        self.replaceInnerHTML('#update-status', "<p>Button <b>%s</b> clicked. <i>%s</i></p>" % (id, datetime.datetime.now()))
         return self.render()

From reebalazs at codespeak.net  Mon Aug  7 19:33:44 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon,  7 Aug 2006 19:33:44 +0200 (CEST)
Subject: [Kukit-checkins] r31138 - kukit/kukit.js/trunk/kukit
Message-ID: <20060807173344.8013310072@code0.codespeak.net>

Author: reebalazs
Date: Mon Aug  7 19:33:41 2006
New Revision: 31138

Modified:
   kukit/kukit.js/trunk/kukit/dom.js
   kukit/kukit.js/trunk/kukit/forms.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
Log:
IMplement passing all form variables as parms and fixing the cssQuery bug

- fixing currentForm, disabling submits from result

- Adding parameter producers form, currentForm and arrange marshalling in the standard transport

- Add logging elapsed times for loading, parsing and binding

- Fix appendHTML, fix rebinding node scopes to inserted nodes

- fix cssQuery bug: cssQuery needs to be called always on global document at the moment,
  because of "tag1 tag2" queries. We mark bound nodes never to be rebound again.

- Extending param method currentFormVar to use current node, if no parameter is given

- Adding new helper to view



Modified: kukit/kukit.js/trunk/kukit/dom.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/dom.js	(original)
+++ kukit/kukit.js/trunk/kukit/dom.js	Mon Aug  7 19:33:41 2006
@@ -131,3 +131,16 @@
     return param;
 };
 
+// really the query should start from the document root, but
+// limited to in_nodes subtrees!
+kukit.dom.cssQuery = function(selector, in_nodes) {
+    if (typeof(in_nodes) == null) {
+        throw 'Selection error in kukit.dom.cssQuery';
+    }
+    // global scope, always.
+    return cssQuery(selector);
+    // This is very bad. However the binding makes sure that
+    // nodes once bound will never be bound again
+    // (also, noticed the following issue: cssQuery, when called
+    // on an element, does not check the element itself.)
+};

Modified: kukit/kukit.js/trunk/kukit/forms.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/forms.js	(original)
+++ kukit/kukit.js/trunk/kukit/forms.js	Mon Aug  7 19:33:41 2006
@@ -26,6 +26,13 @@
 
 /* form query assembler */
 
+// Prefix constants for dict marshalling, 
+//     pattern: %s(dictprefix)%(name)s%(dictseparator)s%(key)s%(dictpostfix)s
+// XXX this should be settable
+kukit.fo.dictprefix = ''
+kukit.fo.dictseparator = '.'
+kukit.fo.dictpostfix = ':record'
+
 kukit.fo.FormQueryElem = function(name, value) {
     this.name = name;
     this.value = value;
@@ -40,8 +47,18 @@
 };
 
 kukit.fo.FormQuery.prototype.appendElem = function(name, value) {
-    var elem = new kukit.fo.FormQueryElem(name, value);
-    this.l[this.l.length] = elem;
+    if (typeof(value) == 'object') {
+        // Special marshalling of dicts
+        for (var key in value) {
+            var qkey = kukit.fo.dictprefix + name + kukit.fo.dictseparator + key + kukit.fo.dictpostfix;
+            var elem = new kukit.fo.FormQueryElem(qkey, value[key]);
+            this.l.push(elem);
+        }
+    } else {
+        // normal strings
+        var elem = new kukit.fo.FormQueryElem(name, value);
+        this.l.push(elem);
+    }
 };
 
 kukit.fo.FormQuery.prototype.encode = function() {
@@ -61,7 +78,7 @@
     return d;
 };
 
-/* Form data extraction */
+/* Form data extraction, helpers */
 
 kukit.fo.findContainer = function(node, func) {
     // Starting with the given node, find the nearest containing element
@@ -110,8 +127,8 @@
             value = null;
         }   
     } else if ((element.tagName.toLowerCase() == 'textarea')
-               || (element.tagName.toLowerCase() == 'input')
-               || (element.tagName.toLowerCase() == 'button')
+               || (element.tagName.toLowerCase() == 'input' && 
+                    element.type != 'submit' && element.type != 'reset')
               ) {
         value = element.value;
     } else {
@@ -120,26 +137,6 @@
     return value;
 };
 
-kukit.fo.getFormVarFromCurrentForm = function(target, name) {
-    // Just get one formvar, from the form that contains the target node
-    var form = kukit.fo.getCurrentForm(target);
-    if (!form) {
-        kukit.logWarning("No form found");
-        return null;
-    }
-    return kukit.fo.getFormVar(form, name);
-}
-
-kukit.fo.getFormVarFromNamedForm = function(formname, name) {
-    // Just get one formvar, from the named form 
-    var form = document.forms[formname];
-    if (!form) {
-        kukit.logWarning("No form found");
-        return null;
-    }
-    return kukit.fo.getFormVar(form, name);
-}
-
 kukit.fo.getFormVar = function(form, name) {
     // Extract the value of a formvar, from a given form
     var value = null;
@@ -157,41 +154,62 @@
     return value;
 };
 
-
-//  XXX XXX below this it will be deprecated, I think
-//  since now we extract stuff into the parms first....
-
-kukit.fo.extractFormQuery = function(target) {
-    throw 'Deprecated?';
-    // Extract the query that contains the target. 
-    var query = new kukit.fo.FormQuery();
-    // We now put isKukitRequest=1; XXX now deprecated.
-    //query.appendElem("isKukitRequest", "1");
-    if (!target) {
-        kukit.logWarning("No target given");
-        return query;
-    }
-    var form = kukit.fo.getFormForNode(target);
-    if (!form) {
-        kukit.logWarning("No form found");
-        return query;
-    }
+kukit.fo.getAllFormVars = function(form) {
+    // extracts all elements of a given form
+    var data = {};
     var elements = form.elements;
-    for (var y=0;y < elements.length;y++) {
+    for (var y=0; y<elements.length; y++) {
         var element = elements[y];
         var value = kukit.fo.getValueOfFormElement(element);
         if (value == null) {
             kukit.logWarning('Form element not harvested: '+element.tagName);
         } else {
             kukit.logDebug("Form element ("+element.tagName+"): name="+element.name+", value="+value);
-            query.appendElem(element.name, value);
+            data[element.name] = value;
         }
     }
-    return query;
+    return data;
 };
 
-kukit.fo.extractFormData = function(target) {
-    throw 'Deprecated?';
-    return kukit.fo.extractFormQuery(target).encode();
+/* Form data extraction, frontend */
+
+kukit.fo.getFormVarFromCurrentForm = function(target, name) {
+    // Just get one formvar, from the form that contains the target node
+    var form = kukit.fo.getCurrentForm(target);
+    if (!form) {
+        kukit.logWarning("No form found");
+        return null;
+    }
+    return kukit.fo.getFormVar(form, name);
+};
+
+kukit.fo.getFormVarFromNamedForm = function(formname, name) {
+    // Just get one formvar, from the named form 
+    var form = document.forms[formname];
+    if (!form) {
+        kukit.logWarning("No form found");
+        return null;
+    }
+    return kukit.fo.getFormVar(form, name);
+};
+
+kukit.fo.getAllFormVarsFromCurrentForm = function(target) {
+    // Just get one formvar, from the form that contains the target node
+    var form = kukit.fo.getCurrentForm(target);
+    if (!form) {
+        kukit.logWarning("No form found");
+        return {};
+    }
+    return kukit.fo.getAllFormVars(form);
+};
+
+kukit.fo.getAllFormVarsFromNamedForm = function(formname) {
+    // Just get one formvar, from the named form 
+    var form = document.forms[formname];
+    if (!form) {
+        kukit.logWarning("No form found");
+        return {};
+    }
+    return kukit.fo.getAllFormVars(form);
 };
 

Modified: kukit/kukit.js/trunk/kukit/kssparser.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kssparser.js	(original)
+++ kukit/kukit.js/trunk/kukit/kssparser.js	Mon Aug  7 19:33:41 2006
@@ -454,24 +454,21 @@
 
 kukit.kssp.KssRuleProcessor = function(href) {
     this.href = href;
+    this.loaded = false;
 };
 
-kukit.kssp.KssRuleProcessor.prototype.loadAndParse = function() {
-    var txt = this.loadRuleSheet();
-    this.parseResource(txt);
-};
-
-kukit.kssp.KssRuleProcessor.prototype.loadRuleSheet = function() {
+kukit.kssp.KssRuleProcessor.prototype.load = function() {
       // Opera does not support getDomDocument.load, so we use XMLHttpRequest
       var domDoc = new XMLHttpRequest();
       domDoc.open("GET", this.href, false);
       domDoc.send(null);
-      return domDoc.responseText;
+      this.txt = domDoc.responseText;
+      this.loaded = true;
 };
 
-kukit.kssp.KssRuleProcessor.prototype.parseResource = function(txt) {
+kukit.kssp.KssRuleProcessor.prototype.parse = function() {
     //Build a parser and parse the text into it
-    var src = new kukit.tk.Cursor(txt);
+    var src = new kukit.tk.Cursor(this.txt);
     var parser;
     try {
         parser = new kukit.kssp.document(src, null, true);

Modified: kukit/kukit.js/trunk/kukit/kukit.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kukit.js	(original)
+++ kukit/kukit.js/trunk/kukit/kukit.js	Mon Aug  7 19:33:41 2006
@@ -78,41 +78,42 @@
 kukit.ruleProcessorClasses = {};
 
 kukit.initializeRules = function() {
-    //alert("Start load.");
     var rulelinks = kukit.getRuleSheetLinks();
-    //alert("Nr of Rule Sheet Links: "+rulelinks.length);
     kukit.log("Nr of Rule Sheet Links: "+rulelinks.length);
     for (var i=0; i<rulelinks.length; i++) {
         var rulelink = rulelinks[i];
         var ruleProcessorClass = kukit.ruleProcessorClasses[rulelink.res_type];
         if (ruleProcessorClass) {
             var ruleprocessor = new ruleProcessorClass(rulelink.href);
-            //alert("Loading " + rulelink.href);
-            kukit.log("Loading " + rulelink.href + " resource type " + rulelink.res_type);
-            ruleprocessor.loadAndParse();
+            var ts_start = (new Date()).valueOf();
+            ruleprocessor.load();
+            var ts_loaded = (new Date()).valueOf();
+            ruleprocessor.parse();
+            var ts_end = (new Date()).valueOf();
+            kukit.log("Loading " + rulelink.href + " resource type " + rulelink.res_type + ' in ' + (ts_loaded - ts_start) + ' + ' + (ts_end - ts_loaded) + ' ms');
             kukit.rule_processors[kukit.rule_processors.length] = ruleprocessor;
         } else {
             kukit.logError("Ignoring rulesheet " + rulelink.href + ' of type ' + rulelink.res_type);
         }
     }
-    //alert("Loading finished");
     kukit.setupEvents();
-    //alert("Setup finished");
 };
 
-kukit.setupEvents = function(in_node) {
-    kukit.log("Setting up events");
+kukit.setupEvents = function(in_nodes) {
+    var ts_start = (new Date()).valueOf();
     var rules = kukit.rules;
     var ruletable = new kukit.rd.RuleTable();
     for (var y=0; y < rules.length; y++) {
-        rules[y].mergeForSelectedNodes(ruletable, in_node);
+        rules[y].mergeForSelectedNodes(ruletable, in_nodes);
     }
     // bind special selectors first
-    if (typeof(in_node) == 'undefined') {
+    if (typeof(in_nodes) == 'undefined') {
         kukit.rd.methodTable.bindall();
     }
     // finally bind the merged events
     ruletable.bindall()
+    var ts_end = (new Date()).valueOf();
+    kukit.log('Setting up events in ' + (ts_end - ts_start) + ' ms');
 };
 
 kukit.calculateAbsoluteURL = function(url) {

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Mon Aug  7 19:33:41 2006
@@ -313,39 +313,39 @@
 // accepts both string and dom.
 kukit.ar.actionRegistry.register('replaceInnerHTML', function(node, parms, eventrule) {
     parms = kukit.pl.completeParms(parms, ['html'], {}, 'replaceInnerHTML action');
+    var inserted;
     if (typeof(parms.html) == 'string') {
         node.innerHTML = parms.html;
+        inserted = node.childNodes; 
     } else {
         parms.html = kukit.dom.forceToDom(parms.html);
         kukit.dom.clearChildNodes(node);
-        kukit.dom.appendChildren(parms.html.childNodes, node);
+        inserted = kukit.dom.appendChildren(parms.html.childNodes, node);
     }
-    kukit.setupEvents(node);
+    kukit.setupEvents(inserted);
 });
 kukit.cr.commandRegistry.registerFromAction('replaceInnerHTML', kukit.cr.makeSelectorCommand);
 
-// XXX This seems to be untested.
 kukit.ar.actionRegistry.register('replaceHTML', function(node, parms, eventrule) {
     parms = kukit.pl.completeParms(parms, ['html'], {'selector': null}, 'replaceHTML action');
     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(parms.html);
-    }
+    kukit.dom.appendChildren(childNodes, newNode);
     if (parms.selector) {
         var element = cssQuery(parms.selector, newNode)[0];
-        if (element)
+        if (element) {
             parentNode.replaceChild(element, node);
-        else
+            kukit.setupEvents(element);
+        } else {
             kukit.logDebug("Found no elements in response with selector '" + parms.selector + "'.");
+        }
     } else {
-        parentNode.replaceChild(newNode.firstChild, node);
+        var element = newNode.firstChild;
+        parentNode.replaceChild(element, node);
+        kukit.setupEvents(element);
     }
-    kukit.setupEvents(parentNode);
 });
 kukit.cr.commandRegistry.registerFromAction('replaceHTML', kukit.cr.makeSelectorCommand);
 
@@ -361,14 +361,15 @@
     var content = document.importNode(parms.html, true);
     var parentNode = node.parentNode;
     var toNode = kukit.dom.getNextSiblingTag(node);
+    var inserted;
     if (toNode == null) {
-        var inserted = kukit.dom.appendChildren(content.childNodes, parentNode);
+        inserted = kukit.dom.appendChildren(content.childNodes, parentNode);
     } else {
-        var inserted = kukit.dom.insertBefore(content, parentNode, toNode);
+        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.setupEvents(inserted);
 });
 kukit.cr.commandRegistry.registerFromAction('insertHTMLAfter', kukit.cr.makeSelectorCommand);
 

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Mon Aug  7 19:33:41 2006
@@ -107,14 +107,23 @@
     // Check syntax
     switch (this.methodname) {
         case 'formVar': {
-            if (this.methodname == 'formvar')
             if (this.args.length != 2) {
                 throw 'formVar method needs 2 arguments (formname, varname)';
             }
         } break;
         case 'currentFormVar': {
+            if (this.args.length != 0 && this.args.length != 1) {
+                throw 'currentFormVar method needs 0 or 1 argument (varname)';
+            }
+        } break;
+        case 'form': {
             if (this.args.length != 1) {
-                throw 'currentFormVar method needs 1 argument (varname)';
+                throw 'form method needs 1 arguments (formname)';
+            }
+        } break;
+        case 'currentForm': {
+            if (this.args.length != 0) {
+                throw 'currentFormVar method needs no argument';
             }
         } break;
         case 'nodeAttr': {
@@ -144,7 +153,18 @@
             parms[key] = kukit.fo.getFormVarFromNamedForm(this.args[0], this.args[1]);
         } break;
         case 'currentFormVar': {
-            parms[key] = kukit.fo.getFormVarFromCurrentForm(node, this.args[0]);
+            if (this.args.length == 1) {
+                parms[key] = kukit.fo.getFormVarFromCurrentForm(node, this.args[0]);
+            } else {
+                // no form var name, just get the value of the node.
+                parms[key] = kukit.fo.getValueOfFormElement(node);
+            }
+        } break;
+        case 'form': {
+            parms[key] = kukit.fo.getAllFormVarsFromNamedForm(this.args[0]);
+        } break;
+        case 'currentForm': {
+            parms[key] = kukit.fo.getAllFormVarsFromCurrentForm(node);
         } break;
         case 'nodeAttr': {
             var argname =  this.args[0];
@@ -217,22 +237,28 @@
     }
 };
 
-kukit.rd.EventRule.prototype.mergeForSelectedNodes = function(ruletable, in_node) {
-    // Select all nodes within the in_node. (or null on initial node)
+kukit.rd.EventRule.prototype.mergeForSelectedNodes = function(ruletable, in_nodes) {
+    // Select all nodes within the in_nodes. (or undefined on initial node)
     // Merge itself to the selected nodes.
     if (this.kss_selector.isEventSelector) {
-        // XXX this might need to be changed to a global match and only applying
-        // to nodes inside the given one
-        var nodes = cssQuery(this.kss_selector.css, in_node);
-        if (nodes.length > 0)
-            kukit.logDebug('EventRule #' + this.getNr() + ' mergeid ' + this.kss_selector.mergeid + ' selected ' + nodes.length + ' nodes');
+        var nodes = kukit.dom.cssQuery(this.kss_selector.css, in_nodes);
+        var counter = 0;
         for (var y=0; y < nodes.length; y++)
         {
-            ruletable.add(nodes[y], this);
+            var node = nodes[y];
+            // XXX never rebind to any node again!
+            // this compensates that cssQuery is returning results out of the subtree
+            if (! node._kukitmark) {
+                ruletable.add(node, this);
+                counter += 1;
+                }
+        }
+        if (counter > 0) {
+            kukit.logDebug('EventRule #' + this.getNr() + ' mergeid ' + this.kss_selector.mergeid + ' selected ' + counter + ' nodes');
         }
-    } else if (typeof(in_node) == 'undefined') {
+    } else if (typeof(in_nodes) == 'undefined') {
         // Method selector. They only need to be handled on the initial
-        // pageload, when the in_node parameter is ommitted.
+        // pageload, when the in_nodes parameter is ommitted.
         kukit.rd.methodTable.add(this);
     }
 };
@@ -523,6 +549,8 @@
             eventrule.bind(nodeval.node);            
         }
         counter += 1;
+        // XXX Mark the node, disabling rebinding in a second round
+        nodeval.node._kukitmark = true;
     }
     kukit.logDebug('Binding to ' + counter + ' nodes in grand total');
 };
@@ -534,7 +562,6 @@
     // However we try to set this right.
     // We generate an uniqueID on the node. This does not work
     // on MSIE but it already has an uniqueID.
-    // XXX Konqueror? Other browsers?
     var id = node.uniqueID;
     if (typeof(id) == 'undefined') {
         id = kukit.rd.uid;

From reebalazs at codespeak.net  Mon Aug  7 19:34:33 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon,  7 Aug 2006 19:34:33 +0200 (CEST)
Subject: [Kukit-checkins] r31139 - kukit/azax/trunk
Message-ID: <20060807173433.1C09210072@code0.codespeak.net>

Author: reebalazs
Date: Mon Aug  7 19:34:31 2006
New Revision: 31139

Modified:
   kukit/azax/trunk/azaxview.py
Log:
Adding new helper to azax view

Modified: kukit/azax/trunk/azaxview.py
==============================================================================
--- kukit/azax/trunk/azaxview.py	(original)
+++ kukit/azax/trunk/azaxview.py	Mon Aug  7 19:34:31 2006
@@ -80,6 +80,12 @@
         new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
         command = self.addCommand('replaceInnerHTML', selector)
         data = command.addParam('html', new_value)
+
+    def replaceHTML(self, selector, new_value):
+        """ see interfaces.py """
+        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
+        command = self.addCommand('replaceHTML', selector)
+        data = command.addParam('html', new_value)
     
     def setAttribute(self, selector, name, value):
         """ see interfaces.py """

From reebalazs at codespeak.net  Mon Aug  7 19:35:30 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon,  7 Aug 2006 19:35:30 +0200 (CEST)
Subject: [Kukit-checkins] r31140 - in kukit/azaxdemo/trunk: . browser
Message-ID: <20060807173530.99E6B10072@code0.codespeak.net>

Author: reebalazs
Date: Mon Aug  7 19:35:27 2006
New Revision: 31140

Added:
   kukit/azaxdemo/trunk/browser/form_submit.kss
   kukit/azaxdemo/trunk/browser/form_submit.pt
   kukit/azaxdemo/trunk/browser/two_select_revisited.kss
   kukit/azaxdemo/trunk/browser/two_select_revisited.pt
Modified:
   kukit/azaxdemo/trunk/azaxview.py
   kukit/azaxdemo/trunk/browser/azax_demo_index.pt
   kukit/azaxdemo/trunk/browser/azax_two_select.pt
   kukit/azaxdemo/trunk/configure.zcml
Log:
Adding two new demos: two select revisited, and form submit

Modified: kukit/azaxdemo/trunk/azaxview.py
==============================================================================
--- kukit/azaxdemo/trunk/azaxview.py	(original)
+++ kukit/azaxdemo/trunk/azaxview.py	Mon Aug  7 19:35:27 2006
@@ -61,8 +61,16 @@
         mapping['']=[]
         mapping['animals']=['dog', 'cat', 'cow']
         mapping['machines']=['computer', 'car', 'airplane']
-        result = ['<option>%s</option>' % item for item in mapping[value]]
-        self.replaceInnerHTML('select#second', ' '.join(result))
+        # XXX Note that originally we just used replaceInnerHTML to just put
+        # the options inside the select, however this is principally broken 
+        # on IE due to an IE bug. Microsoft has confirmed the bug but is not
+        # giving information on whether it has or it will ever be fixed.
+        # For further info, see http://support.microsoft.com/default.aspx?scid=kb;en-us;276228
+        # The current solution, replace the outer node, works solidly.
+        result = ['<select id="second">']
+        result.extend(['<option>%s</option>' % item for item in mapping[value]])
+        result.append('</select>')
+        self.replaceHTML('select#second', ' '.join(result))
         return self.render()
 
     def getAutoupdateMarkup(self):
@@ -117,3 +125,29 @@
         'Show status of the button clicked'
         self.replaceInnerHTML('#update-status', "<p>Button <b>%s</b> clicked. <i>%s</i></p>" % (id, datetime.datetime.now()))
         return self.render()
+
+    def updateSlaveSelector(self, masterid, value):
+        """ returns select content """
+        mapping = {}
+        mapping['']=[]
+        mapping['animals']=['dog', 'cat', 'cow']
+        mapping['machines']=['computer', 'car', 'airplane']
+        # calculate the slave id
+        master, _dummy = masterid.split('-')
+        slaveid = '%s-slave' % master
+        # make the payload
+        result = ['<select id="%s">' % slaveid]
+        result.extend(['<option>%s</option>' % item for item in mapping[value]])
+        result.append('</select>')
+        # XXX See above remark why we need to replace the outer select.
+        self.replaceHTML('select#%s' % slaveid, ' '.join(result))
+        return self.render()
+
+    def formSubmitSave(self, data):
+        result = ['<p>Async saved:</p><table><th>Name:</th><th>Value:</th>']
+        for key, value in data.items():
+            result.append('<tr><td>%s</td><td>%s</td></tr>' % (key, value))
+        result.append('</table>')
+        # we build command with unicode, but the methods receive utf, so we convert.
+        self.replaceInnerHTML('div#async', unicode(''.join(result), 'utf'))
+        return self.render()

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	Mon Aug  7 19:35:27 2006
@@ -11,6 +11,8 @@
      <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>
+     <li><a href="two_select_revisited.html">Master-slave selects revisited</a></li>
+     <li><a href="form_submit.html">Form submit</a></li>
     </ul>
   </body>
 </html>

Modified: kukit/azaxdemo/trunk/browser/azax_two_select.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_two_select.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_two_select.pt	Mon Aug  7 19:35:27 2006
@@ -7,9 +7,6 @@
   <body>
     <p><a href=".">All demos</a></p>
     <h2>Two Selects</h2>
-    <p>Note this demo does not work on IE; there is a bug that disables
-    the injection of OPTION tags under a SELECT. (To make it work, the entire
-    select should be replaced, for example.)</p>
    <form name="two">
        <select id="first" name="value">
             <option></option>

Added: kukit/azaxdemo/trunk/browser/form_submit.kss
==============================================================================
--- (empty file)
+++ kukit/azaxdemo/trunk/browser/form_submit.kss	Mon Aug  7 19:35:27 2006
@@ -0,0 +1,5 @@
+input#submit:click {
+    evt-click-preventdefault: true;
+    action-server: formSave;
+    formSave-data: currentForm();
+}

Added: kukit/azaxdemo/trunk/browser/form_submit.pt
==============================================================================
--- (empty file)
+++ kukit/azaxdemo/trunk/browser/form_submit.pt	Mon Aug  7 19:35:27 2006
@@ -0,0 +1,52 @@
+<html>
+  <head>
+    <link rel="kukit" type="text/css"
+          tal:attributes="href
+          string:${context/absolute_url}/++resource++form_submit.kss"/>
+    <metal:header use-macro="context/header_macros/macros/header_resources" />
+	<style>label {font-weight: bold;}</style>
+  </head>
+  <body>
+    <p><a href=".">All demos</a></p>
+
+<h3>Form Submit Demo</h3>
+   <p tal:condition="request/text_save | nothing"><span tal:replace="request/text_save | nothing" /> saved !</p>
+   <p><a href="form_submit.html">Empty</a></p>
+   <form action="form_submit.html">
+        <div>
+			<label for="name">Name</label><br />
+        	<input type="text" name="name"
+               	tal:attributes="value request/name | nothing" />
+        </div>
+        <div>
+			<label for="address">Address</label><br />
+        	<textarea name="address"
+               	tal:attributes="value request/address | nothing"></textarea>
+        </div>
+        <div>
+			<label for="city">City</label><br />
+        	<input type="text" name="city"
+               	tal:attributes="value request/city | nothing" />
+        </div>
+        <div>
+			<label for="country">Country</label><br /> 
+       		<select name="country"
+               	tal:attributes="value request/country | nothing">
+            	<option></option>
+            	<option>Norway</option>
+            	<option>USA</option>
+       		</select>
+        </div>
+        <div>
+			<label for="telephone">Telephone</label><br />
+        	<input type="text" name="telephone"
+               	tal:attributes="value request/telephone | nothing" />
+        </div>
+        <div>
+        	<input type="submit" id="submit" value="Save"  />
+        	<input type="reset" />
+        </div>
+   </form>
+   <div id="async" />
+  </body>
+</html>

Added: kukit/azaxdemo/trunk/browser/two_select_revisited.kss
==============================================================================
--- (empty file)
+++ kukit/azaxdemo/trunk/browser/two_select_revisited.kss	Mon Aug  7 19:35:27 2006
@@ -0,0 +1,5 @@
+select.master-select:change {
+    action-server: updateSlaveSelector;
+    updateSlaveSelector-masterid:      nodeAttr("id");
+    updateSlaveSelector-value:      currentFormVar();
+}

Added: kukit/azaxdemo/trunk/browser/two_select_revisited.pt
==============================================================================
--- (empty file)
+++ kukit/azaxdemo/trunk/browser/two_select_revisited.pt	Mon Aug  7 19:35:27 2006
@@ -0,0 +1,37 @@
+<html>
+  <head>
+    <link rel="kukit" type="text/css"
+          tal:attributes="href string:${context/absolute_url}/++resource++two_select_revisited.kss"/>
+    <metal:header use-macro="context/header_macros/macros/header_resources" />
+  </head>
+  <body>
+    <p><a href=".">All demos</a></p>
+    <h2>Master-slave selects revisited</h2>
+    <form name="two">
+        <div>
+            <select class="master-select" id="first-master" name="value">
+                <option></option>
+                <option>animals</option>
+                <option>machines</option>
+            </select>
+            <select id="first-slave"></select>
+        </div>
+        <div>
+            <select class="master-select" id="second-master" name="value">
+                <option></option>
+                <option>animals</option>
+                <option>machines</option>
+            </select>
+            <select id="second-slave"></select>
+        </div>
+        <div>
+            <select class="master-select" id="third-master" name="value">
+                <option></option>
+                <option>animals</option>
+                <option>machines</option>
+            </select>
+            <select id="third-slave"></select>
+        </div>
+    </form>
+  </body>
+</html>

Modified: kukit/azaxdemo/trunk/configure.zcml
==============================================================================
--- kukit/azaxdemo/trunk/configure.zcml	(original)
+++ kukit/azaxdemo/trunk/configure.zcml	Mon Aug  7 19:35:27 2006
@@ -276,4 +276,49 @@
         jsfile="browser/more_selectors.js"
     	/>
 
+
+  <!-- two_selects revisited content -->
+  <browser:page
+      for=".interfaces.ISimpleContent"
+      template="browser/two_select_revisited.pt"
+      name="two_select_revisited.html"
+      permission="zope2.View"
+      />
+
+  <browser:resource
+    file="browser/two_select_revisited.kss"
+    name="two_select_revisited.kss"
+  />
+
+  <browser:page
+      for=".interfaces.ISimpleContent"
+      class=".azaxview.AzaxView"
+      attribute="updateSlaveSelector"
+      name="updateSlaveSelector"
+      permission="zope2.View"
+      />
+
+
+  <!-- form submit -->
+  <browser:page
+      for=".interfaces.ISimpleContent"
+      template="browser/form_submit.pt"
+      name="form_submit.html"
+      permission="zope2.View"
+      />
+
+  <browser:resource
+    file="browser/form_submit.kss"
+    name="form_submit.kss"
+  />
+
+  <browser:page
+      for=".interfaces.ISimpleContent"
+      class=".azaxview.AzaxView"
+      attribute="formSubmitSave"
+      name="formSave"
+      permission="zope2.View"
+      />
+
+
 </configure>

From reebalazs at codespeak.net  Tue Aug  8 10:11:45 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue,  8 Aug 2006 10:11:45 +0200 (CEST)
Subject: [Kukit-checkins] r31152 - kukit/kukit.js/trunk/kukit
Message-ID: <20060808081145.74A5D10053@code0.codespeak.net>

Author: reebalazs
Date: Tue Aug  8 10:11:42 2006
New Revision: 31152

Modified:
   kukit/kukit.js/trunk/kukit/dom.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
Log:
Adding nodeContent parameter producer function

Modified: kukit/kukit.js/trunk/kukit/dom.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/dom.js	(original)
+++ kukit/kukit.js/trunk/kukit/dom.js	Tue Aug  8 10:11:42 2006
@@ -144,3 +144,32 @@
     // (also, noticed the following issue: cssQuery, when called
     // on an element, does not check the element itself.)
 };
+
+// Gets the textual content of the node
+// if recursive=false (default), does not descend into sub nodes
+kukit.dom.textContent = function(node, recursive) {
+    var value = kukit.dom._textContent(node, recursive);
+    // replace newline with spaces
+    value = value.replace(/\r\n/g, ' ');
+    value = value.replace(/[\r\n]/g, ' ');
+    return value;
+};
+
+kukit.dom._textContent = function(node, recursive) {
+    if (typeof(recursive) == 'undefined') {
+        recursive = false;
+    }
+    var value = '';
+    var childnodes = node.childNodes;
+    for (var i=0; i<childnodes.length; i++) {
+        var child = childnodes[i];
+        if (child.nodeType == 3) {
+            // Only process text nodes
+            value += child.nodeValue;
+        } else if (recursive && child.nodeType == 1) {
+            // recurr into element nodes
+            value += kukit.dom.textContent(child, true);
+        }
+    }
+    return value;
+};

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Tue Aug  8 10:11:42 2006
@@ -131,6 +131,11 @@
                 throw 'nodeAttr method needs 1 argument (attrname)';
             }
         } break;
+        case 'nodeContent': {
+            if (this.args.length != 0 && this.args.length != 1) {
+                throw 'nodeContent method needs 0 or 1 argument (recursive)';
+            }
+        } break;
         case 'stateVar': {
             if (this.args.length != 1) {
                 throw 'stateVar method needs 1 argument (varname)';
@@ -178,6 +183,13 @@
             }
             parms[key] = value;
         } break;
+        case 'nodeContent': {
+            var recursive = false;
+            if (this.args.length == 1) {
+                recursive = this.args[0];
+            }
+            parms[key] = kukit.dom.textContent(node, recursive);
+        } break;
         case 'stateVar': {
             var key2 = this.args[0];
             var value = kukit.statevars[key2];

From reebalazs at codespeak.net  Thu Aug 10 08:22:57 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 10 Aug 2006 08:22:57 +0200 (CEST)
Subject: [Kukit-checkins] r31215 - kukit/kukit.js/trunk/kukit
Message-ID: <20060810062257.24E5D1005A@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 10 08:22:54 2006
New Revision: 31215

Modified:
   kukit/kukit.js/trunk/kukit/kukit.js
   kukit/kukit.js/trunk/kukit/plugin.js
Log:
 Fix triggerEvent to be a global command, remove the dummy selector hack as it's not needed any more. Make command parser non-permissive for errors.

Modified: kukit/kukit.js/trunk/kukit/kukit.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kukit.js	(original)
+++ kukit/kukit.js/trunk/kukit/kukit.js	Thu Aug 10 08:22:54 2006
@@ -253,52 +253,47 @@
     var name = "";
 
     selector = command.getAttribute("selector");
-    if (selector == null)
-        selector = "";
-    if (selector) {
-        name = command.getAttribute("name");
-        type = command.getAttribute("selectorType");
-        if (name == null)
-            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);
-              if (childNode.nodeType != 1) 
-                  continue;
-              //kukit.logDebug('NodeName: '+ childNode.nodeName);
-              if (childNode.localName) {
-                  if (childNode.localName.toLowerCase() != "param")    
-                      continue;
-              } else {
-                  //IE does not know DOM2
-                  if (childNode.nodeName.toLowerCase() != "kukit:param")    
-                      continue;
-              }        
-              data = childNode.getAttribute('name');
-              if (data != null) { 
-                // 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;
-             }
-        }
-        if (selector != "" && name != "") {
-            var command = new kukit.cr.makeCommand(selector, name, type, params, transport);
-            this.addCommand(command);
+    name = command.getAttribute("name");
+    type = command.getAttribute("selectorType");
+    if (name == null)
+        name = "";
+    var childNodes = command.childNodes;
+    for (var n=0;n < childNodes.length;n++) {
+        var childNode = childNodes[n];
+        if (childNode.nodeType != 1) 
+            continue;
+        if (childNode.localName) {
+            if (childNode.localName.toLowerCase() != "param") {
+                throw 'Bad payload, expected param';
+            }
+        } else {
+            //IE does not know DOM2
+            if (childNode.nodeName.toLowerCase() != "kukit:param") {
+                throw 'Bad payload, expected kukit:param';
+            }
+        }        
+        data = childNode.getAttribute('name');
+        if (data != null) { 
+            // 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;
+        } else {
+            throw 'Bad payload, expected attribute "name"';
         }
     }
+    var command = new kukit.cr.makeCommand(selector, name, type, params, transport);
+    this.addCommand(command);
 }; 
 
 kukit.CommandProcessor.prototype.addCommand = function(command) {

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Thu Aug 10 08:22:54 2006
@@ -466,7 +466,7 @@
     }
     eventinstance.__trigger_event__(parms.name, actionparms, node);
 });
-kukit.cr.commandRegistry.registerFromAction('triggerEvent', kukit.cr.makeSelectorCommand);
+kukit.cr.commandRegistry.registerFromAction('triggerEvent', kukit.cr.makeGlobalCommand);
 
 // XXX Compatibility settings for old command names.
 // These will be removed as soon as all current use cases are changed.

From reebalazs at codespeak.net  Thu Aug 10 08:23:20 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 10 Aug 2006 08:23:20 +0200 (CEST)
Subject: [Kukit-checkins] r31216 - kukit/azax/trunk
Message-ID: <20060810062320.842291005A@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 10 08:23:18 2006
New Revision: 31216

Modified:
   kukit/azax/trunk/commands.py
Log:
 Remove the dummy selector hack as it's not needed any more.

Modified: kukit/azax/trunk/commands.py
==============================================================================
--- kukit/azax/trunk/commands.py	(original)
+++ kukit/azax/trunk/commands.py	Thu Aug 10 08:23:18 2006
@@ -91,18 +91,18 @@
                 % (name, )), DeprecationWarning, 2)
         else:
             plugins.Action.checkRegisteredCommand(name)
-        if isinstance(selector, basestring): 
-            self.selector = selector
-            self.selectorType = ''
-        else:
-            if selector is not None:
+        if selector is not None:
+            if isinstance(selector, basestring): 
+                # the default selector - given just as a string
+                self.selector = selector
+                self.selectorType = ''
+            else:
                 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
+        else:
+            self.selector = None
+            self.selectorType = None
         self.name = name
         self.params = []
 

From reebalazs at codespeak.net  Thu Aug 10 08:45:19 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 10 Aug 2006 08:45:19 +0200 (CEST)
Subject: [Kukit-checkins] r31218 - kukit/azax/trunk
Message-ID: <20060810064519.29FDE1005A@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 10 08:45:17 2006
New Revision: 31218

Modified:
   kukit/azax/trunk/commands.py
Log:
Enable adding command parameters from addCommand

Modified: kukit/azax/trunk/commands.py
==============================================================================
--- kukit/azax/trunk/commands.py	(original)
+++ kukit/azax/trunk/commands.py	Thu Aug 10 08:45:17 2006
@@ -37,8 +37,8 @@
 class AzaxCommands(list):
     implements(IAzaxCommands)
  
-    def addCommand(self, name, selector=None):
-        command = AzaxCommand(name, selector=selector)
+    def addCommand(self, command_name, selector=None, **kw):
+        command = AzaxCommand(command_name, selector=selector, **kw)
         self.append(command)
         return command
    
@@ -81,16 +81,16 @@
 class AzaxCommand:
     implements(IAzaxCommand)
     
-    def __init__(self, name, selector=None):
-        if plugins.Command.isRegistered(name):
+    def __init__(self, command_name, selector=None, **kw):
+        if plugins.Command.isRegistered(command_name):
             # ok. XXX this will be deprecated
             # All registerCommand commands are obsolete, by default
             import warnings, textwrap
             warnings.warn(textwrap.dedent('''\
             The usage of the kss command "%s" is deprecated''' 
-                % (name, )), DeprecationWarning, 2)
+                % (command_name, )), DeprecationWarning, 2)
         else:
-            plugins.Action.checkRegisteredCommand(name)
+            plugins.Action.checkRegisteredCommand(command_name)
         if selector is not None:
             if isinstance(selector, basestring): 
                 # the default selector - given just as a string
@@ -103,8 +103,11 @@
         else:
             self.selector = None
             self.selectorType = None
-        self.name = name
+        self.name = command_name
         self.params = []
+        # Add parameters passed in **kw
+        for key, value in kw.iteritems():
+            self.addParam(key, value)
 
     # --
     # Different parameter conversions

From reebalazs at codespeak.net  Thu Aug 10 09:43:38 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 10 Aug 2006 09:43:38 +0200 (CEST)
Subject: [Kukit-checkins] r31219 - kukit/kukit.js/trunk/kukit
Message-ID: <20060810074338.6B23510050@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 10 09:43:36 2006
New Revision: 31219

Modified:
   kukit/kukit.js/trunk/kukit/plugin.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
Log:
Adding setStyle action, and restricting setAttribute to reject 'style'.

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Thu Aug 10 09:43:36 2006
@@ -351,10 +351,19 @@
 
 kukit.ar.actionRegistry.register('setAttribute', function(node, parms, eventrule) {
     parms = kukit.pl.completeParms(parms, ['name', 'value'], {}, 'setAttribute action');
+    if (parms.name.toLowerCase() == 'style') {
+        throw 'Style attribute is not allowed with setAttribute';
+    }
     node.setAttribute(parms.name, parms.value);
 });
 kukit.cr.commandRegistry.registerFromAction('setAttribute', kukit.cr.makeSelectorCommand);
 
+kukit.ar.actionRegistry.register('setStyle', function(node, parms, eventrule) {
+    parms = kukit.pl.completeParms(parms, ['name', 'value'], {}, 'setStyle action');
+    node.style[parms.name] = parms.value;
+});
+kukit.cr.commandRegistry.registerFromAction('setStyle', kukit.cr.makeSelectorCommand);
+
 kukit.ar.actionRegistry.register('insertHTMLAfter', function(node, parms, eventrule) {
     parms = kukit.pl.completeParms(parms, ['html'], {}, 'insertHTMLAfter action');
     parms.html = kukit.dom.forceToDom(parms.html);

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Thu Aug 10 09:43:36 2006
@@ -130,6 +130,9 @@
             if (this.args.length != 1) {
                 throw 'nodeAttr method needs 1 argument (attrname)';
             }
+            if (this.args[0].toLowerCase() == 'style') {
+                throw 'nodeAttr method does not accept "style" as attrname';
+            }
         } break;
         case 'nodeContent': {
             if (this.args.length != 0 && this.args.length != 1) {

From reebalazs at codespeak.net  Thu Aug 10 09:44:12 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 10 Aug 2006 09:44:12 +0200 (CEST)
Subject: [Kukit-checkins] r31220 - kukit/azax/trunk/plugins
Message-ID: <20060810074412.1A6A410050@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 10 09:44:10 2006
New Revision: 31220

Modified:
   kukit/azax/trunk/plugins/configure.zcml
Log:
Adding setStyle action, and restricting setAttribute to reject 'style'.

Modified: kukit/azax/trunk/plugins/configure.zcml
==============================================================================
--- kukit/azax/trunk/plugins/configure.zcml	(original)
+++ kukit/azax/trunk/plugins/configure.zcml	Thu Aug 10 09:44:10 2006
@@ -197,6 +197,12 @@
         />
 
     <azax:registerAction
+        name="setStyle"
+        command_factory="selector"
+        params_mandatory="name value"
+        />
+
+    <azax:registerAction
         name="setStateVar"
         command_factory="global"
         params_mandatory="varname value"

From reebalazs at codespeak.net  Thu Aug 10 17:22:48 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 10 Aug 2006 17:22:48 +0200 (CEST)
Subject: [Kukit-checkins] r31233 - kukit/kukit.js/trunk/kukit
Message-ID: <20060810152248.9555610063@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 10 17:22:46 2006
New Revision: 31233

Modified:
   kukit/kukit.js/trunk/kukit/plugin.js
Log:
Add allowbubbling option to events

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Thu Aug 10 17:22:46 2006
@@ -135,14 +135,15 @@
 };
 
 kukit.pl.NativeEventBinder.prototype.__bind__ = function(name, parms, func_to_bind, node) {
-    parms = kukit.pl.completeParms(parms, [], {'preventdefault': ''}, 'native event binding');
+    parms = kukit.pl.completeParms(parms, [], {'preventdefault': '', 'allowbubbling': ''}, 'native event binding');
     kukit.pl.evalBool(parms, 'preventdefault', 'native event binding');
+    kukit.pl.evalBool(parms, 'allowbubbling', 'native event binding');
     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) {
+        if (parms.allowbubbling || target == node) {
             // Execute the action
             func_to_bind();
         } else {

From reebalazs at codespeak.net  Thu Aug 10 17:49:33 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 10 Aug 2006 17:49:33 +0200 (CEST)
Subject: [Kukit-checkins] r31235 - kukit/azax/trunk
Message-ID: <20060810154933.BBA8B10063@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 10 17:49:29 2006
New Revision: 31235

Added:
   kukit/azax/trunk/LICENSE
Modified:
   kukit/azax/trunk/BeautifulSoup.py
   kukit/azax/trunk/DEPENDENCIES.txt
Log:
Upgrade BeautifulSoup to version 3.0.3

Modified: kukit/azax/trunk/BeautifulSoup.py
==============================================================================
--- kukit/azax/trunk/BeautifulSoup.py	(original)
+++ kukit/azax/trunk/BeautifulSoup.py	Thu Aug 10 17:49:29 2006
@@ -1,206 +1,304 @@
 """Beautiful Soup
 Elixir and Tonic
 "The Screen-Scraper's Friend"
-v2.1.1
 http://www.crummy.com/software/BeautifulSoup/
 
-Beautiful Soup parses arbitrarily invalid XML- or HTML-like substance
-into a tree representation. It provides methods and Pythonic idioms
-that make it easy to search and modify the tree.
-
-A well-formed XML/HTML document will yield a well-formed data
-structure. An ill-formed XML/HTML document will yield a
-correspondingly ill-formed data structure. If your document is only
-locally well-formed, you can use this library to find and process the
-well-formed part of it. The BeautifulSoup class has heuristics for
-obtaining a sensible parse tree in the face of common HTML errors.
-
-Beautiful Soup has no external dependencies. It works with Python 2.2
-and up.
-
-Beautiful Soup defines classes for four different parsing strategies:
+Beautiful Soup parses a (possibly invalid) XML or HTML document into a
+tree representation. It provides methods and Pythonic idioms that make
+it easy to navigate, search, and modify the tree.
+
+A well-structured XML/HTML document yields a well-behaved data
+structure. An ill-structured XML/HTML document yields a
+correspondingly ill-behaved data structure. If your document is only
+locally well-structured, you can use this library to find and process
+the well-structured part of it.
+
+Beautiful Soup works with Python 2.2 and up. It has no external
+dependencies, but you'll have more success at converting data to UTF-8
+if you also install these three packages:
+
+* chardet, for auto-detecting character encodings
+  http://chardet.feedparser.org/
+* cjkcodecs and iconv_codec, which add more encodings to the ones supported
+  by stock Python.
+  http://cjkpython.i18n.org/
 
+Beautiful Soup defines classes for two main parsing strategies:
+    
  * BeautifulStoneSoup, for parsing XML, SGML, or your domain-specific
    language that kind of looks like XML.
 
  * BeautifulSoup, for parsing run-of-the-mill HTML code, be it valid
-   or invalid.
+   or invalid. This class has web browser-like heuristics for
+   obtaining a sensible parse tree in the face of common HTML errors.
 
- * ICantBelieveItsBeautifulSoup, for parsing valid but bizarre HTML
-   that trips up BeautifulSoup.
-
- * BeautifulSOAP, for making it easier to parse XML documents that use
-   lots of subelements containing a single string, where you'd prefer
-   they put that string into an attribute (such as SOAP messages).
-
-You can subclass BeautifulStoneSoup or BeautifulSoup to create a
-parsing strategy specific to an XML schema or a particular bizarre
-HTML document. Typically your subclass would just override
-SELF_CLOSING_TAGS and/or NESTABLE_TAGS.
+Beautiful Soup also defines a class (UnicodeDammit) for autodetecting
+the encoding of an HTML or XML document, and converting it to
+Unicode. Much of this code is taken from Mark Pilgrim's Universal Feed
+Parser.
+
+For more than you ever wanted to know about Beautiful Soup, see the
+documentation:
+http://www.crummy.com/software/BeautifulSoup/documentation.html
 """
 from __future__ import generators
 
-__author__ = "Leonard Richardson (leonardr at segfault.org)"
-__version__ = "2.1.1"
-__date__ = "$Date: 2004/10/18 00:14:20 $"
-__copyright__ = "Copyright (c) 2004-2005 Leonard Richardson"
+__author__ = "Leonard Richardson (crummy.com)"
+__contributors__ = ["Sam Ruby (intertwingly.net)",
+                    "the unwitting Mark Pilgrim (diveintomark.org)",
+                    "http://www.crummy.com/software/BeautifulSoup/AUTHORS.html"]
+__version__ = "3.0.3"
+__copyright__ = "Copyright (c) 2004-2006 Leonard Richardson"
 __license__ = "PSF"
 
 from sgmllib import SGMLParser, SGMLParseError
+import codecs
 import types
 import re
 import sgmllib
+from htmlentitydefs import name2codepoint
 
-#This code makes Beautiful Soup able to parse XML with namespaces
+# This RE makes Beautiful Soup able to parse XML with namespaces.
 sgmllib.tagfind = re.compile('[a-zA-Z][-_.:a-zA-Z0-9]*')
 
-class NullType(object):
+# This RE makes Beautiful Soup capable of recognizing numeric character
+# references that use hexadecimal.
+sgmllib.charref = re.compile('&#(\d+|x[0-9a-fA-F]+);')
 
-    """Similar to NoneType with a corresponding singleton instance
-    'Null' that, unlike None, accepts any message and returns itself.
+DEFAULT_OUTPUT_ENCODING = "utf-8"
 
-    Examples:
-    >>> Null("send", "a", "message")("and one more",
-    ...      "and what you get still") is Null
-    True
-    """
-
-    def __new__(cls):                    return Null
-    def __call__(self, *args, **kwargs): return Null
-##    def __getstate__(self, *args):       return Null
-    def __getattr__(self, attr):         return Null
-    def __getitem__(self, item):         return Null
-    def __setattr__(self, attr, value):  pass
-    def __setitem__(self, item, value):  pass
-    def __len__(self):                   return 0
-    # FIXME: is this a python bug? otherwise ``for x in Null: pass``
-    #        never terminates...
-    def __iter__(self):                  return iter([])
-    def __contains__(self, item):        return False
-    def __repr__(self):                  return "Null"
-Null = object.__new__(NullType)
+# First, the classes that represent markup elements.
 
 class PageElement:
     """Contains the navigational information for some part of the page
     (either a tag or a piece of text)"""
 
-    def setup(self, parent=Null, previous=Null):
+    def setup(self, parent=None, previous=None):
         """Sets up the initial relations between this element and
-        other elements."""
+        other elements."""        
         self.parent = parent
         self.previous = previous
-        self.next = Null
-        self.previousSibling = Null
-        self.nextSibling = Null
+        self.next = None
+        self.previousSibling = None
+        self.nextSibling = None
         if self.parent and self.parent.contents:
             self.previousSibling = self.parent.contents[-1]
             self.previousSibling.nextSibling = self
 
-    def findNext(self, name=None, attrs={}, text=None):
+    def replaceWith(self, replaceWith):        
+        oldParent = self.parent
+        myIndex = self.parent.contents.index(self)
+        if hasattr(replaceWith, 'parent') and replaceWith.parent == self.parent:
+            # We're replacing this element with one of its siblings.
+            index = self.parent.contents.index(replaceWith)
+            if index and index < myIndex:
+                # Furthermore, it comes before this element. That
+                # means that when we extract it, the index of this
+                # element will change.
+                myIndex = myIndex - 1
+        self.extract()        
+        oldParent.insert(myIndex, replaceWith)
+        
+    def extract(self):
+        """Destructively rips this element out of the tree."""        
+        if self.parent:
+            try:
+                self.parent.contents.remove(self)
+            except ValueError:
+                pass
+
+        #Find the two elements that would be next to each other if
+        #this element (and any children) hadn't been parsed. Connect
+        #the two.        
+        lastChild = self._lastRecursiveChild()
+        nextElement = lastChild.next
+
+        if self.previous:
+            self.previous.next = nextElement
+        if nextElement:
+            nextElement.previous = self.previous
+        self.previous = None
+        lastChild.next = None
+
+        self.parent = None        
+        if self.previousSibling:
+            self.previousSibling.nextSibling = self.nextSibling
+        if self.nextSibling:
+            self.nextSibling.previousSibling = self.previousSibling
+        self.previousSibling = self.nextSibling = None       
+
+    def _lastRecursiveChild(self):
+        "Finds the last element beneath this object to be parsed."
+        lastChild = self
+        while hasattr(lastChild, 'contents') and lastChild.contents:
+            lastChild = lastChild.contents[-1]
+        return lastChild
+
+    def insert(self, position, newChild):
+        if (isinstance(newChild, basestring)
+            or isinstance(newChild, unicode)) \
+            and not isinstance(newChild, NavigableString):
+            newChild = NavigableString(newChild)        
+
+        position =  min(position, len(self.contents))
+        if hasattr(newChild, 'parent') and newChild.parent != None:
+            # We're 'inserting' an element that's already one
+            # of this object's children. 
+            if newChild.parent == self:
+                index = self.find(newChild)
+                if index and index < position:
+                    # Furthermore we're moving it further down the
+                    # list of this object's children. That means that
+                    # when we extract this element, our target index
+                    # will jump down one.
+                    position = position - 1
+            newChild.extract()
+            
+        newChild.parent = self
+        previousChild = None
+        if position == 0:
+            newChild.previousSibling = None
+            newChild.previous = self
+        else:
+            previousChild = self.contents[position-1]
+            newChild.previousSibling = previousChild
+            newChild.previousSibling.nextSibling = newChild
+            newChild.previous = previousChild._lastRecursiveChild()
+        if newChild.previous:
+            newChild.previous.next = newChild        
+
+        newChildsLastElement = newChild._lastRecursiveChild()
+
+        if position >= len(self.contents):
+            newChild.nextSibling = None
+            
+            parent = self
+            parentsNextSibling = None
+            while not parentsNextSibling:
+                parentsNextSibling = parent.nextSibling
+                parent = parent.parent
+                if not parent: # This is the last element in the document.
+                    break
+            if parentsNextSibling:
+                newChildsLastElement.next = parentsNextSibling
+            else:
+                newChildsLastElement.next = None
+        else:
+            nextChild = self.contents[position]            
+            newChild.nextSibling = nextChild            
+            if newChild.nextSibling:
+                newChild.nextSibling.previousSibling = newChild
+            newChildsLastElement.next = nextChild
+
+        if newChildsLastElement.next:
+            newChildsLastElement.next.previous = newChildsLastElement
+        self.contents.insert(position, newChild)
+
+    def findNext(self, name=None, attrs={}, text=None, **kwargs):
         """Returns the first item that matches the given criteria and
         appears after this Tag in the document."""
-        return self._first(self.fetchNext, name, attrs, text)
-    firstNext = findNext
+        return self._findOne(self.findAllNext, name, attrs, text, **kwargs)
 
-    def fetchNext(self, name=None, attrs={}, text=None, limit=None):
+    def findAllNext(self, name=None, attrs={}, text=None, limit=None,
+                    **kwargs):
         """Returns all items that match the given criteria and appear
         before after Tag in the document."""
-        return self._fetch(name, attrs, text, limit, self.nextGenerator)
+        return self._findAll(name, attrs, text, limit, self.nextGenerator)
 
-    def findNextSibling(self, name=None, attrs={}, text=None):
+    def findNextSibling(self, name=None, attrs={}, text=None, **kwargs):
         """Returns the closest sibling to this Tag that matches the
         given criteria and appears after this Tag in the document."""
-        return self._first(self.fetchNextSiblings, name, attrs, text)
-    firstNextSibling = findNextSibling
+        return self._findOne(self.findNextSiblings, name, attrs, text,
+                             **kwargs)
 
-    def fetchNextSiblings(self, name=None, attrs={}, text=None, limit=None):
+    def findNextSiblings(self, name=None, attrs={}, text=None, limit=None,
+                         **kwargs):
         """Returns the siblings of this Tag that match the given
         criteria and appear after this Tag in the document."""
-        return self._fetch(name, attrs, text, limit, self.nextSiblingGenerator)
+        return self._findAll(name, attrs, text, limit,
+                             self.nextSiblingGenerator, **kwargs)
+    fetchNextSiblings = findNextSiblings # Compatibility with pre-3.x
 
-    def findPrevious(self, name=None, attrs={}, text=None):
+    def findPrevious(self, name=None, attrs={}, text=None, **kwargs):
         """Returns the first item that matches the given criteria and
         appears before this Tag in the document."""
-        return self._first(self.fetchPrevious, name, attrs, text)
+        return self._findOne(self.findAllPrevious, name, attrs, text, **kwargs)
 
-    def fetchPrevious(self, name=None, attrs={}, text=None, limit=None):
+    def findAllPrevious(self, name=None, attrs={}, text=None, limit=None,
+                        **kwargs):
         """Returns all items that match the given criteria and appear
         before this Tag in the document."""
-        return self._fetch(name, attrs, text, limit, self.previousGenerator)
-    firstPrevious = findPrevious
+        return self._findAll(name, attrs, text, limit, self.previousGenerator,
+                           **kwargs)
+    fetchPrevious = findAllPrevious # Compatibility with pre-3.x
 
-    def findPreviousSibling(self, name=None, attrs={}, text=None):
+    def findPreviousSibling(self, name=None, attrs={}, text=None, **kwargs):
         """Returns the closest sibling to this Tag that matches the
         given criteria and appears before this Tag in the document."""
-        return self._first(self.fetchPreviousSiblings, name, attrs, text)
-    firstPreviousSibling = findPreviousSibling
+        return self._findOne(self.findPreviousSiblings, name, attrs, text,
+                             **kwargs)
 
-    def fetchPreviousSiblings(self, name=None, attrs={}, text=None,
-                              limit=None):
+    def findPreviousSiblings(self, name=None, attrs={}, text=None,
+                             limit=None, **kwargs):
         """Returns the siblings of this Tag that match the given
         criteria and appear before this Tag in the document."""
-        return self._fetch(name, attrs, text, limit,
-                           self.previousSiblingGenerator)
+        return self._findAll(name, attrs, text, limit,
+                             self.previousSiblingGenerator, **kwargs)
+    fetchPreviousSiblings = findPreviousSiblings # Compatibility with pre-3.x
 
-    def findParent(self, name=None, attrs={}):
+    def findParent(self, name=None, attrs={}, **kwargs):
         """Returns the closest parent of this Tag that matches the given
         criteria."""
-        r = Null
-        l = self.fetchParents(name, attrs, 1)
+        # NOTE: We can't use _findOne because findParents takes a different
+        # set of arguments.
+        r = None
+        l = self.findParents(name, attrs, 1)
         if l:
             r = l[0]
         return r
-    firstParent = findParent
 
-    def fetchParents(self, name=None, attrs={}, limit=None):
+    def findParents(self, name=None, attrs={}, limit=None, **kwargs):
         """Returns the parents of this Tag that match the given
         criteria."""
-        return self._fetch(name, attrs, None, limit, self.parentGenerator)
+
+        return self._findAll(name, attrs, None, limit, self.parentGenerator,
+                             **kwargs)
+    fetchParents = findParents # Compatibility with pre-3.x
 
     #These methods do the real heavy lifting.
 
-    def _first(self, method, name, attrs, text):
-        r = Null
-        l = method(name, attrs, text, 1)
+    def _findOne(self, method, name, attrs, text, **kwargs):
+        r = None
+        l = method(name, attrs, text, 1, **kwargs)
         if l:
             r = l[0]
         return r
     
-    def _fetch(self, name, attrs, text, limit, generator):
+    def _findAll(self, name, attrs, text, limit, generator, **kwargs):
         "Iterates over a generator looking for things that match."
-        if not hasattr(attrs, 'items'):
-            attrs = {'class' : attrs}
 
-        results = []
+        if isinstance(name, SoupStrainer):
+            strainer = name
+        else:
+            # Build a SoupStrainer
+            strainer = SoupStrainer(name, attrs, text, **kwargs)
+        results = ResultSet(strainer)
         g = generator()
         while True:
             try:
                 i = g.next()
             except StopIteration:
                 break
-            found = None
-            if isinstance(i, Tag):
-                if not text:
-                    if not name or self._matches(i, name):
-                        match = True
-                        for attr, matchAgainst in attrs.items():
-                            check = i.get(attr)
-                            if not self._matches(check, matchAgainst):
-                                match = False
-                                break
-                        if match:
-                            found = i
-            elif text:
-                if self._matches(i, text):
-                    found = i                    
-            if found:
-                results.append(found)
-                if limit and len(results) >= limit:
-                    break
+            if i:
+                found = strainer.search(i)
+                if found:
+                    results.append(found)
+                    if limit and len(results) >= limit:
+                        break
         return results
 
-    #Generators that can be used to navigate starting from both
-    #NavigableTexts and Tags.                
+    #These Generators can be used to navigate starting from both
+    #NavigableStrings and Tags.                
     def nextGenerator(self):
         i = self
         while i:
@@ -231,56 +329,91 @@
             i = i.parent
             yield i
 
-    def _matches(self, chunk, howToMatch):
-        #print 'looking for %s in %s' % (howToMatch, chunk)
-        #
-        # If given a list of items, return true if the list contains a
-        # text element that matches.
-        if isList(chunk) and not isinstance(chunk, Tag):
-            for tag in chunk:
-                if isinstance(tag, NavigableText) and self._matches(tag, howToMatch):
-                    return True
-            return False
-        if callable(howToMatch):
-            return howToMatch(chunk)
-        if isinstance(chunk, Tag):
-            #Custom match methods take the tag as an argument, but all other
-            #ways of matching match the tag name as a string
-            chunk = chunk.name
-        #Now we know that chunk is a string
-        if not isinstance(chunk, basestring):
-            chunk = str(chunk)
-        if hasattr(howToMatch, 'match'):
-            # It's a regexp object.
-            return howToMatch.search(chunk)
-        if isList(howToMatch):
-            return chunk in howToMatch
-        if hasattr(howToMatch, 'items'):
-            return howToMatch.has_key(chunk)
-        #It's just a string
-        return str(howToMatch) == chunk
+    # Utility methods
+    def substituteEncoding(self, str, encoding=None):
+        encoding = encoding or "utf-8"
+        return str.replace("%SOUP-ENCODING%", encoding)    
+
+    def toEncoding(self, s, encoding=None):
+        """Encodes an object to a string in some encoding, or to Unicode.
+        ."""
+        if isinstance(s, unicode):
+            if encoding:
+                s = s.encode(encoding)
+        elif isinstance(s, str):
+            if encoding:
+                s = s.encode(encoding)
+            else:
+                s = unicode(s)
+        else:
+            if encoding:
+                s  = self.toEncoding(str(s), encoding)
+            else:
+                s = unicode(s)
+        return s
 
-class NavigableText(PageElement):
+class NavigableString(unicode, PageElement):
 
     def __getattr__(self, attr):
-        "For backwards compatibility, text.string gives you text"
+        """text.string gives you text. This is for backwards
+        compatibility for Navigable*String, but for CData* it lets you
+        get the string without the CData wrapper."""
         if attr == 'string':
             return self
         else:
             raise AttributeError, "'%s' object has no attribute '%s'" % (self.__class__.__name__, attr)
+
+    def __unicode__(self):
+        return __str__(self, None)
+
+    def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING):
+        if encoding:
+            return self.encode(encoding)
+        else:
+            return self
         
-class NavigableString(str, NavigableText):
-    pass
+class CData(NavigableString):
 
-class NavigableUnicodeString(unicode, NavigableText):
-    pass
+    def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING):
+        return "<![CDATA[%s]]>" % NavigableString.__str__(self, encoding)
 
-class Tag(PageElement):
+class ProcessingInstruction(NavigableString):
+    def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING):
+        output = self
+        if "%SOUP-ENCODING%" in output:
+            output = self.substituteEncoding(output, encoding)
+        return "<?%s?>" % self.toEncoding(output, encoding)
+
+class Comment(NavigableString):
+    def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING):
+        return "<!--%s-->" % NavigableString.__str__(self, encoding)    
+
+class Declaration(NavigableString):
+    def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING):
+        return "<!%s>" % NavigableString.__str__(self, encoding)        
 
+class Tag(PageElement):
     """Represents a found HTML tag with its attributes and contents."""
 
-    def __init__(self, name, attrs=None, parent=Null, previous=Null):
+    XML_ENTITIES_TO_CHARS = { 'apos' : "'",
+                              "quot" : '"',
+                              "amp" : "&",
+                              "lt" : "<",
+                              "gt" : ">"
+                              }
+    # An RE for finding ampersands that aren't the start of of a
+    # numeric entity.
+    BARE_AMPERSAND = re.compile("&(?!#\d+;|#x[0-9a-fA-F]+;|\w+;)")
+
+    def __init__(self, parser, name, attrs=None, parent=None,
+                 previous=None):
         "Basic constructor."
+
+        # We don't actually store the parser object: that lets extracted
+        # chunks be garbage-collected
+        self.parserClass = parser.__class__
+        self.isSelfClosing = parser.isSelfClosingTag(name)
+        self.convertHTMLEntities = parser.convertHTMLEntities
         self.name = name
         if attrs == None:
             attrs = []
@@ -288,6 +421,7 @@
         self.contents = []
         self.setup(parent, previous)
         self.hidden = False
+        self.containsSubstitutions = False
 
     def get(self, key, default=None):
         """Returns the value of the 'key' attribute for the tag, or
@@ -295,6 +429,9 @@
         attribute."""
         return self._getAttrMap().get(key, default)    
 
+    def has_key(self, key):
+        return self._getAttrMap().has_key(key)
+
     def __getitem__(self, key):
         """tag[key] returns the value of the 'key' attribute for the tag,
         and throws an exception if it's not there."""
@@ -342,15 +479,16 @@
 
     def __call__(self, *args, **kwargs):
         """Calling a tag like a function is the same as calling its
-        fetch() method. Eg. tag('a') returns a list of all the A tags
+        findAll() method. Eg. tag('a') returns a list of all the A tags
         found within this tag."""
-        return apply(self.fetch, args, kwargs)
+        return apply(self.findAll, args, kwargs)
 
     def __getattr__(self, tag):
+        #print "Getattr %s.%s" % (self.__class__, tag)
         if len(tag) > 3 and tag.rfind('Tag') == len(tag)-3:
-            return self.first(tag[:-3])
+            return self.find(tag[:-3])
         elif tag.find('__') != 0:
-            return self.first(tag)
+            return self.find(tag)
 
     def __eq__(self, other):
         """Returns true iff this tag has the same name, the same attributes,
@@ -370,39 +508,91 @@
         as defined in __eq__."""
         return not self == other
 
-    def __repr__(self):
+    def __repr__(self, encoding=DEFAULT_OUTPUT_ENCODING):
         """Renders this tag as a string."""
-        return str(self)
+        return self.__str__(encoding)
 
     def __unicode__(self):
-        return self.__str__(1)
+        return self.__str__(None)
+
+    def _convertEntities(self, match):
+        x = match.group(1)
+        if x in name2codepoint:
+            return unichr(name2codepoint[x])            
+        elif "&" + x + ";" in self.XML_ENTITIES_TO_CHARS:
+            return '&%s;' % x
+        else:
+            return '&amp;%s;' % x
 
-    def __str__(self, needUnicode=None, showStructureIndent=None):
+    def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING,
+                prettyPrint=False, indentLevel=0):
         """Returns a string or Unicode representation of this tag and
-        its contents.
+        its contents. To get Unicode, pass None for encoding.
 
         NOTE: since Python's HTML parser consumes whitespace, this
         method is not certain to reproduce the whitespace present in
         the original string."""
-        
+
+        encodedName = self.toEncoding(self.name, encoding)
+
         attrs = []
         if self.attrs:
             for key, val in self.attrs:
-                attrs.append('%s="%s"' % (key, val))
+                fmt = '%s="%s"'
+                if isString(val):                    
+                    if self.containsSubstitutions and '%SOUP-ENCODING%' in val:
+                        val = self.substituteEncoding(val, encoding)
+
+                    # The attribute value either:
+                    #
+                    # * Contains no embedded double quotes or single quotes.
+                    #   No problem: we enclose it in double quotes.
+                    # * Contains embedded single quotes. No problem:
+                    #   double quotes work here too.
+                    # * Contains embedded double quotes. No problem:
+                    #   we enclose it in single quotes.
+                    # * Embeds both single _and_ double quotes. This
+                    #   can't happen naturally, but it can happen if
+                    #   you modify an attribute value after parsing
+                    #   the document. Now we have a bit of a
+                    #   problem. We solve it by enclosing the
+                    #   attribute in single quotes, and escaping any
+                    #   embedded single quotes to XML entities.
+                    if '"' in val:
+                        # This can't happen naturally, but it can happen
+                        # if you modify an attribute value after parsing.
+                        if "'" in val:
+                            val = val.replace('"', "&quot;")
+                        else:
+                            fmt = "%s='%s'"
+
+                    # Optionally convert any HTML entities
+                    if self.convertHTMLEntities:
+                        val = re.sub("&(\w+);", self._convertEntities, val)
+
+                    # Now we're okay w/r/t quotes. But the attribute
+                    # value might also contain angle brackets, or
+                    # ampersands that aren't part of entities. We need
+                    # to escape those to XML entities too.
+                    val = val.replace("<", "&lt;").replace(">", "&gt;")
+                    val = self.BARE_AMPERSAND.sub("&amp;", val)
+
+                                      
+                attrs.append(fmt % (self.toEncoding(key, encoding),
+                                    self.toEncoding(val, encoding)))
         close = ''
         closeTag = ''
-        if self.isSelfClosing():
+        if self.isSelfClosing:
             close = ' /'
         else:
-            closeTag = '</%s>' % self.name
-        indentIncrement = None        
-        if showStructureIndent != None:
-            indentIncrement = showStructureIndent
-            if not self.hidden:
-                indentIncrement += 1
-        contents = self.renderContents(indentIncrement, needUnicode=needUnicode)        
-        if showStructureIndent:
-            space = '\n%s' % (' ' * showStructureIndent)
+            closeTag = '</%s>' % encodedName
+
+        indentTag, indentContents = 0, 0
+        if prettyPrint:
+            indentTag = indentLevel
+            space = (' ' * (indentTag-1))
+            indentContents = indentTag + 1
+        contents = self.renderContents(encoding, prettyPrint, indentContents)
         if self.hidden:
             s = contents
         else:
@@ -410,73 +600,61 @@
             attributeString = ''
             if attrs:
                 attributeString = ' ' + ' '.join(attrs)            
-            if showStructureIndent:
+            if prettyPrint:
                 s.append(space)
-            s.append('<%s%s%s>' % (self.name, attributeString, close))
+            s.append('<%s%s%s>' % (encodedName, attributeString, close))
+            if prettyPrint:
+                s.append("\n")
             s.append(contents)
-            if closeTag and showStructureIndent != None:
+            if prettyPrint and contents and contents[-1] != "\n":
+                s.append("\n")
+            if prettyPrint and closeTag:
                 s.append(space)
             s.append(closeTag)
+            if prettyPrint and closeTag and self.nextSibling:
+                s.append("\n")
             s = ''.join(s)
-        isUnicode = type(s) == types.UnicodeType
-        if needUnicode and not isUnicode:
-            s = unicode(s)
-        elif isUnicode and needUnicode==False:
-            s = str(s)
         return s
 
-    def prettify(self, needUnicode=None):
-        return self.__str__(needUnicode, showStructureIndent=True)
+    def prettify(self, encoding=DEFAULT_OUTPUT_ENCODING):
+        return self.__str__(encoding, True)
 
-    def renderContents(self, showStructureIndent=None, needUnicode=None):
-        """Renders the contents of this tag as a (possibly Unicode) 
-        string."""
+    def renderContents(self, encoding=DEFAULT_OUTPUT_ENCODING,
+                       prettyPrint=False, indentLevel=0):
+        """Renders the contents of this tag as a string in the given
+        encoding. If encoding is None, returns a Unicode string.."""
         s=[]
         for c in self:
             text = None
-            if isinstance(c, NavigableUnicodeString) or type(c) == types.UnicodeType:
-                text = unicode(c)
+            if isinstance(c, NavigableString):
+                text = c.__str__(encoding)
             elif isinstance(c, Tag):
-                s.append(c.__str__(needUnicode, showStructureIndent))
-            elif needUnicode:
-                text = unicode(c)
-            else:
-                text = str(c)
+                s.append(c.__str__(encoding, prettyPrint, indentLevel))
+            if text and prettyPrint:
+                text = text.strip()              
             if text:
-                if showStructureIndent != None:
-                    if text[-1] == '\n':
-                        text = text[:-1]
+                if prettyPrint:
+                    s.append(" " * (indentLevel-1))
                 s.append(text)
+                if prettyPrint:
+                    s.append("\n")
         return ''.join(s)    
 
     #Soup methods
 
-    def firstText(self, text, recursive=True):
-        """Convenience method to retrieve the first piece of text matching the
-        given criteria. 'text' can be a string, a regular expression object,
-        a callable that takes a string and returns whether or not the
-        string 'matches', etc."""
-        return self.first(recursive=recursive, text=text)
-
-    def fetchText(self, text, recursive=True, limit=None):
-        """Convenience method to retrieve all pieces of text matching the
-        given criteria. 'text' can be a string, a regular expression object,
-        a callable that takes a string and returns whether or not the
-        string 'matches', etc."""
-        return self.fetch(recursive=recursive, text=text, limit=limit)
-
-    def first(self, name=None, attrs={}, recursive=True, text=None):
-        """Return only the first child of this
-        Tag matching the given criteria."""
-        r = Null
-        l = self.fetch(name, attrs, recursive, text, 1)
+    def find(self, name=None, attrs={}, recursive=True, text=None,
+             **kwargs):
+        """Return only the first child of this Tag matching the given
+        criteria."""
+        r = None
+        l = self.findAll(name, attrs, recursive, text, 1, **kwargs)
         if l:
             r = l[0]
         return r
-    findChild = first
+    findChild = find
 
-    def fetch(self, name=None, attrs={}, recursive=True, text=None,
-              limit=None):
+    def findAll(self, name=None, attrs={}, recursive=True, text=None,
+                limit=None, **kwargs):
         """Extracts a list of Tag objects that match the given
         criteria.  You can specify the name of the Tag and any
         attributes you want the Tag to have.
@@ -489,18 +667,20 @@
         generator = self.recursiveChildGenerator
         if not recursive:
             generator = self.childGenerator
-        return self._fetch(name, attrs, text, limit, generator)
-    fetchChildren = fetch
+        return self._findAll(name, attrs, text, limit, generator, **kwargs)
+    findChildren = findAll
+
+    # Pre-3.x compatibility methods
+    first = find
+    fetch = findAll
     
-    #Utility methods
+    def fetchText(self, text=None, recursive=True, limit=None):
+        return self.findAll(text=text, recursive=recursive, limit=limit)
 
-    def isSelfClosing(self):
-        """Returns true iff this is a self-closing tag as defined in the HTML
-        standard.
-
-        TODO: This is specific to BeautifulSoup and its subclasses, but it's
-        used by __str__"""
-        return self.name in BeautifulSoup.SELF_CLOSING_TAGS
+    def firstText(self, text=None, recursive=True):
+        return self.find(text=text, recursive=recursive)
+    
+    #Utility methods
 
     def append(self, tag):
         """Appends the given tag to the contents of this tag."""
@@ -538,6 +718,134 @@
                         break
         raise StopIteration
 
+# Next, a couple classes to represent queries and their results.
+class SoupStrainer:
+    """Encapsulates a number of ways of matching a markup element (tag or
+    text)."""
+
+    def __init__(self, name=None, attrs={}, text=None, **kwargs):
+        self.name = name
+        if isString(attrs):
+            kwargs['class'] = attrs
+            attrs = None
+        if kwargs:
+            if attrs:
+                attrs = attrs.copy()
+                attrs.update(kwargs)
+            else:
+                attrs = kwargs
+        self.attrs = attrs
+        self.text = text
+
+    def __str__(self):
+        if self.text:
+            return self.text
+        else:
+            return "%s|%s" % (self.name, self.attrs)
+    
+    def searchTag(self, markupName=None, markupAttrs={}):
+        found = None
+        markup = None
+        if isinstance(markupName, Tag):
+            markup = markupName
+            markupAttrs = markup
+        callFunctionWithTagData = callable(self.name) \
+                                and not isinstance(markupName, Tag)
+
+        if (not self.name) \
+               or callFunctionWithTagData \
+               or (markup and self._matches(markup, self.name)) \
+               or (not markup and self._matches(markupName, self.name)):
+            if callFunctionWithTagData:
+                match = self.name(markupName, markupAttrs)
+            else:
+                match = True            
+                markupAttrMap = None
+                for attr, matchAgainst in self.attrs.items():
+                    if not markupAttrMap:
+                         if hasattr(markupAttrs, 'get'):
+                            markupAttrMap = markupAttrs
+                         else:
+                            markupAttrMap = {}
+                            for k,v in markupAttrs:
+                                markupAttrMap[k] = v
+                    attrValue = markupAttrMap.get(attr)
+                    if not self._matches(attrValue, matchAgainst):
+                        match = False
+                        break
+            if match:
+                if markup:
+                    found = markup
+                else:
+                    found = markupName
+        return found
+
+    def search(self, markup):
+        #print 'looking for %s in %s' % (self, markup)
+        found = None
+        # If given a list of items, scan it for a text element that
+        # matches.        
+        if isList(markup) and not isinstance(markup, Tag):
+            for element in markup:
+                if isinstance(element, NavigableString) \
+                       and self.search(element):
+                    found = element
+                    break
+        # If it's a Tag, make sure its name or attributes match.
+        # Don't bother with Tags if we're searching for text.
+        elif isinstance(markup, Tag):
+            if not self.text:
+                found = self.searchTag(markup)
+        # If it's text, make sure the text matches.
+        elif isinstance(markup, NavigableString) or \
+                 isString(markup):
+            if self._matches(markup, self.text):
+                found = markup
+        else:
+            raise Exception, "I don't know how to match against a %s" \
+                  % markup.__class__
+        return found
+        
+    def _matches(self, markup, matchAgainst):    
+        #print "Matching %s against %s" % (markup, matchAgainst)
+        result = False
+        if matchAgainst == True and type(matchAgainst) == types.BooleanType:
+            result = markup != None
+        elif callable(matchAgainst):
+            result = matchAgainst(markup)
+        else:
+            #Custom match methods take the tag as an argument, but all
+            #other ways of matching match the tag name as a string.
+            if isinstance(markup, Tag):
+                markup = markup.name
+            if markup and not isString(markup):
+                markup = unicode(markup)
+            #Now we know that chunk is either a string, or None.
+            if hasattr(matchAgainst, 'match'):
+                # It's a regexp object.
+                result = markup and matchAgainst.search(markup)
+            elif isList(matchAgainst):
+                result = markup in matchAgainst
+            elif hasattr(matchAgainst, 'items'):
+                result = markup.has_key(matchAgainst)
+            elif matchAgainst and isString(markup):
+                if isinstance(markup, unicode):
+                    matchAgainst = unicode(matchAgainst)
+                else:
+                    matchAgainst = str(matchAgainst)
+
+            if not result:
+                result = matchAgainst == markup
+        return result
+
+class ResultSet(list):
+    """A ResultSet is just a list that keeps track of the SoupStrainer
+    that created it."""
+    def __init__(self, source):
+        list.__init__([])
+        self.source = source
+
+# Now, some helper functions.
 
 def isList(l):
     """Convenience method that works with all 2.x versions of Python
@@ -545,10 +853,18 @@
     return hasattr(l, '__iter__') \
            or (type(l) in (types.ListType, types.TupleType))
 
+def isString(s):
+    """Convenience method that works with all 2.x versions of Python
+    to determine whether or not something is stringlike."""
+    try:
+        return isinstance(s, unicode) or isintance(s, basestring) 
+    except NameError:
+        return isinstance(s, str)
+
 def buildTagMap(default, *args):
     """Turns a list of maps, lists, or scalars into a single map.
-    Used to build the SELF_CLOSING_TAGS and NESTABLE_TAGS maps out
-    of lists and partial maps."""
+    Used to build the SELF_CLOSING_TAGS, NESTABLE_TAGS, and
+    NESTING_RESET_TAGS maps out of lists and partial maps."""
     built = {}
     for portion in args:
         if hasattr(portion, 'items'):
@@ -564,9 +880,11 @@
             built[portion] = default
     return built
 
+# Now, the parser classes.
+
 class BeautifulStoneSoup(Tag, SGMLParser):
 
-    """This class contains the basic parser and fetch code. It defines
+    """This class contains the basic parser and search code. It defines
     a parser that knows nothing about tag behavior except for the
     following:
    
@@ -587,70 +905,38 @@
     RESET_NESTING_TAGS = {}
     QUOTE_TAGS = {}
 
-    #As a public service we will by default silently replace MS smart quotes
-    #and similar characters with their HTML or ASCII equivalents.
-    MS_CHARS = { '\x80' : '&euro;',
-                 '\x81' : ' ',
-                 '\x82' : '&sbquo;',
-                 '\x83' : '&fnof;',
-                 '\x84' : '&bdquo;',
-                 '\x85' : '&hellip;',
-                 '\x86' : '&dagger;',
-                 '\x87' : '&Dagger;',
-                 '\x88' : '&caret;',
-                 '\x89' : '%',
-                 '\x8A' : '&Scaron;',
-                 '\x8B' : '&lt;',
-                 '\x8C' : '&OElig;',
-                 '\x8D' : '?',
-                 '\x8E' : 'Z',
-                 '\x8F' : '?',
-                 '\x90' : '?',
-                 '\x91' : '&lsquo;',
-                 '\x92' : '&rsquo;',
-                 '\x93' : '&ldquo;',
-                 '\x94' : '&rdquo;',
-                 '\x95' : '&bull;',
-                 '\x96' : '&ndash;',
-                 '\x97' : '&mdash;',
-                 '\x98' : '&tilde;',
-                 '\x99' : '&trade;',
-                 '\x9a' : '&scaron;',
-                 '\x9b' : '&gt;',
-                 '\x9c' : '&oelig;',
-                 '\x9d' : '?',
-                 '\x9e' : 'z',
-                 '\x9f' : '&Yuml;',}
-
-    PARSER_MASSAGE = [(re.compile('(<[^<>]*)/>'),
-                       lambda(x):x.group(1) + ' />'),
+    MARKUP_MASSAGE = [(re.compile('(<[^<>]*)/>'),
+                       lambda x: x.group(1) + ' />'),
                       (re.compile('<!\s+([^<>]*)>'),
-                       lambda(x):'<!' + x.group(1) + '>'),
-                      (re.compile("([\x80-\x9f])"),
-                       lambda(x): BeautifulStoneSoup.MS_CHARS.get(x.group(1)))
+                       lambda x: '<!' + x.group(1) + '>')
                       ]
 
-    ROOT_TAG_NAME = '[document]'
+    ROOT_TAG_NAME = u'[document]'
 
-    def __init__(self, text=None, avoidParserProblems=True,
-                 initialTextIsEverything=True):
-        """Initialize this as the 'root tag' and feed in any text to
-        the parser.
-
-        NOTE about avoidParserProblems: sgmllib will process most bad
-        HTML, and BeautifulSoup has tricks for dealing with some HTML
-        that kills sgmllib, but Beautiful Soup can nonetheless choke
-        or lose data if your data uses self-closing tags or
-        declarations incorrectly. By default, Beautiful Soup sanitizes
-        its input to avoid the vast majority of these problems. The
-        problems are relatively rare, even in bad HTML, so feel free
-        to pass in False to avoidParserProblems if they don't apply to
-        you, and you'll get better performance. The only reason I have
-        this turned on by default is so I don't get so many tech
-        support questions.
+    HTML_ENTITIES = "html"
+    XML_ENTITIES = "xml"
+    ALL_ENTITIES = [HTML_ENTITIES, XML_ENTITIES]
+
+    def __init__(self, markup="", parseOnlyThese=None, fromEncoding=None,
+                 markupMassage=True, smartQuotesTo=XML_ENTITIES,
+                 convertEntities=None, selfClosingTags=None):
+        """The Soup object is initialized as the 'root tag', and the
+        provided markup (which can be a string or a file-like object)
+        is fed into the underlying parser. 
+
+        sgmllib will process most bad HTML, and the BeautifulSoup
+        class has some tricks for dealing with some HTML that kills
+        sgmllib, but Beautiful Soup can nonetheless choke or lose data
+        if your data uses self-closing tags or declarations
+        incorrectly.
+
+        By default, Beautiful Soup uses regexes to sanitize input,
+        avoiding the vast majority of these problems. If the problems
+        don't apply to you, pass in False for markupMassage, and
+        you'll get better performance.
 
-        The two most common instances of invalid HTML that will choke
-        sgmllib are fixed by the default parser massage techniques:
+        The default parser massage techniques fix the two most common
+        instances of invalid HTML that choke sgmllib:
 
          <br/> (No space between name of closing tag and tag close)
          <! --Comment--> (Extraneous whitespace in declaration)
@@ -658,26 +944,69 @@
         You can pass in a custom list of (RE object, replace method)
         tuples to get Beautiful Soup to scrub your input the way you
         want."""
-        Tag.__init__(self, self.ROOT_TAG_NAME)
-        if avoidParserProblems \
-           and not isList(avoidParserProblems):
-            avoidParserProblems = self.PARSER_MASSAGE            
-        self.avoidParserProblems = avoidParserProblems
+
+        self.parseOnlyThese = parseOnlyThese
+        self.fromEncoding = fromEncoding
+        self.smartQuotesTo = smartQuotesTo
+
+        if convertEntities:
+            # It doesn't make sense to convert encoded characters to
+            # entities even while you're converting entities to Unicode.
+            # Just convert it all to Unicode.
+            self.smartQuotesTo = None
+
+        if isList(convertEntities):
+            self.convertHTMLEntities = self.HTML_ENTITIES in convertEntities
+            self.convertXMLEntities = self.XML_ENTITIES in convertEntities
+        else:
+            self.convertHTMLEntities = self.HTML_ENTITIES == convertEntities
+            self.convertXMLEntities = self.XML_ENTITIES == convertEntities
+
+        self.instanceSelfClosingTags = buildTagMap(None, selfClosingTags)
         SGMLParser.__init__(self)
-        self.quoteStack = []
-        self.hidden = 1
+            
+        if hasattr(markup, 'read'):        # It's a file-type object.
+            markup = markup.read()
+        self.markup = markup
+        self.markupMassage = markupMassage
+        try:
+            self._feed()
+        except StopParsing:
+            pass
+        self.markup = None                 # The markup can now be GCed
+
+    def _feed(self, inDocumentEncoding=None):
+        # Convert the document to Unicode.
+        markup = self.markup
+        if isinstance(markup, unicode):
+            if not hasattr(self, 'originalEncoding'):
+                self.originalEncoding = None
+        else:
+            dammit = UnicodeDammit\
+                     (markup, [self.fromEncoding, inDocumentEncoding],
+                      smartQuotesTo=self.smartQuotesTo)
+            markup = dammit.unicode
+            self.originalEncoding = dammit.originalEncoding
+        if markup:
+            if self.markupMassage:
+                if not isList(self.markupMassage):
+                    self.markupMassage = self.MARKUP_MASSAGE            
+                for fix, m in self.markupMassage:
+                    markup = fix.sub(m, markup)
         self.reset()
-        if hasattr(text, 'read'):
-            #It's a file-type object.
-            text = text.read()
-        if text:
-            self.feed(text)
-        if initialTextIsEverything:
-            self.done()
+
+        SGMLParser.feed(self, markup or "")
+        SGMLParser.close(self)
+        # Close out any unfinished strings and close all the open tags.
+        self.endData()
+        while self.currentTag.name != self.ROOT_TAG_NAME:
+            self.popTag()
 
     def __getattr__(self, methodName):
         """This method routes method call requests to either the SGMLParser
         superclass or the Tag superclass, depending on the method name."""
+        #print "__getattr__ called on %s.%s" % (self.__class__, methodName)
+
         if methodName.find('start_') == 0 or methodName.find('end_') == 0 \
                or methodName.find('do_') == 0:
             return SGMLParser.__getattr__(self, methodName)
@@ -686,25 +1015,21 @@
         else:
             raise AttributeError
 
-    def feed(self, text):
-        if self.avoidParserProblems:
-            for fix, m in self.avoidParserProblems:
-                text = fix.sub(m, text)
-        SGMLParser.feed(self, text)
-
-    def done(self):
-        """Called when you're done parsing, so that the unclosed tags can be
-        correctly processed."""
-        self.endData() #NEW
-        while self.currentTag.name != self.ROOT_TAG_NAME:
-            self.popTag()
+    def isSelfClosingTag(self, name):
+        """Returns true iff the given string is the name of a
+        self-closing tag according to this parser."""
+        return self.SELF_CLOSING_TAGS.has_key(name) \
+               or self.instanceSelfClosingTags.has_key(name)
             
     def reset(self):
+        Tag.__init__(self, self, self.ROOT_TAG_NAME)
+        self.hidden = 1
         SGMLParser.reset(self)
         self.currentData = []
         self.currentTag = None
         self.tagStack = []
-        self.pushTag(self)        
+        self.quoteStack = []
+        self.pushTag(self)
     
     def popTag(self):
         tag = self.tagStack.pop()
@@ -712,7 +1037,7 @@
         # 'string' property, so that soup.tag.string is shorthand for
         # soup.tag.contents[0]
         if len(self.currentTag.contents) == 1 and \
-           isinstance(self.currentTag.contents[0], NavigableText):
+           isinstance(self.currentTag.contents[0], NavigableString):
             self.currentTag.string = self.currentTag.contents[0]
 
         #print "Pop", tag.name
@@ -727,30 +1052,35 @@
         self.tagStack.append(tag)
         self.currentTag = self.tagStack[-1]
 
-    def endData(self):
-        currentData = ''.join(self.currentData)
-        if currentData:
+    def endData(self, containerClass=NavigableString):
+        if self.currentData:
+            currentData = ''.join(self.currentData)
+            if currentData.endswith('<') and self.convertHTMLEntities:
+                currentData = currentData[:-1] + '&lt;'
             if not currentData.strip():
                 if '\n' in currentData:
                     currentData = '\n'
                 else:
                     currentData = ' '
-            c = NavigableString
-            if type(currentData) == types.UnicodeType:
-                c = NavigableUnicodeString
-            o = c(currentData)
+            self.currentData = []
+            if self.parseOnlyThese and len(self.tagStack) <= 1 and \
+                   (not self.parseOnlyThese.text or \
+                    not self.parseOnlyThese.search(currentData)):
+                return
+            o = containerClass(currentData)
             o.setup(self.currentTag, self.previous)
             if self.previous:
                 self.previous.next = o
             self.previous = o
             self.currentTag.contents.append(o)
-        self.currentData = []
+
 
     def _popToTag(self, name, inclusivePop=True):
         """Pops the tag stack up to and including the most recent
         instance of the given tag. If inclusivePop is false, pops the tag
         stack up to but *not* including the most recent instqance of
         the given tag."""
+        #print "Popping to %s" % name
         if name == self.ROOT_TAG_NAME:
             return            
 
@@ -807,7 +1137,6 @@
                 #peculiar to this tag, or we encounter another tag
                 #that causes nesting to reset, pop up to but not
                 #including that tag.
-
                 popTo = p.name
                 inclusive = False
                 break
@@ -816,33 +1145,41 @@
             self._popToTag(popTo, inclusive)
 
     def unknown_starttag(self, name, attrs, selfClosing=0):
-        #print "Start tag %s" % name
+        #print "Start tag %s: %s" % (name, attrs)
         if self.quoteStack:
             #This is not a real tag.
             #print "<%s> is not real!" % name
             attrs = ''.join(map(lambda(x, y): ' %s="%s"' % (x, y), attrs))
-            self.handle_data('<%s%s>' % (name, attrs))
-            return
+            self.currentData.append('<%s%s>' % (name, attrs))
+            return        
         self.endData()
-        if not name in self.SELF_CLOSING_TAGS and not selfClosing:
+
+        if not self.isSelfClosingTag(name) and not selfClosing:
             self._smartPop(name)
-        tag = Tag(name, attrs, self.currentTag, self.previous)        
+
+        if self.parseOnlyThese and len(self.tagStack) <= 1 \
+               and (self.parseOnlyThese.text or not self.parseOnlyThese.searchTag(name, attrs)):
+            return
+
+        tag = Tag(self, name, attrs, self.currentTag, self.previous)
         if self.previous:
             self.previous.next = tag
         self.previous = tag
         self.pushTag(tag)
-        if selfClosing or name in self.SELF_CLOSING_TAGS:
+        if selfClosing or self.isSelfClosingTag(name):
             self.popTag()                
         if name in self.QUOTE_TAGS:
             #print "Beginning quote (%s)" % name
             self.quoteStack.append(name)
             self.literal = 1
+        return tag
 
     def unknown_endtag(self, name):
+        #print "End tag %s" % name
         if self.quoteStack and self.quoteStack[-1] != name:
             #This is not a real end tag.
             #print "</%s> is not real!" % name
-            self.handle_data('</%s>' % name)
+            self.currentData.append('</%s>' % name)
             return
         self.endData()
         self._popToTag(name)
@@ -851,38 +1188,81 @@
             self.literal = (len(self.quoteStack) > 0)
 
     def handle_data(self, data):
+        if self.convertHTMLEntities:
+            if data[0] == '&':
+                data = self.BARE_AMPERSAND.sub("&amp;",data)
+            else:
+                data = data.replace('&','&amp;') \
+                           .replace('<','&lt;') \
+                           .replace('>','&gt;')
         self.currentData.append(data)
 
+    def _toStringSubclass(self, text, subclass):
+        """Adds a certain piece of text to the tree as a NavigableString
+        subclass."""
+        self.endData()
+        self.handle_data(text)
+        self.endData(subclass)
+
     def handle_pi(self, text):
-        "Propagate processing instructions right through."
-        self.handle_data("<?%s>" % text)
+        """Handle a processing instruction as a ProcessingInstruction
+        object, possibly one with a %SOUP-ENCODING% slot into which an
+        encoding will be plugged later."""
+        if text[:3] == "xml":
+            text = "xml version='1.0' encoding='%SOUP-ENCODING%'"
+        self._toStringSubclass(text, ProcessingInstruction)
 
     def handle_comment(self, text):
-        "Propagate comments right through."
-        self.handle_data("<!--%s-->" % text)
+        "Handle comments as Comment objects."
+        self._toStringSubclass(text, Comment)
 
     def handle_charref(self, ref):
-        "Propagate char refs right through."
-        self.handle_data('&#%s;' % ref)
+        "Handle character references as data."
+        if ref[0] == 'x':
+            data = unichr(int(ref[1:],16))
+        else:
+            data = unichr(int(ref))
+        
+        if u'\x80' <= data <= u'\x9F':
+            data = UnicodeDammit.subMSChar(chr(ord(data)), self.smartQuotesTo)
+        elif not self.convertHTMLEntities and not self.convertXMLEntities:
+            data = '&#%s;' % ref
+
+        self.handle_data(data)
 
     def handle_entityref(self, ref):
-        "Propagate entity refs right through."
-        self.handle_data('&%s;' % ref)
+        """Handle entity references as data, possibly converting known
+        HTML entity references to the corresponding Unicode
+        characters."""
+        replaceWithXMLEntity = self.convertXMLEntities and \
+                               self.XML_ENTITIES_TO_CHARS.has_key(ref)
+        if self.convertHTMLEntities or replaceWithXMLEntity:
+            try:
+                data = unichr(name2codepoint[ref])
+            except KeyError:
+                if replaceWithXMLEntity:
+                    data = self.XML_ENTITIES_TO_CHARS.get(ref)
+                else:
+                    data="&amp;%s" % ref
+        else:
+            data = '&%s;' % ref
+        self.handle_data(data)
         
     def handle_decl(self, data):
-        "Propagate DOCTYPEs and the like right through."
-        self.handle_data('<!%s>' % data)
+        "Handle DOCTYPEs and the like as Declaration objects."
+        self._toStringSubclass(data, Declaration)
 
     def parse_declaration(self, i):
         """Treat a bogus SGML declaration as raw data. Treat a CDATA
-        declaration as regular data."""
+        declaration as a CData object."""
         j = None
         if self.rawdata[i:i+9] == '<![CDATA[':
              k = self.rawdata.find(']]>', i)
              if k == -1:
                  k = len(self.rawdata)
-             self.handle_data(self.rawdata[i+9:k])
+             data = self.rawdata[i+9:k]
              j = k+3
+             self._toStringSubclass(data, CData)
         else:
             try:
                 j = SGMLParser.parse_declaration(self, i)
@@ -937,11 +1317,17 @@
     Differing assumptions about tag nesting rules are a major source
     of problems with the BeautifulSoup class. If BeautifulSoup is not
     treating as nestable a tag your page author treats as nestable,
-    try ICantBelieveItsBeautifulSoup before writing your own
-    subclass."""
+    try ICantBelieveItsBeautifulSoup, MinimalSoup, or
+    BeautifulStoneSoup before writing your own subclass."""
 
-    SELF_CLOSING_TAGS = buildTagMap(None, ['br' , 'hr', 'input', 'img', 'meta',
-                                           'spacer', 'link', 'frame', 'base'])
+    def __init__(self, *args, **kwargs):
+        if not kwargs.has_key('smartQuotesTo'):
+            kwargs['smartQuotesTo'] = self.HTML_ENTITIES
+        BeautifulStoneSoup.__init__(self, *args, **kwargs)
+
+    SELF_CLOSING_TAGS = buildTagMap(None,
+                                    ['br' , 'hr', 'input', 'img', 'meta',
+                                    'spacer', 'link', 'frame', 'base'])
 
     QUOTE_TAGS = {'script': None}
     
@@ -969,6 +1355,9 @@
                            'tr' : ['table', 'tbody', 'tfoot', 'thead'],
                            'td' : ['tr'],
                            'th' : ['tr'],
+                           'thead' : ['table'],
+                           'tbody' : ['table'],
+                           'tfoot' : ['table'],
                            }
 
     NON_NESTABLE_BLOCK_TAGS = ['address', 'form', 'p', 'pre']
@@ -982,7 +1371,57 @@
 
     NESTABLE_TAGS = buildTagMap([], NESTABLE_INLINE_TAGS, NESTABLE_BLOCK_TAGS,
                                 NESTABLE_LIST_TAGS, NESTABLE_TABLE_TAGS)
-    
+
+    # Used to detect the charset in a META tag; see start_meta
+    CHARSET_RE = re.compile("((^|;)\s*charset=)([^;]*)")
+
+    def start_meta(self, attrs):
+        """Beautiful Soup can detect a charset included in a META tag,
+        try to convert the document to that charset, and re-parse the
+        document from the beginning."""
+        httpEquiv = None
+        contentType = None
+        contentTypeIndex = None
+        tagNeedsEncodingSubstitution = False
+
+        for i in range(0, len(attrs)):
+            key, value = attrs[i]
+            key = key.lower()
+            if key == 'http-equiv':
+                httpEquiv = value
+            elif key == 'content':
+                contentType = value
+                contentTypeIndex = i
+
+        if httpEquiv and contentType: # It's an interesting meta tag.
+            match = self.CHARSET_RE.search(contentType)
+            if match:
+                if getattr(self, 'declaredHTMLEncoding') or \
+                       (self.originalEncoding == self.fromEncoding):
+                    # This is our second pass through the document, or
+                    # else an encoding was specified explicitly and it
+                    # worked. Rewrite the meta tag.
+                    newAttr = self.CHARSET_RE.sub\
+                              (lambda(match):match.group(1) +
+                               "%SOUP-ENCODING%", value)
+                    attrs[contentTypeIndex] = (attrs[contentTypeIndex][0],
+                                               newAttr)
+                    tagNeedsEncodingSubstitution = True
+                else:
+                    # This is our first pass through the document.
+                    # Go through it again with the new information.
+                    newCharset = match.group(3)
+                    if newCharset and newCharset != self.originalEncoding:
+                        self.declaredHTMLEncoding = newCharset
+                        self._feed(self.declaredHTMLEncoding)
+                        raise StopParsing
+        tag = self.unknown_starttag("meta", attrs)
+        if tag and tagNeedsEncodingSubstitution:
+            tag.containsSubstitutions = True
+
+class StopParsing(Exception):
+    pass
+   
 class ICantBelieveItsBeautifulSoup(BeautifulSoup):
 
     """The BeautifulSoup class is oriented towards skipping over
@@ -1001,15 +1440,12 @@
     can throw off the rest of your document structure. The same is
     true of a number of other tags, listed below.
 
-    It's much more common for someone to forget to close (eg.) a 'b'
-    tag than to actually use nested 'b' tags, and the BeautifulSoup
-    class handles the common case. This class handles the
-    not-co-common case: where you can't believe someone wrote what
-    they did, but it's valid HTML and BeautifulSoup screwed up by
-    assuming it wouldn't be.
-
-    If this doesn't do what you need, try subclassing this class or
-    BeautifulSoup, and providing your own list of NESTABLE_TAGS."""
+    It's much more common for someone to forget to close a 'b' tag
+    than to actually use nested 'b' tags, and the BeautifulSoup class
+    handles the common case. This class handles the not-co-common
+    case: where you can't believe someone wrote what they did, but
+    it's valid HTML and BeautifulSoup screwed up by assuming it
+    wouldn't be."""
 
     I_CANT_BELIEVE_THEYRE_NESTABLE_INLINE_TAGS = \
      ['em', 'big', 'i', 'small', 'tt', 'abbr', 'acronym', 'strong',
@@ -1022,6 +1458,19 @@
                                 I_CANT_BELIEVE_THEYRE_NESTABLE_BLOCK_TAGS,
                                 I_CANT_BELIEVE_THEYRE_NESTABLE_INLINE_TAGS)
 
+class MinimalSoup(BeautifulSoup):
+    """The MinimalSoup class is for parsing HTML that contains
+    pathologically bad markup. It makes no assumptions about tag
+    nesting, but it does know which tags are self-closing, that
+    <script> tags contain Javascript and should not be parsed, that
+    META tags may contain encoding information, and so on.
+
+    This also makes it better for subclassing than BeautifulStoneSoup
+    or BeautifulSoup."""
+    
+    RESET_NESTING_TAGS = buildTagMap('noscript')
+    NESTABLE_TAGS = {}
+
 class BeautifulSOAP(BeautifulStoneSoup):
     """This class will push a tag with only a single string child into
     the tag's parent as an attribute. The attribute's name is the tag
@@ -1048,7 +1497,7 @@
             parent = self.tagStack[-2]
             parent._getAttrMap()
             if (isinstance(tag, Tag) and len(tag.contents) == 1 and
-                isinstance(tag.contents[0], NavigableText) and 
+                isinstance(tag.contents[0], NavigableString) and 
                 not parent.attrMap.has_key(tag.name)):
                 parent[tag.name] = tag.contents[0]
         BeautifulStoneSoup.popTag(self)
@@ -1067,14 +1516,297 @@
     pass
 class RobustWackAssHTMLParser(ICantBelieveItsBeautifulSoup):
     pass
+class RobustInsanelyWackAssHTMLParser(MinimalSoup):
+    pass
 class SimplifyingSOAPParser(BeautifulSOAP):
     pass
 
-###
+######################################################
+#
+# Bonus library: Unicode, Dammit
+#
+# This class forces XML data into a standard format (usually to UTF-8
+# or Unicode).  It is heavily based on code from Mark Pilgrim's
+# Universal Feed Parser. It does not rewrite the XML or HTML to
+# reflect a new encoding: that happens in BeautifulStoneSoup.handle_pi
+# (XML) and BeautifulSoup.start_meta (HTML).
+
+# Autodetects character encodings.
+# Download from http://chardet.feedparser.org/
+try:
+    import chardet
+#    import chardet.constants
+#    chardet.constants._debug = 1
+except:
+    chardet = None
+chardet = None
+
+# cjkcodecs and iconv_codec make Python know about more character encodings.
+# Both are available from http://cjkpython.i18n.org/
+# They're built in if you use Python 2.4.
+try:
+    import cjkcodecs.aliases
+except:
+    pass
+try:
+    import iconv_codec
+except:
+    pass
+
+class UnicodeDammit:
+    """A class for detecting the encoding of a *ML document and
+    converting it to a Unicode string. If the source encoding is
+    windows-1252, can replace MS smart quotes with their HTML or XML
+    equivalents."""
+
+    # This dictionary maps commonly seen values for "charset" in HTML
+    # meta tags to the corresponding Python codec names. It only covers
+    # values that aren't in Python's aliases and can't be determined
+    # by the heuristics in find_codec.
+    CHARSET_ALIASES = { "macintosh" : "mac-roman",
+                        "x-sjis" : "shift-jis" }
+    
+    def __init__(self, markup, overrideEncodings=[],
+                 smartQuotesTo='xml'):
+        self.markup, documentEncoding, sniffedEncoding = \
+                     self._detectEncoding(markup)
+        self.smartQuotesTo = smartQuotesTo
+        self.triedEncodings = []
+        if isinstance(markup, unicode):
+            return markup
+
+        u = None
+        for proposedEncoding in overrideEncodings:
+            u = self._convertFrom(proposedEncoding)
+            if u: break
+        if not u:
+            for proposedEncoding in (documentEncoding, sniffedEncoding):
+                u = self._convertFrom(proposedEncoding)
+                if u: break
+                
+        # If no luck and we have auto-detection library, try that:
+        if not u and chardet and not isinstance(self.markup, unicode):
+            u = self._convertFrom(chardet.detect(self.markup)['encoding'])
+
+        # As a last resort, try utf-8 and windows-1252:
+        if not u:
+            for proposed_encoding in ("utf-8", "windows-1252"):
+                u = self._convertFrom(proposed_encoding)
+                if u: break
+        self.unicode = u
+        if not u: self.originalEncoding = None
+
+    def subMSChar(orig, smartQuotesTo):
+        """Changes a MS smart quote character to an XML or HTML
+        entity."""
+        sub = UnicodeDammit.MS_CHARS.get(orig)
+        if type(sub) == types.TupleType:
+            if smartQuotesTo == 'xml':
+                sub = '&#x%s;' % sub[1]
+            elif smartQuotesTo == 'html':
+                sub = '&%s;' % sub[0]
+            else:
+                sub = unichr(int(sub[1],16))
+        return sub            
+    subMSChar = staticmethod(subMSChar)
+
+    def _convertFrom(self, proposed):        
+        proposed = self.find_codec(proposed)
+        if not proposed or proposed in self.triedEncodings:
+            return None
+        self.triedEncodings.append(proposed)
+        markup = self.markup
+
+        # Convert smart quotes to HTML if coming from an encoding
+        # that might have them.
+        if self.smartQuotesTo and proposed in("windows-1252",
+                                              "ISO-8859-1",
+                                              "ISO-8859-2"):
+            markup = re.compile("([\x80-\x9f])").sub \
+                     (lambda(x): self.subMSChar(x.group(1),self.smartQuotesTo),
+                      markup)
+
+        try:
+            # print "Trying to convert document to %s" % proposed
+            u = self._toUnicode(markup, proposed)
+            self.markup = u       
+            self.originalEncoding = proposed
+        except Exception, e:
+            # print "That didn't work!"
+            # print e
+            return None        
+        #print "Correct encoding: %s" % proposed
+        return self.markup
+
+    def _toUnicode(self, data, encoding):
+        '''Given a string and its encoding, decodes the string into Unicode.
+        %encoding is a string recognized by encodings.aliases'''
+
+        # strip Byte Order Mark (if present)
+        if (len(data) >= 4) and (data[:2] == '\xfe\xff') \
+               and (data[2:4] != '\x00\x00'):
+            encoding = 'utf-16be'
+            data = data[2:]
+        elif (len(data) >= 4) and (data[:2] == '\xff\xfe') \
+                 and (data[2:4] != '\x00\x00'):
+            encoding = 'utf-16le'
+            data = data[2:]
+        elif data[:3] == '\xef\xbb\xbf':
+            encoding = 'utf-8'
+            data = data[3:]
+        elif data[:4] == '\x00\x00\xfe\xff':
+            encoding = 'utf-32be'
+            data = data[4:]
+        elif data[:4] == '\xff\xfe\x00\x00':
+            encoding = 'utf-32le'
+            data = data[4:]
+        newdata = unicode(data, encoding)
+        return newdata
+    
+    def _detectEncoding(self, xml_data):
+        """Given a document, tries to detect its XML encoding."""
+        xml_encoding = sniffed_xml_encoding = None
+        try:
+            if xml_data[:4] == '\x4c\x6f\xa7\x94':
+                # EBCDIC
+                xml_data = self._ebcdic_to_ascii(xml_data)
+            elif xml_data[:4] == '\x00\x3c\x00\x3f':
+                # UTF-16BE
+                sniffed_xml_encoding = 'utf-16be'
+                xml_data = unicode(xml_data, 'utf-16be').encode('utf-8')
+            elif (len(xml_data) >= 4) and (xml_data[:2] == '\xfe\xff') \
+                     and (xml_data[2:4] != '\x00\x00'):
+                # UTF-16BE with BOM
+                sniffed_xml_encoding = 'utf-16be'
+                xml_data = unicode(xml_data[2:], 'utf-16be').encode('utf-8')
+            elif xml_data[:4] == '\x3c\x00\x3f\x00':
+                # UTF-16LE
+                sniffed_xml_encoding = 'utf-16le'
+                xml_data = unicode(xml_data, 'utf-16le').encode('utf-8')
+            elif (len(xml_data) >= 4) and (xml_data[:2] == '\xff\xfe') and \
+                     (xml_data[2:4] != '\x00\x00'):
+                # UTF-16LE with BOM
+                sniffed_xml_encoding = 'utf-16le'
+                xml_data = unicode(xml_data[2:], 'utf-16le').encode('utf-8')
+            elif xml_data[:4] == '\x00\x00\x00\x3c':
+                # UTF-32BE
+                sniffed_xml_encoding = 'utf-32be'
+                xml_data = unicode(xml_data, 'utf-32be').encode('utf-8')
+            elif xml_data[:4] == '\x3c\x00\x00\x00':
+                # UTF-32LE
+                sniffed_xml_encoding = 'utf-32le'
+                xml_data = unicode(xml_data, 'utf-32le').encode('utf-8')
+            elif xml_data[:4] == '\x00\x00\xfe\xff':
+                # UTF-32BE with BOM
+                sniffed_xml_encoding = 'utf-32be'
+                xml_data = unicode(xml_data[4:], 'utf-32be').encode('utf-8')
+            elif xml_data[:4] == '\xff\xfe\x00\x00':
+                # UTF-32LE with BOM
+                sniffed_xml_encoding = 'utf-32le'
+                xml_data = unicode(xml_data[4:], 'utf-32le').encode('utf-8')
+            elif xml_data[:3] == '\xef\xbb\xbf':
+                # UTF-8 with BOM
+                sniffed_xml_encoding = 'utf-8'
+                xml_data = unicode(xml_data[3:], 'utf-8').encode('utf-8')
+            else:
+                sniffed_xml_encoding = 'ascii'
+                pass
+            xml_encoding_match = re.compile \
+                                 ('^<\?.*encoding=[\'"](.*?)[\'"].*\?>')\
+                                 .match(xml_data)
+        except:
+            xml_encoding_match = None
+        if xml_encoding_match:
+            xml_encoding = xml_encoding_match.groups()[0].lower()
+            if sniffed_xml_encoding and \
+               (xml_encoding in ('iso-10646-ucs-2', 'ucs-2', 'csunicode',
+                                 'iso-10646-ucs-4', 'ucs-4', 'csucs4',
+                                 'utf-16', 'utf-32', 'utf_16', 'utf_32',
+                                 'utf16', 'u16')):
+                xml_encoding = sniffed_xml_encoding
+        return xml_data, xml_encoding, sniffed_xml_encoding
+
+
+    def find_codec(self, charset):
+        return self._codec(self.CHARSET_ALIASES.get(charset, charset)) \
+               or (charset and self._codec(charset.replace("-", ""))) \
+               or (charset and self._codec(charset.replace("-", "_"))) \
+               or charset
+
+    def _codec(self, charset):
+        if not charset: return charset 
+        codec = None
+        try:
+            codecs.lookup(charset)
+            codec = charset
+        except LookupError:
+            pass
+        return codec
+
+    EBCDIC_TO_ASCII_MAP = None
+    def _ebcdic_to_ascii(self, s):
+        c = self.__class__
+        if not c.EBCDIC_TO_ASCII_MAP:
+            emap = (0,1,2,3,156,9,134,127,151,141,142,11,12,13,14,15,
+                    16,17,18,19,157,133,8,135,24,25,146,143,28,29,30,31,
+                    128,129,130,131,132,10,23,27,136,137,138,139,140,5,6,7,
+                    144,145,22,147,148,149,150,4,152,153,154,155,20,21,158,26,
+                    32,160,161,162,163,164,165,166,167,168,91,46,60,40,43,33,
+                    38,169,170,171,172,173,174,175,176,177,93,36,42,41,59,94,
+                    45,47,178,179,180,181,182,183,184,185,124,44,37,95,62,63,
+                    186,187,188,189,190,191,192,193,194,96,58,35,64,39,61,34,
+                    195,97,98,99,100,101,102,103,104,105,196,197,198,199,200,
+                    201,202,106,107,108,109,110,111,112,113,114,203,204,205,
+                    206,207,208,209,126,115,116,117,118,119,120,121,122,210,
+                    211,212,213,214,215,216,217,218,219,220,221,222,223,224,
+                    225,226,227,228,229,230,231,123,65,66,67,68,69,70,71,72,
+                    73,232,233,234,235,236,237,125,74,75,76,77,78,79,80,81,
+                    82,238,239,240,241,242,243,92,159,83,84,85,86,87,88,89,
+                    90,244,245,246,247,248,249,48,49,50,51,52,53,54,55,56,57,
+                    250,251,252,253,254,255)
+            import string
+            c.EBCDIC_TO_ASCII_MAP = string.maketrans( \
+            ''.join(map(chr, range(256))), ''.join(map(chr, emap)))
+        return s.translate(c.EBCDIC_TO_ASCII_MAP)
+
+    MS_CHARS = { '\x80' : ('euro', '20AC'),
+                 '\x81' : ' ',
+                 '\x82' : ('sbquo', '201A'),
+                 '\x83' : ('fnof', '192'),
+                 '\x84' : ('bdquo', '201E'),
+                 '\x85' : ('hellip', '2026'),
+                 '\x86' : ('dagger', '2020'),
+                 '\x87' : ('Dagger', '2021'),
+                 '\x88' : ('circ', '2C6'),
+                 '\x89' : ('permil', '2030'),
+                 '\x8A' : ('Scaron', '160'),
+                 '\x8B' : ('lsaquo', '2039'),
+                 '\x8C' : ('OElig', '152'),
+                 '\x8D' : '?',
+                 '\x8E' : ('#x17D', '17D'),
+                 '\x8F' : '?',
+                 '\x90' : '?',
+                 '\x91' : ('lsquo', '2018'),
+                 '\x92' : ('rsquo', '2019'),
+                 '\x93' : ('ldquo', '201C'),
+                 '\x94' : ('rdquo', '201D'),
+                 '\x95' : ('bull', '2022'),
+                 '\x96' : ('ndash', '2013'),
+                 '\x97' : ('mdash', '2014'),
+                 '\x98' : ('tilde', '2DC'),
+                 '\x99' : ('trade', '2122'),
+                 '\x9a' : ('scaron', '161'),
+                 '\x9b' : ('rsaquo', '203A'),
+                 '\x9c' : ('oelig', '153'),
+                 '\x9d' : '?',
+                 '\x9e' : ('#x17E', '17E'),
+                 '\x9f' : ('Yuml', '178'),}
+
+#######################################################################
 
 
 #By default, act as an HTML pretty-printer.
 if __name__ == '__main__':
     import sys
-    soup = BeautifulStoneSoup(sys.stdin.read())
+    soup = BeautifulSoup(sys.stdin.read())
     print soup.prettify()

Modified: kukit/azax/trunk/DEPENDENCIES.txt
==============================================================================
--- kukit/azax/trunk/DEPENDENCIES.txt	(original)
+++ kukit/azax/trunk/DEPENDENCIES.txt	Thu Aug 10 17:49:29 2006
@@ -3,5 +3,4 @@
 - Zope-2.7.3 or greater
 - Zope X3.0.0 or greater
 - Five 0.3 or greater
-- lxml 0.7 or greater
 

Added: kukit/azax/trunk/LICENSE
==============================================================================
--- (empty file)
+++ kukit/azax/trunk/LICENSE	Thu Aug 10 17:49:29 2006
@@ -0,0 +1,7 @@
+
+Main part of the code is licensed under GPL Version 2.1
+
+Third party modules come with different licenses, see individual files
+
+BeautifulSoup.py is licensed with PSF, Copyright (c) 2004-2006 Leonard Richardson
+

From reebalazs at codespeak.net  Thu Aug 10 20:14:37 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 10 Aug 2006 20:14:37 +0200 (CEST)
Subject: [Kukit-checkins] r31241 - kukit/kukit.js/trunk/kukit
Message-ID: <20060810181437.DD08010063@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 10 20:14:36 2006
New Revision: 31241

Modified:
   kukit/kukit.js/trunk/kukit/kukit.js
Log:
Accept link rel='k-stylesheet' in addition to kukit

Modified: kukit/kukit.js/trunk/kukit/kukit.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kukit.js	(original)
+++ kukit/kukit.js/trunk/kukit/kukit.js	Thu Aug 10 20:14:36 2006
@@ -37,7 +37,7 @@
     var nodes = document.getElementsByTagName("link");
     var results = [];
     for (var i=0; i<nodes.length; i++) {
-        if (nodes[i].rel=="kukit") {
+        if (nodes[i].rel=="kukit" || nodes[i].rel=="k-stylesheet" ) {
             var res_type = null;
             // Resource syntax is decided on type attribute.
             if((nodes[i].type == 'text/css') || (nodes[i].type == 'text/kss')) {

From reebalazs at codespeak.net  Fri Aug 11 12:08:31 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 11 Aug 2006 12:08:31 +0200 (CEST)
Subject: [Kukit-checkins] r31252 - kukit/kukit.js/trunk/kukit
Message-ID: <20060811100831.A35EF1006E@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 11 12:08:29 2006
New Revision: 31252

Modified:
   kukit/kukit.js/trunk/kukit/plugin.js
Log:
make preventdefault work with Safari, <a> links

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Fri Aug 11 12:08:29 2006
@@ -134,35 +134,50 @@
     this.__bind__(name, parms, func_to_bind, node);
 };
 
+// Sigh. We need this.
+kukit.pl.have_Safari = navigator.vendor && navigator.vendor.indexOf('Apple') != -1;
+
 kukit.pl.NativeEventBinder.prototype.__bind__ = function(name, parms, func_to_bind, node) {
     parms = kukit.pl.completeParms(parms, [], {'preventdefault': '', 'allowbubbling': ''}, 'native event binding');
     kukit.pl.evalBool(parms, 'preventdefault', 'native event binding');
     kukit.pl.evalBool(parms, 'allowbubbling', 'native event binding');
-    if (parms.preventdefault && name != 'click') {
-        throw 'In native events only the click event can have preventdefault.';
+    if (parms.preventdefault) {
+        if (name != 'click') {
+            throw 'In native events only the click event can have preventdefault.';
+        }
+    }
+    if (parms.preventdefault && parms.allowbubbling) {
+        kukit.logWarning('allowbubbling is experimental. Use it only of you know what you are doing!');
     }
+    var allowbubbling = parms.allowbubbling;
+    var preventdefault = parms.preventdefault;
     var func = function(e) {
         target = kukit.pl.getTargetForBrowserEvent(e);
-        if (parms.allowbubbling || target == node) {
+        if (allowbubbling || target == node) {
             // Execute the action
             func_to_bind();
+            // Cancel default event ?
+            if (preventdefault) {
+                // W3C style
+                if (e.preventDefault)
+                    e.preventDefault();
+                // MS style
+                try { e.returnValue = false; } catch (exc) {}
+            }
         } else {
-            kukit.log('Ignored event for "' + name + '", possibly wrong target');
+            kukit.log('Ignored event for "' + name + '", possibly bubbling');
         }
     };
-    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);
+    // XXX Safari hack
+    // necessary since Safari does not prevent the <a href...> following
+    // (XXX this will not work in connection with allowbubbling)
+    if (parms.preventdefault && kukit.pl.have_Safari 
+            && name == 'click' && node.tagName.toLowerCase() == 'a') {
+        function cancelClickSafari() {
+            return false;
+        }
+        node.onclick = cancelClickSafari;
     }
 };
 

From reebalazs at codespeak.net  Fri Aug 11 12:35:02 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 11 Aug 2006 12:35:02 +0200 (CEST)
Subject: [Kukit-checkins] r31254 - kukit/kukit.js/trunk/kukit
Message-ID: <20060811103502.DAB5510069@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 11 12:35:00 2006
New Revision: 31254

Modified:
   kukit/kukit.js/trunk/kukit/plugin.js
Log:
Fix replaceHTML

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Fri Aug 11 12:35:00 2006
@@ -343,25 +343,13 @@
 kukit.cr.commandRegistry.registerFromAction('replaceInnerHTML', kukit.cr.makeSelectorCommand);
 
 kukit.ar.actionRegistry.register('replaceHTML', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, ['html'], {'selector': null}, 'replaceHTML action');
+    parms = kukit.pl.completeParms(parms, ['html'], {}, 'replaceHTML action');
     parms.html = kukit.dom.forceToDom(parms.html);
-    var childNodes = parms.html.childNodes;
+    // We only consider the first node (it must really have 1 node only)
+    var element = parms.html.firstChild;
     var parentNode = node.parentNode;
-    var newNode = parentNode.cloneNode(false);
-    kukit.dom.appendChildren(childNodes, newNode);
-    if (parms.selector) {
-        var element = cssQuery(parms.selector, newNode)[0];
-        if (element) {
-            parentNode.replaceChild(element, node);
-            kukit.setupEvents(element);
-        } else {
-            kukit.logDebug("Found no elements in response with selector '" + parms.selector + "'.");
-        }
-    } else {
-        var element = newNode.firstChild;
-        parentNode.replaceChild(element, node);
-        kukit.setupEvents(element);
-    }
+    parentNode.replaceChild(element, node);
+    kukit.setupEvents(element);
 });
 kukit.cr.commandRegistry.registerFromAction('replaceHTML', kukit.cr.makeSelectorCommand);
 

From reebalazs at codespeak.net  Fri Aug 11 12:44:14 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 11 Aug 2006 12:44:14 +0200 (CEST)
Subject: [Kukit-checkins] r31255 - kukit/kukit.js/trunk/kukit
Message-ID: <20060811104414.EA45E10069@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 11 12:44:13 2006
New Revision: 31255

Modified:
   kukit/kukit.js/trunk/kukit/plugin.js
Log:
small fix in case of the safari hack... to make it work with bubbling too

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Fri Aug 11 12:44:13 2006
@@ -146,9 +146,6 @@
             throw 'In native events only the click event can have preventdefault.';
         }
     }
-    if (parms.preventdefault && parms.allowbubbling) {
-        kukit.logWarning('allowbubbling is experimental. Use it only of you know what you are doing!');
-    }
     var allowbubbling = parms.allowbubbling;
     var preventdefault = parms.preventdefault;
     var func = function(e) {
@@ -171,9 +168,10 @@
     kukit.registerEventListener(node, name, func);
     // XXX Safari hack
     // necessary since Safari does not prevent the <a href...> following
-    // (XXX this will not work in connection with allowbubbling)
+    // (in case of allowbubbling we have to apply it to all clicks, as there
+    // might be a link inside that we cannot detect on the current node)
     if (parms.preventdefault && kukit.pl.have_Safari 
-            && name == 'click' && node.tagName.toLowerCase() == 'a') {
+            && (parms.allowbubbling || name == 'click' && node.tagName.toLowerCase() == 'a')) {
         function cancelClickSafari() {
             return false;
         }

From reebalazs at codespeak.net  Fri Aug 11 14:04:18 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 11 Aug 2006 14:04:18 +0200 (CEST)
Subject: [Kukit-checkins] r31260 - kukit/azax/trunk
Message-ID: <20060811120418.C0EF110060@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 11 14:04:17 2006
New Revision: 31260

Modified:
   kukit/azax/trunk/azaxview.py
Log:
Add view helper

Modified: kukit/azax/trunk/azaxview.py
==============================================================================
--- kukit/azax/trunk/azaxview.py	(original)
+++ kukit/azax/trunk/azaxview.py	Fri Aug 11 14:04:17 2006
@@ -92,6 +92,12 @@
         command = self.addCommand('setAttribute', selector)
         data = command.addParam('name', name)
         data = command.addParam('value', value)
+
+    def setStyle(self, selector, name, value):
+        """ see interfaces.py """
+        command = self.addCommand('setStyle', selector)
+        data = command.addParam('name', name)
+        data = command.addParam('value', value)
     
     def insertHTMLAfter(self, selector, new_value):
         """ see interfaces.py """

From reebalazs at codespeak.net  Sat Aug 12 16:27:08 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sat, 12 Aug 2006 16:27:08 +0200 (CEST)
Subject: [Kukit-checkins] r31270 - in kukit/azax/trunk: . plugins
	plugins/json
Message-ID: <20060812142708.38FE010071@code0.codespeak.net>

Author: reebalazs
Date: Sat Aug 12 16:27:03 2006
New Revision: 31270

Added:
   kukit/azax/trunk/azax-configure.zcml
   kukit/azax/trunk/azax-meta.zcml
Modified:
   kukit/azax/trunk/EXTERNALS.TXT
   kukit/azax/trunk/__init__.py
   kukit/azax/trunk/azaxview.py
   kukit/azax/trunk/plugins/EXTERNALS.TXT
   kukit/azax/trunk/plugins/configure.zcml
   kukit/azax/trunk/plugins/json/configure.zcml
   kukit/azax/trunk/plugins/meta.zcml
   kukit/azax/trunk/plugins/registry.py
Log:
Z3 compatibility

Modified: kukit/azax/trunk/EXTERNALS.TXT
==============================================================================
--- kukit/azax/trunk/EXTERNALS.TXT	(original)
+++ kukit/azax/trunk/EXTERNALS.TXT	Sat Aug 12 16:27:03 2006
@@ -1,6 +1,6 @@
 #
 # results of svn propget svn:externals
-# https://svn.z3lab.org/z3lab/azax/trunk
+# http://codespeak.net/svn/kukit/azax/trunk
 #
 # You can update your working dir by: 
 #     svn propset svn:externals -F EXTERNALS.TXT .

Modified: kukit/azax/trunk/__init__.py
==============================================================================
--- kukit/azax/trunk/__init__.py	(original)
+++ kukit/azax/trunk/__init__.py	Sat Aug 12 16:27:03 2006
@@ -9,9 +9,25 @@
 from unicode_quirks import force_unicode, AzaxUnicodeError
 from commands import AzaxCommands, AzaxCommand, AzaxParam
 
+try:
+    import Products.Five
+except ImportError:
+    pass
+else:
 # Allow to build commands from restricted code
-from AccessControl import allow_class
-allow_class(AzaxCommands)
-allow_class(AzaxCommand)
-allow_class(AzaxParam)
-allow_class(AzaxUnicodeError)
+    from AccessControl import allow_class
+    allow_class(AzaxCommands)
+    allow_class(AzaxCommand)
+    allow_class(AzaxParam)
+    allow_class(AzaxUnicodeError)
+
+# alias myself to global namespace, in case I am in Products
+# this allows to run on Zope2, while configuration can
+# import the product as "azax", without Products
+try:
+    import sys
+    if not 'azax' in sys.modules:
+    # only 1st import is aliased.
+        pass #sys.modules['azax'] = sys.modules[globals()['__name__']]
+except ImportError:
+    pass

Added: kukit/azax/trunk/azax-configure.zcml
==============================================================================
--- (empty file)
+++ kukit/azax/trunk/azax-configure.zcml	Sat Aug 12 16:27:03 2006
@@ -0,0 +1,5 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <include package="azax" />
+
+</configure>

Added: kukit/azax/trunk/azax-meta.zcml
==============================================================================
--- (empty file)
+++ kukit/azax/trunk/azax-meta.zcml	Sat Aug 12 16:27:03 2006
@@ -0,0 +1,5 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <include package="azax" file="meta.zcml" />
+
+</configure>

Modified: kukit/azax/trunk/azaxview.py
==============================================================================
--- kukit/azax/trunk/azaxview.py	(original)
+++ kukit/azax/trunk/azaxview.py	Sat Aug 12 16:27:03 2006
@@ -32,7 +32,10 @@
 as well.
 '''
 
-from Products.Five import BrowserView
+try:
+    from Products.Five import BrowserView
+except ImportError:
+    from zope.app.publisher.browser import BrowserView
 from  commands import AzaxCommands, AzaxCommand
 from parsers import XmlParser, HtmlParser
 from zope.deprecation import deprecated

Modified: kukit/azax/trunk/plugins/EXTERNALS.TXT
==============================================================================
--- kukit/azax/trunk/plugins/EXTERNALS.TXT	(original)
+++ kukit/azax/trunk/plugins/EXTERNALS.TXT	Sat Aug 12 16:27:03 2006
@@ -7,4 +7,4 @@
 #
 
 # concatresource is now included like as batteries
-concatresource http://codespeak.net/svn/z3/jsonserver/branch/merge/concatresource
+_concatresource http://codespeak.net/svn/z3/jsonserver/branch/merge/concatresource

Modified: kukit/azax/trunk/plugins/configure.zcml
==============================================================================
--- kukit/azax/trunk/plugins/configure.zcml	(original)
+++ kukit/azax/trunk/plugins/configure.zcml	Sat Aug 12 16:27:03 2006
@@ -4,7 +4,7 @@
      >
      
     <!-- XXX concatresource is now included locally. -->
-    <include package=".concatresource" />
+    <include package="._concatresource" />
 
     <include package=".json" />
     

Modified: kukit/azax/trunk/plugins/json/configure.zcml
==============================================================================
--- kukit/azax/trunk/plugins/json/configure.zcml	(original)
+++ kukit/azax/trunk/plugins/json/configure.zcml	Sat Aug 12 16:27:03 2006
@@ -1,6 +1,8 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:browser="http://namespaces.zope.org/browser"
-           xmlns:five="http://namespaces.zope.org/five">
+           xmlns:five="http://namespaces.zope.org/five"
+           xmlns:zcml="http://namespaces.zope.org/zcml"
+           >
  
     <!-- We do not import things directly from jsonserver, as
          its presence is optional. We import these locally
@@ -9,23 +11,53 @@
          ensures that this zcml will always execute.
          XXX But this should actually be done via
          features / conditionals from here.
+
+         XXX in addition we don't know if azax is under Products
+         or not, so we provide both possibilities
     -->
 
-    <!-- View that renders the command -->
-    <adapter
-        for="Products.azax.interfaces.IAzaxCommands
-             .interfaces.IJsonRequest"
-        provides="zope.interface.Interface"
-        factory=".utils.JsonCommandView"
-        name="render"
-    />
- 
-    <!-- Json representation of commands -->
-    <adapter
-        for="Products.azax.interfaces.IAzaxCommand
-             .interfaces.IJSONWriter"
-        provides=".interfaces.IJSONStreamWriteable"
-        factory=".utils.AzaxCommandWriter"
-    />
-    
+    <configure zcml:condition="installed azax">
+
+        <!-- View that renders the command -->
+        <adapter
+            for="azax.interfaces.IAzaxCommands
+                 .interfaces.IJsonRequest"
+            provides="zope.interface.Interface"
+            factory=".utils.JsonCommandView"
+            name="render"
+        />
+     
+        <!-- Json representation of commands -->
+        <adapter
+            for="azax.interfaces.IAzaxCommand
+                 .interfaces.IJSONWriter"
+            provides=".interfaces.IJSONStreamWriteable"
+            factory=".utils.AzaxCommandWriter"
+        />
+        
+    </configure>
+
+    <configure zcml:condition="installed Products.azax">
+
+        <!-- View that renders the command -->
+        <adapter
+            for="Products.azax.interfaces.IAzaxCommands
+                 .interfaces.IJsonRequest"
+            provides="zope.interface.Interface"
+            factory=".utils.JsonCommandView"
+            name="render"
+        />
+     
+        <!-- Json representation of commands -->
+        <adapter
+            for="Products.azax.interfaces.IAzaxCommand
+                 .interfaces.IJSONWriter"
+            provides=".interfaces.IJSONStreamWriteable"
+            factory=".utils.AzaxCommandWriter"
+        />
+        
+    </configure>
+
+
+
 </configure>

Modified: kukit/azax/trunk/plugins/meta.zcml
==============================================================================
--- kukit/azax/trunk/plugins/meta.zcml	(original)
+++ kukit/azax/trunk/plugins/meta.zcml	Sat Aug 12 16:27:03 2006
@@ -2,7 +2,7 @@
      xmlns="http://namespaces.zope.org/meta">
 
    <!-- XXX concatresource is now included locally. -->
-   <include package=".concatresource" file="meta.zcml"/>
+   <include package="._concatresource" file="meta.zcml"/>
 
    <directives namespace="http://namespaces.zope.org/azax">
    

Modified: kukit/azax/trunk/plugins/registry.py
==============================================================================
--- kukit/azax/trunk/plugins/registry.py	(original)
+++ kukit/azax/trunk/plugins/registry.py	Sat Aug 12 16:27:03 2006
@@ -2,9 +2,9 @@
 from zope.component.exceptions import ComponentLookupError
 from interfaces import IAzaxPluginRegistry
 from zope.interface import implements
-# concatresource is an embedded product but interface is aliased to Products
-import concatresource
-from Products.concatresource.interfaces import IConcatResourceAddon
+# concatresource is an embedded product 
+import _concatresource
+from concatresource.interfaces import IConcatResourceAddon
 from json import getJsonAddonFiles
 
 def getRegistry(context=None):

From reebalazs at codespeak.net  Sat Aug 12 16:28:55 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sat, 12 Aug 2006 16:28:55 +0200 (CEST)
Subject: [Kukit-checkins] r31271 - kukit/azax/trunk/plugins
Message-ID: <20060812142855.8B2E110071@code0.codespeak.net>

Author: reebalazs
Date: Sat Aug 12 16:28:54 2006
New Revision: 31271

Modified:
   kukit/azax/trunk/plugins/   (props changed)
   kukit/azax/trunk/plugins/EXTERNALS.TXT
Log:
Fix externals

Modified: kukit/azax/trunk/plugins/EXTERNALS.TXT
==============================================================================
--- kukit/azax/trunk/plugins/EXTERNALS.TXT	(original)
+++ kukit/azax/trunk/plugins/EXTERNALS.TXT	Sat Aug 12 16:28:54 2006
@@ -1,6 +1,6 @@
 #
 # results of svn propget svn:externals
-# https://svn.z3lab.org/z3lab/azax/trunk/plugins
+# http://codespeak.net/svn/kukit/azax/trunk/plugins
 #
 # You can update your working dir by: 
 #     svn propset svn:externals -F EXTERNALS.TXT .

From reebalazs at codespeak.net  Sun Aug 13 12:01:45 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sun, 13 Aug 2006 12:01:45 +0200 (CEST)
Subject: [Kukit-checkins] r31278 - kukit/azax/trunk/plugins/json
Message-ID: <20060813100145.7EDC410083@code0.codespeak.net>

Author: reebalazs
Date: Sun Aug 13 12:01:41 2006
New Revision: 31278

Modified:
   kukit/azax/trunk/plugins/json/config.py
   kukit/azax/trunk/plugins/json/configure.zcml
   kukit/azax/trunk/plugins/json/interfaces.py
   kukit/azax/trunk/plugins/json/utils.py
Log:
Z3 compatibility: updating to json transport

Modified: kukit/azax/trunk/plugins/json/config.py
==============================================================================
--- kukit/azax/trunk/plugins/json/config.py	(original)
+++ kukit/azax/trunk/plugins/json/config.py	Sun Aug 13 12:01:41 2006
@@ -1,7 +1,16 @@
      
 try:
-    import Products.jsonserver
+    import jsonserver
+    from jsonserver.interfaces import IJSONRPCRequest
+    from jsonserver.minjson.interfaces import IJSONStreamWriteable, IJSONWriter
 except ImportError:
-    HAS_JSON = False
+    try:
+        import Products.jsonserver
+        from Products.jsonserver.interfaces import IJSONRPCRequest
+        from Products.jsonserver.minjson.interfaces import IJSONStreamWriteable, IJSONWriter
+    except ImportError:
+        HAS_JSON = False
+    else:
+        HAS_JSON = True
 else:
     HAS_JSON = True

Modified: kukit/azax/trunk/plugins/json/configure.zcml
==============================================================================
--- kukit/azax/trunk/plugins/json/configure.zcml	(original)
+++ kukit/azax/trunk/plugins/json/configure.zcml	Sun Aug 13 12:01:41 2006
@@ -21,7 +21,7 @@
         <!-- View that renders the command -->
         <adapter
             for="azax.interfaces.IAzaxCommands
-                 .interfaces.IJsonRequest"
+                 .interfaces.IJSONRPCRequest"
             provides="zope.interface.Interface"
             factory=".utils.JsonCommandView"
             name="render"
@@ -35,6 +35,28 @@
             factory=".utils.AzaxCommandWriter"
         />
         
+        <!-- provide z3 security for command elements -->
+        <content class="azax.commands.AzaxCommands">
+            <require
+                permission="zope.Public"
+                attributes="__iter__"
+                />
+        </content>
+ 
+        <content class="azax.commands.AzaxCommand">
+            <require
+                permission="zope.Public"
+                attributes="__dict__"
+                />
+        </content>
+        
+        <content class="azax.commands.AzaxParam">
+            <require
+                permission="zope.Public"
+                attributes="name content"
+                />
+        </content>
+
     </configure>
 
     <configure zcml:condition="installed Products.azax">
@@ -42,7 +64,7 @@
         <!-- View that renders the command -->
         <adapter
             for="Products.azax.interfaces.IAzaxCommands
-                 .interfaces.IJsonRequest"
+                 .interfaces.IJSONRPCRequest"
             provides="zope.interface.Interface"
             factory=".utils.JsonCommandView"
             name="render"
@@ -56,8 +78,28 @@
             factory=".utils.AzaxCommandWriter"
         />
         
-    </configure>
-
+        <!-- provide z3 security for command elements -->
+        <content class="Products.azax.commands.AzaxCommands">
+            <require
+                permission="zope.Public"
+                attributes="__iter__"
+                />
+        </content>
+ 
+        <content class="Products.azax.commands.AzaxCommand">
+            <require
+                permission="zope.Public"
+                attributes="__dict__"
+                />
+        </content>
+        
+        <content class="Products.azax.commands.AzaxParam">
+            <require
+                permission="zope.Public"
+                attributes="name content"
+                />
+        </content>
 
+    </configure>
 
 </configure>

Modified: kukit/azax/trunk/plugins/json/interfaces.py
==============================================================================
--- kukit/azax/trunk/plugins/json/interfaces.py	(original)
+++ kukit/azax/trunk/plugins/json/interfaces.py	Sun Aug 13 12:01:41 2006
@@ -19,15 +19,13 @@
 # 02111-1307, USA.
 #
 
-from config import HAS_JSON
+import config
 from zope.interface import Interface
 
-if HAS_JSON:
-    try:
-        from Products.jsonserver.interfaces import IJsonRequest
-    except ImportError:
-        from Products.jsonserver.z2_compatibility.interfaces import IJsonRequest
-    from Products.jsonserver.minjson.interfaces import IJSONStreamWriteable, IJSONWriter
+if config.HAS_JSON:
+    IJSONRPCRequest = config.IJSONRPCRequest
+    IJSONStreamWriteable = config.IJSONStreamWriteable
+    IJSONWriter = config.IJSONWriter
 else:
     # If jsonserver is not present, we just define interfaces
     # that noone implements so the adapters will never be looked up.
@@ -35,7 +33,7 @@
     # XXX occasionally this should be done from the zcml, 
     # via features/conditionals!
     
-    class IJsonRequest(Interface):
+    class IJSONRPCRequest(Interface):
         'Interface never to be implemented'
 
     class IJSONStreamWriteable(Interface):

Modified: kukit/azax/trunk/plugins/json/utils.py
==============================================================================
--- kukit/azax/trunk/plugins/json/utils.py	(original)
+++ kukit/azax/trunk/plugins/json/utils.py	Sun Aug 13 12:01:41 2006
@@ -2,26 +2,33 @@
 Supplemental support for json plugins
 '''
 
-import os.path
+import os.path, logging
 import zope.component
 from zope.interface import implements
 from zope.publisher.browser import TestRequest
-from config import HAS_JSON
 from interfaces import IJSONStreamWriteable
+from zope.component.exceptions import ComponentLookupError
+
+logger = logging.getLogger('azax')
 
 def getJsonAddonFiles():
     'Gets the addon javascript files for json'
     files = []
-    if HAS_JSON:
-        # Add the jsonserver files
-        request = TestRequest()
+    # Try adding the jsonserver files
+    request = TestRequest()
+    try:
         # use the files already registered to that concat resource
         # XXX TODO DEPREC warning. Change this to getAdapter.
         jsonrpc = zope.component.getResource('jsonrpc.js', request)
+    except ComponentLookupError:
+        pass    # JSON not present.
+    else:
+        # JSON present.
         files.extend(jsonrpc.context.context.getPathList())
         # add the json kukit support file
         plugins_dir = os.path.split(globals()['__file__'])[0]
         files.append(os.path.join(plugins_dir, 'browser', 'jsonkukit.js'))
+        logger.info('Lazy plugin construction: Installed support for JSON-RPC transport.')
     return files
 
 class JsonCommandView(object):

From reebalazs at codespeak.net  Sun Aug 13 15:35:28 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sun, 13 Aug 2006 15:35:28 +0200 (CEST)
Subject: [Kukit-checkins] r31279 - in kukit/azaxdemo/trunk: . browser
Message-ID: <20060813133528.89A2110083@code0.codespeak.net>

Author: reebalazs
Date: Sun Aug 13 15:35:20 2006
New Revision: 31279

Added:
   kukit/azaxdemo/trunk/EXTERNALS.TXT
   kukit/azaxdemo/trunk/azaxdemo-configure.zcml
   kukit/azaxdemo/trunk/azaxdemo-meta.zcml
   kukit/azaxdemo/trunk/meta.zcml
   kukit/azaxdemo/trunk/simplecontent_z3.py
Modified:
   kukit/azaxdemo/trunk/   (props changed)
   kukit/azaxdemo/trunk/__init__.py
   kukit/azaxdemo/trunk/azaxview.py
   kukit/azaxdemo/trunk/browser/azax_demo.pt
   kukit/azaxdemo/trunk/browser/azax_instant_edit.pt
   kukit/azaxdemo/trunk/browser/azax_three_autoupdate.pt
   kukit/azaxdemo/trunk/browser/azax_tree.pt
   kukit/azaxdemo/trunk/browser/azax_two_select.pt
   kukit/azaxdemo/trunk/browser/azax_xpath.pt
   kukit/azaxdemo/trunk/browser/cancel_submit.pt
   kukit/azaxdemo/trunk/browser/form_submit.pt
   kukit/azaxdemo/trunk/browser/header_macros.pt
   kukit/azaxdemo/trunk/browser/more_selectors.pt
   kukit/azaxdemo/trunk/browser/two_select_revisited.pt
   kukit/azaxdemo/trunk/configure.zcml
   kukit/azaxdemo/trunk/interfaces.py
   kukit/azaxdemo/trunk/simplecontent.py
Log:
Make demos work on z3

Added: kukit/azaxdemo/trunk/EXTERNALS.TXT
==============================================================================
--- (empty file)
+++ kukit/azaxdemo/trunk/EXTERNALS.TXT	Sun Aug 13 15:35:20 2006
@@ -0,0 +1,8 @@
+#
+# results of svn propget svn:externals
+# http://codespeak.net/svn/kukit/azaxdemo/trunk
+#
+# You can update your working dir by: 
+#     svn propset svn:externals -F EXTERNALS.TXT .
+#
+configfeature http://codespeak.net/svn/z3/jsonserver/branch/merge/configfeature

Modified: kukit/azaxdemo/trunk/__init__.py
==============================================================================
--- kukit/azaxdemo/trunk/__init__.py	(original)
+++ kukit/azaxdemo/trunk/__init__.py	Sun Aug 13 15:35:20 2006
@@ -1,9 +1,15 @@
-import simplecontent
 
-def initialize(context):
+try:
+    import Products.Five
+except ImportError:
+    pass
+else:
+    import simplecontent
 
-    context.registerClass(
-        simplecontent.SimpleContent,
-        constructors = (simplecontent.manage_addSimpleContentForm,
-                        simplecontent.manage_addSimpleContent),
-        )
+    def initialize(context):
+
+        context.registerClass(
+            simplecontent.SimpleContent,
+            constructors = (simplecontent.manage_addSimpleContentForm,
+                            simplecontent.manage_addSimpleContent),
+            )

Added: kukit/azaxdemo/trunk/azaxdemo-configure.zcml
==============================================================================
--- (empty file)
+++ kukit/azaxdemo/trunk/azaxdemo-configure.zcml	Sun Aug 13 15:35:20 2006
@@ -0,0 +1,5 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <include package="azaxdemo" />
+
+</configure>

Added: kukit/azaxdemo/trunk/azaxdemo-meta.zcml
==============================================================================
--- (empty file)
+++ kukit/azaxdemo/trunk/azaxdemo-meta.zcml	Sun Aug 13 15:35:20 2006
@@ -0,0 +1,5 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <include package="azaxdemo" file="meta.zcml" />
+
+</configure>

Modified: kukit/azaxdemo/trunk/azaxview.py
==============================================================================
--- kukit/azaxdemo/trunk/azaxview.py	(original)
+++ kukit/azaxdemo/trunk/azaxview.py	Sun Aug 13 15:35:20 2006
@@ -19,7 +19,11 @@
 # 02111-1307, USA.
 #
 
-from Products.azax import AzaxBaseView
+try:
+    from azax import AzaxBaseView
+except ImportError:
+    from Products.azax import AzaxBaseView
+
 import datetime
 
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile

Modified: kukit/azaxdemo/trunk/browser/azax_demo.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_demo.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_demo.pt	Sun Aug 13 15:35:20 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <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" />
+          tal:attributes="href string:${context/@@absolute_url}/++resource++azax_demo.kss"/>
+    <metal:header use-macro="context/@@header_macros/header_resources" />
   </head>
   <body>
   <!--a href="javascript:void(createLoggingPane(true));">logging</a-->
@@ -17,7 +17,7 @@
     <button id="change">
 	Change top div content
     </button>
-    <a tal:attributes="href string:${context/absolute_url}/getDivContent">
+    <a tal:attributes="href string:${context/@@absolute_url}/getDivContent">
        getDivContent RESPONSE
     </a>
     </li>
@@ -25,7 +25,7 @@
     <button id="clear">
 	Clear top div content
     </button>
-    <a tal:attributes="href string:${context/absolute_url}/clearDivContent">
+    <a tal:attributes="href string:${context/@@absolute_url}/clearDivContent">
        clearDivContent RESPONSE
     </a>
     </li>
@@ -33,7 +33,7 @@
     <button id="copyFrom">
 	Copy top div content to bottom
     </button>
-    <a tal:attributes="href string:${context/absolute_url}/copyFromDivContent">
+    <a tal:attributes="href string:${context/@@absolute_url}/copyFromDivContent">
       copyFromDivContent RESPONSE
     </a>
     </li>
@@ -41,7 +41,7 @@
     <button id="copyTo">
 	Copy bottom div content to top
     </button>
-    <a tal:attributes="href string:${context/absolute_url}/copyToDivContent">
+    <a tal:attributes="href string:${context/@@absolute_url}/copyToDivContent">
       copyToDivContent RESPONSE
     </a>
     </li>
@@ -49,7 +49,7 @@
     <button id="moveTo">
 	Move bottom div content to top
     </button>
-    <a tal:attributes="href string:${context/absolute_url}/moveToDivContent">
+    <a tal:attributes="href string:${context/@@absolute_url}/moveToDivContent">
       moveToDivContent RESPONSE
     </a>
     </li>
@@ -62,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.kss">
+          <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.
@@ -85,7 +85,7 @@
      The Javascript engine selects the DOM nodes to which it applies each command.
    </p>
    <p>
-     For instance, let's look at the <a tal:attributes="href string:${context/absolute_url}/moveToDivContent"><code>moveToDivContent</code> response</a>.
+     For instance, let's look at the <a tal:attributes="href string:${context/@@absolute_url}/moveToDivContent"><code>moveToDivContent</code> response</a>.
    </p>
    <pre>
 &lt;selectors&gt;

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	Sun Aug 13 15:35:20 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="kukit" type="text/css"
-          tal:attributes="href string:${context/absolute_url}/++resource++azax_instant_edit.kss"/>
-    <metal:header use-macro="context/header_macros/macros/header_resources" />
+          tal:attributes="href string:${context/@@absolute_url}/++resource++azax_instant_edit.kss"/>
+    <metal:header use-macro="context/@@header_macros/header_resources" />
   </head>
   <body>
     <p><a href=".">All demos</a></p>

Modified: kukit/azaxdemo/trunk/browser/azax_three_autoupdate.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_three_autoupdate.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_three_autoupdate.pt	Sun Aug 13 15:35:20 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="kukit" type="text/css" 
-          tal:attributes="href string:${context/absolute_url}/++resource++azax_three_autoupdate.kss"/>
-    <metal:header use-macro="context/header_macros/macros/header_resources" />
+          tal:attributes="href string:${context/@@absolute_url}/++resource++azax_three_autoupdate.kss"/>
+    <metal:header use-macro="context/@@header_macros/header_resources" />
     <style type="text/css">
         #update-area {
             border: 1px solid black;

Modified: kukit/azaxdemo/trunk/browser/azax_tree.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_tree.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_tree.pt	Sun Aug 13 15:35:20 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="kukit" type="text/css"
-          tal:attributes="href string:${context/absolute_url}/++resource++azax_tree.kss"/>
-    <metal:header use-macro="context/header_macros/macros/header_resources" />
+          tal:attributes="href string:${context/@@absolute_url}/++resource++azax_tree.kss"/>
+    <metal:header use-macro="context/@@header_macros/header_resources" />
     <style>
         ul, li{
             list-style: square;

Modified: kukit/azaxdemo/trunk/browser/azax_two_select.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_two_select.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_two_select.pt	Sun Aug 13 15:35:20 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="kukit" type="text/css"
-          tal:attributes="href string:${context/absolute_url}/++resource++azax_two_selects.kss"/>
-    <metal:header use-macro="context/header_macros/macros/header_resources" />
+          tal:attributes="href string:${context/@@absolute_url}/++resource++azax_two_selects.kss"/>
+    <metal:header use-macro="context/@@header_macros/header_resources" />
   </head>
   <body>
     <p><a href=".">All demos</a></p>

Modified: kukit/azaxdemo/trunk/browser/azax_xpath.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_xpath.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_xpath.pt	Sun Aug 13 15:35:20 2006
@@ -1,9 +1,9 @@
 <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" />
+          tal:attributes="href string:${context/@@absolute_url}/++resource++azax_xpath.kss"/>
+    <metal:header use-macro="context/@@header_macros/header_resources" />
+    <metal:header use-macro="context/@@header_macros/ajaxslt_extra_resources" />
   </head>
   <body>
     <p><a href=".">All demos</a></p>

Modified: kukit/azaxdemo/trunk/browser/cancel_submit.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/cancel_submit.pt	(original)
+++ kukit/azaxdemo/trunk/browser/cancel_submit.pt	Sun Aug 13 15:35:20 2006
@@ -2,8 +2,8 @@
   <head>
     <link rel="kukit" type="text/css"
           tal:attributes="href
-          string:${context/absolute_url}/++resource++cancel_submit.kss"/>
-    <metal:header use-macro="context/header_macros/macros/header_resources" />
+          string:${context/@@absolute_url}/++resource++cancel_submit.kss"/>
+    <metal:header use-macro="context/@@header_macros/header_resources" />
   </head>
   <body>
     <p><a href=".">All demos</a></p>

Modified: kukit/azaxdemo/trunk/browser/form_submit.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/form_submit.pt	(original)
+++ kukit/azaxdemo/trunk/browser/form_submit.pt	Sun Aug 13 15:35:20 2006
@@ -2,8 +2,8 @@
   <head>
     <link rel="kukit" type="text/css"
           tal:attributes="href
-          string:${context/absolute_url}/++resource++form_submit.kss"/>
-    <metal:header use-macro="context/header_macros/macros/header_resources" />
+          string:${context/@@absolute_url}/++resource++form_submit.kss"/>
+    <metal:header use-macro="context/@@header_macros/header_resources" />
 	<style>label {font-weight: bold;}</style>
   </head>
   <body>

Modified: kukit/azaxdemo/trunk/browser/header_macros.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/header_macros.pt	(original)
+++ kukit/azaxdemo/trunk/browser/header_macros.pt	Sun Aug 13 15:35:20 2006
@@ -2,19 +2,19 @@
     <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;"
+      tal:attributes="src string:${context/@@absolute_url}/++resource++sarissa.js;"
       src="++resource++sarissa.js">
     </script>
     <script type="text/javascript"
-      tal:attributes="src string:${context/absolute_url}/++resource++cssQuery.js;"
+      tal:attributes="src string:${context/@@absolute_url}/++resource++cssQuery.js;"
       src="++resource++cssQuery.js">
     </script>
     <script type="text/javascript"
-      tal:attributes="src string:${context/absolute_url}/++resource++MochiKit.js;"
+      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;"
+      tal:attributes="src string:${context/@@absolute_url}/++resource++kukit.js;"
       src="++resource++kukit.js">
     </script>
     </metal:header>
@@ -24,22 +24,22 @@
     <metal:header define-macro="ajaxslt_extra_resources">
     <script type="text/javascript"
       tal:attributes="src
-      string:${context/absolute_url}/++resource++ajaxslt_misc.js;"
+      string:${context/@@absolute_url}/++resource++ajaxslt_misc.js;"
       src="++resource++ajaxslt_misc.js">
     </script>
     <script type="text/javascript"
       tal:attributes="src
-      string:${context/absolute_url}/++resource++ajaxslt_dom.js;"
+      string:${context/@@absolute_url}/++resource++ajaxslt_dom.js;"
       src="++resource++ajaxslt_dom.js">
     </script>
     <script type="text/javascript"
       tal:attributes="src
-      string:${context/absolute_url}/++resource++ajaxslt_xpath.js;"
+      string:${context/@@absolute_url}/++resource++ajaxslt_xpath.js;"
       src="++resource++ajaxslt_xpath.js">
     </script>
     <!--script type="text/javascript"
       tal:attributes="src
-      string:${context/absolute_url}/++resource++ajaxslt_xslt.js;"
+      string:${context/@@absolute_url}/++resource++ajaxslt_xslt.js;"
       src="++resource++ajaxslt_xslt.js">
     </script-->
     </metal:header>

Modified: kukit/azaxdemo/trunk/browser/more_selectors.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/more_selectors.pt	(original)
+++ kukit/azaxdemo/trunk/browser/more_selectors.pt	Sun Aug 13 15:35:20 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="kukit" type="text/css" 
-          tal:attributes="href string:${context/absolute_url}/++resource++more_selectors.kss"/>
-    <metal:header use-macro="context/header_macros/macros/header_resources" />
+          tal:attributes="href string:${context/@@absolute_url}/++resource++more_selectors.kss"/>
+    <metal:header use-macro="context/@@header_macros/header_resources" />
     <style type="text/css">
         #update-status {
             border: 1px solid black;

Modified: kukit/azaxdemo/trunk/browser/two_select_revisited.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/two_select_revisited.pt	(original)
+++ kukit/azaxdemo/trunk/browser/two_select_revisited.pt	Sun Aug 13 15:35:20 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="kukit" type="text/css"
-          tal:attributes="href string:${context/absolute_url}/++resource++two_select_revisited.kss"/>
-    <metal:header use-macro="context/header_macros/macros/header_resources" />
+          tal:attributes="href string:${context/@@absolute_url}/++resource++two_select_revisited.kss"/>
+    <metal:header use-macro="context/@@header_macros/header_resources" />
   </head>
   <body>
     <p><a href=".">All demos</a></p>

Modified: kukit/azaxdemo/trunk/configure.zcml
==============================================================================
--- kukit/azaxdemo/trunk/configure.zcml	(original)
+++ kukit/azaxdemo/trunk/configure.zcml	Sun Aug 13 15:35:20 2006
@@ -1,8 +1,19 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:browser="http://namespaces.zope.org/browser"
            xmlns:five="http://namespaces.zope.org/five"
-           xmlns:azax="http://namespaces.zope.org/azax">
-
+           xmlns:azax="http://namespaces.zope.org/azax"
+           xmlns:zcml="http://namespaces.zope.org/zcml"
+		   i18n_domain="azax"
+		   >
+
+  <!-- Things to do only on Zope2 -->
+  <configure zcml:condition="have compat_five">
+
+    <!-- Define a new permission -->
+     <permission
+        id="zope.View"
+        title="View"
+    />
 
   <interface
       interface=".interfaces.ISimpleContent"
@@ -13,42 +24,86 @@
 
   <five:defaultViewable class=".simplecontent.SimpleContent" />
 
+
   <content class=".simplecontent.SimpleContent">
     <implements
         interface=".interfaces.ISimpleContent"
         />
     <require
-        permission="zope2.View"
+        permission="zope.View"
         interface=".interfaces.ISimpleContent"
         />
   </content>
- 
-  <browser:defaultView
+
+   <browser:page
       for=".interfaces.ISimpleContent"
+      template="browser/azax_demo_index.pt"
       name="index.html"
+      permission="zope.View"
       />
+ 
+  </configure>
+
+  <!-- Things to do only on Zope3 -->
+  <configure zcml:condition="have compat_not_five">
+
+    <content class=".simplecontent_z3.SimpleContent">
+        <implements
+            interface=".interfaces.ISimpleContent"
+            />
+        <!--factory
+            id="zopeproducts.axaxdemo"
+            title="Azax demos folder"
+            description="A folder to hold a set of azax demos"
+        /-->
+    </content>
 
   <browser:page
       for=".interfaces.ISimpleContent"
       template="browser/azax_demo_index.pt"
       name="index.html"
-      permission="zope2.View"
+      permission="zope.View"
+      menu="zmi_views"
+      title="View demos"
       />
-  
+ 
+    <browser:addform
+        label="Add azax demos folder"
+        name="AddSimpleContent.html"
+        schema=".interfaces.ISimpleContent"
+        content_factory=".simplecontent_z3.SimpleContent"
+        fields=""
+        permission="zope.ManageContent"
+        />
 
-  <!-- change tag content -->
-  <browser:page
+   <browser:addMenuItem
+        class=".simplecontent_z3.SimpleContent"
+        title="Azax demos folder"
+        description="A folder to hold a set of azax demos"
+        permission="zope.ManageContent"
+        view="AddSimpleContent.html"
+        />
+
+  </configure>
+
+   <browser:defaultView
       for=".interfaces.ISimpleContent"
-      template="browser/azax_demo.pt"
-      name="demo1.html"
-      permission="zope2.View"
+      name="index.html"
       />
 
   <browser:page
       for=".interfaces.ISimpleContent"
       template="browser/header_macros.pt"
       name="header_macros"
-      permission="zope2.View"
+      permission="zope.View"
+      />
+
+  <!-- change tag content -->
+  <browser:page
+      for=".interfaces.ISimpleContent"
+      template="browser/azax_demo.pt"
+      name="demo1.html"
+      permission="zope.View"
       />
 
   <browser:resource
@@ -61,7 +116,7 @@
       class=".azaxview.AzaxView"
       attribute="getDivContent"
       name="getDivContent"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:page
@@ -69,7 +124,7 @@
       class=".azaxview.AzaxView"
       attribute="copyFromDivContent"
       name="copyFromDivContent"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:page
@@ -77,7 +132,7 @@
       class=".azaxview.AzaxView"
       attribute="copyToDivContent"
       name="copyToDivContent"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:page
@@ -85,7 +140,7 @@
       class=".azaxview.AzaxView"
       attribute="moveToDivContent"
       name="moveToDivContent"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:page
@@ -93,7 +148,7 @@
       class=".azaxview.AzaxView"
       attribute="clearDivContent"
       name="clearDivContent"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
 
@@ -102,7 +157,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/azax_two_select.pt"
       name="two_selects.html"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:resource
@@ -115,7 +170,7 @@
       class=".azaxview.AzaxView"
       attribute="getCorrespondingSelect"
       name="getCorrespondingSelect"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
 
@@ -124,7 +179,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/azax_three_autoupdate.pt"
       name="three_autoupdate.html"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:resource
@@ -137,7 +192,7 @@
       class=".azaxview.AzaxView"
       attribute="getCurrentTime"
       name="getCurrentTime"
-      permission="zope2.View"
+      permission="zope.View"
       />
       
       
@@ -146,7 +201,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/azax_instant_edit.pt"
       name="azax_instant_edit.html"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:page
@@ -154,7 +209,7 @@
       class=".azaxview.AzaxView"
       attribute="getAutoupdateMarkup"
       name="getAutoupdateMarkup"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:resource
@@ -167,7 +222,7 @@
       class=".azaxview.AzaxView"
       attribute="getInputField"
       name="getInputField"
-      permission="zope2.View"
+      permission="zope.View"
       />
       
   <browser:page
@@ -175,7 +230,7 @@
       class=".azaxview.AzaxView"
       attribute="saveText"
       name="saveText"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <!-- xpath content -->
@@ -183,7 +238,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/azax_xpath.pt"
       name="azax_xpath.html"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:resource
@@ -196,7 +251,7 @@
       class=".azaxview.AzaxView"
       attribute="removeNodeXpath"
       name="removeNodeXpath"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <!-- cancel submit -->
@@ -204,7 +259,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/cancel_submit.pt"
       name="cancel_submit.html"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:resource
@@ -217,7 +272,7 @@
       class=".azaxview.AzaxView"
       attribute="cancelSubmitSave"
       name="save"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <!-- tree content -->
@@ -225,7 +280,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/azax_tree.pt"
       name="azax_tree.html"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:resource
@@ -238,7 +293,7 @@
       class=".azaxview.AzaxView"
       attribute="expandSubTree"
       name="expandSubTree"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:page
@@ -246,7 +301,7 @@
       class=".azaxview.AzaxView"
       attribute="collapseSubTree"
       name="collapseSubTree"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
 
@@ -255,7 +310,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/more_selectors.pt"
       name="more_selectors.html"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:resource
@@ -268,13 +323,13 @@
       class=".azaxview.AzaxView"
       attribute="clickedButton"
       name="clickedButton"
-      permission="zope2.View"
+      permission="zope.View"
       />
  
-  	<azax:registerEventType
-		name="myCustomEventType"
+      <azax:registerEventType
+        name="myCustomEventType"
         jsfile="browser/more_selectors.js"
-    	/>
+        />
 
 
   <!-- two_selects revisited content -->
@@ -282,7 +337,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/two_select_revisited.pt"
       name="two_select_revisited.html"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:resource
@@ -295,7 +350,7 @@
       class=".azaxview.AzaxView"
       attribute="updateSlaveSelector"
       name="updateSlaveSelector"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
 
@@ -304,7 +359,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/form_submit.pt"
       name="form_submit.html"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:resource
@@ -317,7 +372,7 @@
       class=".azaxview.AzaxView"
       attribute="formSubmitSave"
       name="formSave"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
 

Modified: kukit/azaxdemo/trunk/interfaces.py
==============================================================================
--- kukit/azaxdemo/trunk/interfaces.py	(original)
+++ kukit/azaxdemo/trunk/interfaces.py	Sun Aug 13 15:35:20 2006
@@ -1,4 +1,4 @@
 from zope.interface import Interface
 
 class ISimpleContent(Interface):
-    pass
\ No newline at end of file
+    pass

Added: kukit/azaxdemo/trunk/meta.zcml
==============================================================================
--- (empty file)
+++ kukit/azaxdemo/trunk/meta.zcml	Sun Aug 13 15:35:20 2006
@@ -0,0 +1,6 @@
+<configure
+     xmlns="http://namespaces.zope.org/meta">
+
+   <include package=".configfeature" file="meta.zcml"/>
+
+</configure>

Modified: kukit/azaxdemo/trunk/simplecontent.py
==============================================================================
--- kukit/azaxdemo/trunk/simplecontent.py	(original)
+++ kukit/azaxdemo/trunk/simplecontent.py	Sun Aug 13 15:35:20 2006
@@ -1,19 +1,26 @@
-##############################################################################
+# -*- coding: utf-8 -*-
+# Copyright (c) 2005-2006
+# Authors:
+#   Godefroid Chapelle <gotcha at bubblenet.be>
+#   Tarek Ziad? <tz at nuxeo.com>
+#   Bal?zs Re? <ree at greenfinity.hu>
 #
-# Copyright (c) 2004, 2005 Zope Corporation and Contributors.
-# All Rights Reserved.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as published
+# by the Free Software Foundation.
 #
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
 #
-##############################################################################
-"""Simple content implementationm
 
-$Id: simplecontent.py 12915 2005-05-31 10:23:19Z philikon $
+"""Simple content implementation
 """
 from OFS.SimpleItem import SimpleItem
 from Globals import InitializeClass

Added: kukit/azaxdemo/trunk/simplecontent_z3.py
==============================================================================
--- (empty file)
+++ kukit/azaxdemo/trunk/simplecontent_z3.py	Sun Aug 13 15:35:20 2006
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2005-2006
+# Authors:
+#   Godefroid Chapelle <gotcha at bubblenet.be>
+#   Bal?zs Re? <ree at greenfinity.hu>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
+
+'''\
+Simple content implementation
+'''
+
+from persistent import Persistent
+from zope.interface import implements
+from interfaces import ISimpleContent
+
+class SimpleContent(Persistent):
+    implements(ISimpleContent)

From reebalazs at codespeak.net  Mon Aug 14 09:29:09 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon, 14 Aug 2006 09:29:09 +0200 (CEST)
Subject: [Kukit-checkins] r31283 - kukit/azaxdemo/trunk
Message-ID: <20060814072909.1964A10090@code0.codespeak.net>

Author: reebalazs
Date: Mon Aug 14 09:29:07 2006
New Revision: 31283

Modified:
   kukit/azaxdemo/trunk/azaxview.py
Log:
Fix unicode issues to work on Z3

Modified: kukit/azaxdemo/trunk/azaxview.py
==============================================================================
--- kukit/azaxdemo/trunk/azaxview.py	(original)
+++ kukit/azaxdemo/trunk/azaxview.py	Mon Aug 14 09:29:07 2006
@@ -20,9 +20,9 @@
 #
 
 try:
-    from azax import AzaxBaseView
+    from azax import AzaxBaseView, force_unicode
 except ImportError:
-    from Products.azax import AzaxBaseView
+    from Products.azax import AzaxBaseView, force_unicode
 
 import datetime
 
@@ -89,8 +89,8 @@
         
     def getInputField(self, value):
         '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')
+        # We need to make unicode. But on Z2 we receive utf-8, on Z3 unicode
+        value = force_unicode(value, 'utf')
         self.replaceInnerHTML('div#text', 
                             '<div><input type="text" name="value" value="'+value+'" /></div>' \
                             '<input type="button" value="save" id="save" />'
@@ -99,9 +99,9 @@
         
     def saveText(self, value):
         '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.relpaceInnerHTML('div#text', value+'<input type="hidden" name="value" value="'+value+'" />')
+        # We need to make unicode. But on Z2 we receive utf-8, on Z3 unicode
+        value = force_unicode(value, 'utf')
+        self.replaceInnerHTML('div#text', value+'<input type="hidden" name="value" value="'+value+'" />')
         return self.render()
     
     def expandSubTree(self, value):
@@ -115,8 +115,9 @@
         return self.render()
 
     def cancelSubmitSave(self, text_save):
-        # we receive in utf encoding, but the methods receive utf, so we convert.
-        self.replaceInnerHTML('div#async', 'Async saved %s' % unicode(text_save, 'utf'))
+        # We need to make unicode. But on Z2 we receive utf-8, on Z3 unicode
+        text_save = force_unicode(text_save, 'utf')
+        self.replaceInnerHTML('div#async', 'Async saved %s' % text_save)
         return self.render()
 
     def removeNodeXpath(self):
@@ -152,6 +153,7 @@
         for key, value in data.items():
             result.append('<tr><td>%s</td><td>%s</td></tr>' % (key, value))
         result.append('</table>')
-        # we build command with unicode, but the methods receive utf, so we convert.
-        self.replaceInnerHTML('div#async', unicode(''.join(result), 'utf'))
+        # We need to make unicode. But on Z2 we receive utf-8, on Z3 unicode
+        retval = force_unicode(''.join(result), 'utf')
+        self.replaceInnerHTML('div#async', retval)
         return self.render()

From gotcha at codespeak.net  Tue Aug 15 09:36:25 2006
From: gotcha at codespeak.net (gotcha at codespeak.net)
Date: Tue, 15 Aug 2006 09:36:25 +0200 (CEST)
Subject: [Kukit-checkins] r31308 - kukit/azax/trunk
Message-ID: <20060815073625.AD5BD10074@code0.codespeak.net>

Author: gotcha
Date: Tue Aug 15 09:36:22 2006
New Revision: 31308

Added:
   kukit/azax/trunk/HISTORY.txt
Modified:
   kukit/azax/trunk/azaxview.py
   kukit/azax/trunk/commands.py
   kukit/azax/trunk/configure.zcml
   kukit/azax/trunk/interfaces.py
   kukit/azax/trunk/parsers.py
   kukit/azax/trunk/selectors.py
Log:
* Simulate zope.deprecation.deprecated for Zope 2.8
* Remove accented characters in code


Added: kukit/azax/trunk/HISTORY.txt
==============================================================================
--- (empty file)
+++ kukit/azax/trunk/HISTORY.txt	Tue Aug 15 09:36:22 2006
@@ -0,0 +1,8 @@
+Before 0.5.0
+============
+
+  * Simulate zope.deprecation.deprecated for Zope 2.8
+    [gotcha]
+
+  * Remove accented characters in code
+    [gotcha]

Modified: kukit/azax/trunk/azaxview.py
==============================================================================
--- kukit/azax/trunk/azaxview.py	(original)
+++ kukit/azax/trunk/azaxview.py	Tue Aug 15 09:36:22 2006
@@ -1,9 +1,8 @@
-# -*- coding: ISO-8859-15 -*-
 # Copyright (c) 2005-2006
 # Authors:
 #   Godefroid Chapelle <gotcha at bubblenet.be>
-#   Tarek Ziad? <tz at nuxeo.com>
-#   Bal?zs Re? <ree at greenfinity.hu>
+#   Tarek Ziade <tz at nuxeo.com>
+#   Balazs Ree <ree at greenfinity.hu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as published
@@ -36,9 +35,17 @@
     from Products.Five import BrowserView
 except ImportError:
     from zope.app.publisher.browser import BrowserView
-from  commands import AzaxCommands, AzaxCommand
+from commands import AzaxCommands, AzaxCommand
 from parsers import XmlParser, HtmlParser
-from zope.deprecation import deprecated
+try:
+    from zope.deprecation import deprecated
+except ImportError:
+    import warnings
+    def deprecated(method, message):
+        def deprecated_method(self, *args, **kw):
+            warnings.warn(message, DeprecationWarning, 2)
+            return method(self, *args, **kw)
+        return deprecated_method
 
 class AzaxBaseView(BrowserView):
     """ Base azax view

Modified: kukit/azax/trunk/commands.py
==============================================================================
--- kukit/azax/trunk/commands.py	(original)
+++ kukit/azax/trunk/commands.py	Tue Aug 15 09:36:22 2006
@@ -2,7 +2,7 @@
 # Copyright (c) 2006
 # Authors:
 #   Godefroid Chapelle <gotcha at bubblenet.be>
-#   Bal?zs Re? <ree at greenfinity.hu>
+#   Balazs Ree <ree at greenfinity.hu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as published

Modified: kukit/azax/trunk/configure.zcml
==============================================================================
--- kukit/azax/trunk/configure.zcml	(original)
+++ kukit/azax/trunk/configure.zcml	Tue Aug 15 09:36:22 2006
@@ -25,7 +25,7 @@
         kukit/kukit/forms.js
         kukit/kukit/plugin.js"
     name="kukit.js"
-    compress_level="safe"
+    compress_level="none"
   />
   <!-- Replace with 
     compress_level="none"

Modified: kukit/azax/trunk/interfaces.py
==============================================================================
--- kukit/azax/trunk/interfaces.py	(original)
+++ kukit/azax/trunk/interfaces.py	Tue Aug 15 09:36:22 2006
@@ -1,8 +1,7 @@
-# -*- coding: ISO-8859-15 -*-
 # Copyright (c) 2005
 # Authors:
 #   Godefroid Chapelle <gotcha at bubblenet.be>
-#   Tarek Ziad? <tz at nuxeo.com>
+#   Tarek Ziade <tz at nuxeo.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as published

Modified: kukit/azax/trunk/parsers.py
==============================================================================
--- kukit/azax/trunk/parsers.py	(original)
+++ kukit/azax/trunk/parsers.py	Tue Aug 15 09:36:22 2006
@@ -2,7 +2,7 @@
 # Copyright (c) 2006
 # Authors:
 #   Godefroid Chapelle <gotcha at bubblenet.be>
-#   Bal?zs Re? <ree at greenfinity.hu>
+#   Balazs Ree <ree at greenfinity.hu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as published

Modified: kukit/azax/trunk/selectors.py
==============================================================================
--- kukit/azax/trunk/selectors.py	(original)
+++ kukit/azax/trunk/selectors.py	Tue Aug 15 09:36:22 2006
@@ -1,4 +1,3 @@
-# -*- coding: ISO-8859-15 -*-
 # Copyright (c) 2006
 # Authors:
 #   Godefroid Chapelle <gotcha at bubblenet.be>

From gotcha at codespeak.net  Tue Aug 15 09:59:33 2006
From: gotcha at codespeak.net (gotcha at codespeak.net)
Date: Tue, 15 Aug 2006 09:59:33 +0200 (CEST)
Subject: [Kukit-checkins] r31309 - kukit/kukit.js/branch/gotcha-refactor
Message-ID: <20060815075933.0558310074@code0.codespeak.net>

Author: gotcha
Date: Tue Aug 15 09:59:32 2006
New Revision: 31309

Added:
   kukit/kukit.js/branch/gotcha-refactor/
      - copied from r31308, kukit/kukit.js/trunk/
Log:
branch for js refactoring : identifiers renaming, passing less parameters...


From reebalazs at codespeak.net  Tue Aug 15 18:32:21 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 15 Aug 2006 18:32:21 +0200 (CEST)
Subject: [Kukit-checkins] r31327 - kukit/kukit.js/trunk/kukit
Message-ID: <20060815163221.7AA5810074@code0.codespeak.net>

Author: reebalazs
Date: Tue Aug 15 18:32:19 2006
New Revision: 31327

Modified:
   kukit/kukit.js/trunk/kukit/kssparser.js
Log:
error msg on parms evt-xxx

Modified: kukit/kukit.js/trunk/kukit/kssparser.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kssparser.js	(original)
+++ kukit/kukit.js/trunk/kukit/kssparser.js	Tue Aug 15 18:32:19 2006
@@ -150,7 +150,9 @@
         this.evt_parms[qualifier2] = value.txt;
     } else {
         // xxx-yyy, two tags only
-        if (name == 'action') {
+        if (name == 'evt') {
+            this.emitError('kss param key must be like xxx-yyy or evt-xxx-yyy"' + key + '"');
+        } else if (name == 'action') {
             if (value.isMethod != false) {
                 this.emitError('action-xxx: cannot use method as parm value, key "' + key + '"');
             }

From reebalazs at codespeak.net  Tue Aug 15 18:40:24 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 15 Aug 2006 18:40:24 +0200 (CEST)
Subject: [Kukit-checkins] r31328 - kukit/kukit.js/trunk/kukit
Message-ID: <20060815164024.B51E710074@code0.codespeak.net>

Author: reebalazs
Date: Tue Aug 15 18:40:23 2006
New Revision: 31328

Modified:
   kukit/kukit.js/trunk/kukit/plugin.js
Log:
Fix tests

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Tue Aug 15 18:40:23 2006
@@ -135,7 +135,9 @@
 };
 
 // Sigh. We need this.
-kukit.pl.have_Safari = navigator.vendor && navigator.vendor.indexOf('Apple') != -1;
+try {
+    kukit.pl.have_Safari = navigator.vendor && navigator.vendor.indexOf('Apple') != -1;
+} catch (e) {}
 
 kukit.pl.NativeEventBinder.prototype.__bind__ = function(name, parms, func_to_bind, node) {
     parms = kukit.pl.completeParms(parms, [], {'preventdefault': '', 'allowbubbling': ''}, 'native event binding');

From reebalazs at codespeak.net  Tue Aug 15 19:32:41 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 15 Aug 2006 19:32:41 +0200 (CEST)
Subject: [Kukit-checkins] r31329 - kukit/kukit.js/trunk/kukit
Message-ID: <20060815173241.C68B110074@code0.codespeak.net>

Author: reebalazs
Date: Tue Aug 15 19:32:39 2006
New Revision: 31329

Modified:
   kukit/kukit.js/trunk/kukit/forms.js
Log:
minor fix

Modified: kukit/kukit.js/trunk/kukit/forms.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/forms.js	(original)
+++ kukit/kukit.js/trunk/kukit/forms.js	Tue Aug 15 19:32:39 2006
@@ -90,7 +90,7 @@
         }
         node = node.parentNode;
     }
-    return false;
+    return null;
 };
 
 kukit.fo.getCurrentForm = function(target) {

From reebalazs at codespeak.net  Thu Aug 17 11:09:11 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 17 Aug 2006 11:09:11 +0200 (CEST)
Subject: [Kukit-checkins] r31359 - kukit/azax/branch/zope2.8
Message-ID: <20060817090911.0CBAB1008E@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 17 11:09:09 2006
New Revision: 31359

Added:
   kukit/azax/branch/zope2.8/
      - copied from r31358, kukit/azax/trunk/
Log:
zope2.9 backport

From reebalazs at codespeak.net  Thu Aug 17 11:14:48 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 17 Aug 2006 11:14:48 +0200 (CEST)
Subject: [Kukit-checkins] r31361 - kukit/azaxdemo/branch/zope2.8
Message-ID: <20060817091448.897281008E@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 17 11:14:45 2006
New Revision: 31361

Added:
   kukit/azaxdemo/branch/zope2.8/
      - copied from r31360, kukit/azaxdemo/trunk/
Log:
zope2.8 backport

From reebalazs at codespeak.net  Thu Aug 17 11:24:03 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 17 Aug 2006 11:24:03 +0200 (CEST)
Subject: [Kukit-checkins] r31363 - in kukit/azaxdemo/branch/zope2.8: .
	browser
Message-ID: <20060817092403.9F0FB1008E@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 17 11:23:58 2006
New Revision: 31363

Removed:
   kukit/azaxdemo/branch/zope2.8/EXTERNALS.TXT
   kukit/azaxdemo/branch/zope2.8/azaxdemo-configure.zcml
   kukit/azaxdemo/branch/zope2.8/azaxdemo-meta.zcml
   kukit/azaxdemo/branch/zope2.8/meta.zcml
   kukit/azaxdemo/branch/zope2.8/simplecontent_z3.py
Modified:
   kukit/azaxdemo/branch/zope2.8/   (props changed)
   kukit/azaxdemo/branch/zope2.8/__init__.py
   kukit/azaxdemo/branch/zope2.8/azaxview.py
   kukit/azaxdemo/branch/zope2.8/browser/azax_demo.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_instant_edit.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_three_autoupdate.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_two_select.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_xpath.pt
   kukit/azaxdemo/branch/zope2.8/browser/cancel_submit.pt
   kukit/azaxdemo/branch/zope2.8/browser/form_submit.pt
   kukit/azaxdemo/branch/zope2.8/browser/header_macros.pt
   kukit/azaxdemo/branch/zope2.8/browser/more_selectors.pt
   kukit/azaxdemo/branch/zope2.8/browser/two_select_revisited.pt
   kukit/azaxdemo/branch/zope2.8/configure.zcml
   kukit/azaxdemo/branch/zope2.8/interfaces.py
Log:
zope2.8 backport

Deleted: /kukit/azaxdemo/branch/zope2.8/EXTERNALS.TXT
==============================================================================
--- /kukit/azaxdemo/branch/zope2.8/EXTERNALS.TXT	Thu Aug 17 11:23:58 2006
+++ (empty file)
@@ -1,8 +0,0 @@
-#
-# results of svn propget svn:externals
-# http://codespeak.net/svn/kukit/azaxdemo/trunk
-#
-# You can update your working dir by: 
-#     svn propset svn:externals -F EXTERNALS.TXT .
-#
-configfeature http://codespeak.net/svn/z3/jsonserver/branch/merge/configfeature

Modified: kukit/azaxdemo/branch/zope2.8/__init__.py
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/__init__.py	(original)
+++ kukit/azaxdemo/branch/zope2.8/__init__.py	Thu Aug 17 11:23:58 2006
@@ -1,15 +1,9 @@
+import simplecontent
 
-try:
-    import Products.Five
-except ImportError:
-    pass
-else:
-    import simplecontent
+def initialize(context):
 
-    def initialize(context):
-
-        context.registerClass(
-            simplecontent.SimpleContent,
-            constructors = (simplecontent.manage_addSimpleContentForm,
-                            simplecontent.manage_addSimpleContent),
-            )
+    context.registerClass(
+        simplecontent.SimpleContent,
+        constructors = (simplecontent.manage_addSimpleContentForm,
+                        simplecontent.manage_addSimpleContent),
+        )

Deleted: /kukit/azaxdemo/branch/zope2.8/azaxdemo-configure.zcml
==============================================================================
--- /kukit/azaxdemo/branch/zope2.8/azaxdemo-configure.zcml	Thu Aug 17 11:23:58 2006
+++ (empty file)
@@ -1,5 +0,0 @@
-<configure xmlns="http://namespaces.zope.org/zope">
-
-  <include package="azaxdemo" />
-
-</configure>

Deleted: /kukit/azaxdemo/branch/zope2.8/azaxdemo-meta.zcml
==============================================================================
--- /kukit/azaxdemo/branch/zope2.8/azaxdemo-meta.zcml	Thu Aug 17 11:23:58 2006
+++ (empty file)
@@ -1,5 +0,0 @@
-<configure xmlns="http://namespaces.zope.org/zope">
-
-  <include package="azaxdemo" file="meta.zcml" />
-
-</configure>

Modified: kukit/azaxdemo/branch/zope2.8/azaxview.py
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/azaxview.py	(original)
+++ kukit/azaxdemo/branch/zope2.8/azaxview.py	Thu Aug 17 11:23:58 2006
@@ -19,11 +19,7 @@
 # 02111-1307, USA.
 #
 
-try:
-    from azax import AzaxBaseView, force_unicode
-except ImportError:
-    from Products.azax import AzaxBaseView, force_unicode
-
+from Products.azax import AzaxBaseView, force_unicode
 import datetime
 
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_demo.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_demo.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_demo.pt	Thu Aug 17 11:23:58 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="kukit" type="text/css"
-          tal:attributes="href string:${context/@@absolute_url}/++resource++azax_demo.kss"/>
-    <metal:header use-macro="context/@@header_macros/header_resources" />
+          tal:attributes="href string:${context/absolute_url}/++resource++azax_demo.kss"/>
+    <metal:header use-macro="context/header_macros/macros/header_resources" />
   </head>
   <body>
   <!--a href="javascript:void(createLoggingPane(true));">logging</a-->
@@ -17,7 +17,7 @@
     <button id="change">
 	Change top div content
     </button>
-    <a tal:attributes="href string:${context/@@absolute_url}/getDivContent">
+    <a tal:attributes="href string:${context/absolute_url}/getDivContent">
        getDivContent RESPONSE
     </a>
     </li>
@@ -25,7 +25,7 @@
     <button id="clear">
 	Clear top div content
     </button>
-    <a tal:attributes="href string:${context/@@absolute_url}/clearDivContent">
+    <a tal:attributes="href string:${context/absolute_url}/clearDivContent">
        clearDivContent RESPONSE
     </a>
     </li>
@@ -33,7 +33,7 @@
     <button id="copyFrom">
 	Copy top div content to bottom
     </button>
-    <a tal:attributes="href string:${context/@@absolute_url}/copyFromDivContent">
+    <a tal:attributes="href string:${context/absolute_url}/copyFromDivContent">
       copyFromDivContent RESPONSE
     </a>
     </li>
@@ -41,7 +41,7 @@
     <button id="copyTo">
 	Copy bottom div content to top
     </button>
-    <a tal:attributes="href string:${context/@@absolute_url}/copyToDivContent">
+    <a tal:attributes="href string:${context/absolute_url}/copyToDivContent">
       copyToDivContent RESPONSE
     </a>
     </li>
@@ -49,7 +49,7 @@
     <button id="moveTo">
 	Move bottom div content to top
     </button>
-    <a tal:attributes="href string:${context/@@absolute_url}/moveToDivContent">
+    <a tal:attributes="href string:${context/absolute_url}/moveToDivContent">
       moveToDivContent RESPONSE
     </a>
     </li>
@@ -62,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.kss">
+          <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.
@@ -85,7 +85,7 @@
      The Javascript engine selects the DOM nodes to which it applies each command.
    </p>
    <p>
-     For instance, let's look at the <a tal:attributes="href string:${context/@@absolute_url}/moveToDivContent"><code>moveToDivContent</code> response</a>.
+     For instance, let's look at the <a tal:attributes="href string:${context/absolute_url}/moveToDivContent"><code>moveToDivContent</code> response</a>.
    </p>
    <pre>
 &lt;selectors&gt;

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_instant_edit.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_instant_edit.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_instant_edit.pt	Thu Aug 17 11:23:58 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="kukit" type="text/css"
-          tal:attributes="href string:${context/@@absolute_url}/++resource++azax_instant_edit.kss"/>
-    <metal:header use-macro="context/@@header_macros/header_resources" />
+          tal:attributes="href string:${context/absolute_url}/++resource++azax_instant_edit.kss"/>
+    <metal:header use-macro="context/header_macros/macros/header_resources" />
   </head>
   <body>
     <p><a href=".">All demos</a></p>

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_three_autoupdate.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_three_autoupdate.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_three_autoupdate.pt	Thu Aug 17 11:23:58 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="kukit" type="text/css" 
-          tal:attributes="href string:${context/@@absolute_url}/++resource++azax_three_autoupdate.kss"/>
-    <metal:header use-macro="context/@@header_macros/header_resources" />
+          tal:attributes="href string:${context/absolute_url}/++resource++azax_three_autoupdate.kss"/>
+    <metal:header use-macro="context/header_macros/macros/header_resources" />
     <style type="text/css">
         #update-area {
             border: 1px solid black;

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt	Thu Aug 17 11:23:58 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="kukit" type="text/css"
-          tal:attributes="href string:${context/@@absolute_url}/++resource++azax_tree.kss"/>
-    <metal:header use-macro="context/@@header_macros/header_resources" />
+          tal:attributes="href string:${context/absolute_url}/++resource++azax_tree.kss"/>
+    <metal:header use-macro="context/header_macros/macros/header_resources" />
     <style>
         ul, li{
             list-style: square;

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_two_select.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_two_select.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_two_select.pt	Thu Aug 17 11:23:58 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="kukit" type="text/css"
-          tal:attributes="href string:${context/@@absolute_url}/++resource++azax_two_selects.kss"/>
-    <metal:header use-macro="context/@@header_macros/header_resources" />
+          tal:attributes="href string:${context/absolute_url}/++resource++azax_two_selects.kss"/>
+    <metal:header use-macro="context/header_macros/macros/header_resources" />
   </head>
   <body>
     <p><a href=".">All demos</a></p>

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_xpath.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_xpath.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_xpath.pt	Thu Aug 17 11:23:58 2006
@@ -1,9 +1,9 @@
 <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/header_resources" />
-    <metal:header use-macro="context/@@header_macros/ajaxslt_extra_resources" />
+          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>

Modified: kukit/azaxdemo/branch/zope2.8/browser/cancel_submit.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/cancel_submit.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/cancel_submit.pt	Thu Aug 17 11:23:58 2006
@@ -2,8 +2,8 @@
   <head>
     <link rel="kukit" type="text/css"
           tal:attributes="href
-          string:${context/@@absolute_url}/++resource++cancel_submit.kss"/>
-    <metal:header use-macro="context/@@header_macros/header_resources" />
+          string:${context/absolute_url}/++resource++cancel_submit.kss"/>
+    <metal:header use-macro="context/header_macros/macros/header_resources" />
   </head>
   <body>
     <p><a href=".">All demos</a></p>

Modified: kukit/azaxdemo/branch/zope2.8/browser/form_submit.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/form_submit.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/form_submit.pt	Thu Aug 17 11:23:58 2006
@@ -2,8 +2,8 @@
   <head>
     <link rel="kukit" type="text/css"
           tal:attributes="href
-          string:${context/@@absolute_url}/++resource++form_submit.kss"/>
-    <metal:header use-macro="context/@@header_macros/header_resources" />
+          string:${context/absolute_url}/++resource++form_submit.kss"/>
+    <metal:header use-macro="context/header_macros/macros/header_resources" />
 	<style>label {font-weight: bold;}</style>
   </head>
   <body>

Modified: kukit/azaxdemo/branch/zope2.8/browser/header_macros.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/header_macros.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/header_macros.pt	Thu Aug 17 11:23:58 2006
@@ -2,19 +2,19 @@
     <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;"
+      tal:attributes="src string:${context/absolute_url}/++resource++sarissa.js;"
       src="++resource++sarissa.js">
     </script>
     <script type="text/javascript"
-      tal:attributes="src string:${context/@@absolute_url}/++resource++cssQuery.js;"
+      tal:attributes="src string:${context/absolute_url}/++resource++cssQuery.js;"
       src="++resource++cssQuery.js">
     </script>
     <script type="text/javascript"
-      tal:attributes="src string:${context/@@absolute_url}/++resource++MochiKit.js;"
+      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;"
+      tal:attributes="src string:${context/absolute_url}/++resource++kukit.js;"
       src="++resource++kukit.js">
     </script>
     </metal:header>
@@ -24,22 +24,22 @@
     <metal:header define-macro="ajaxslt_extra_resources">
     <script type="text/javascript"
       tal:attributes="src
-      string:${context/@@absolute_url}/++resource++ajaxslt_misc.js;"
+      string:${context/absolute_url}/++resource++ajaxslt_misc.js;"
       src="++resource++ajaxslt_misc.js">
     </script>
     <script type="text/javascript"
       tal:attributes="src
-      string:${context/@@absolute_url}/++resource++ajaxslt_dom.js;"
+      string:${context/absolute_url}/++resource++ajaxslt_dom.js;"
       src="++resource++ajaxslt_dom.js">
     </script>
     <script type="text/javascript"
       tal:attributes="src
-      string:${context/@@absolute_url}/++resource++ajaxslt_xpath.js;"
+      string:${context/absolute_url}/++resource++ajaxslt_xpath.js;"
       src="++resource++ajaxslt_xpath.js">
     </script>
     <!--script type="text/javascript"
       tal:attributes="src
-      string:${context/@@absolute_url}/++resource++ajaxslt_xslt.js;"
+      string:${context/absolute_url}/++resource++ajaxslt_xslt.js;"
       src="++resource++ajaxslt_xslt.js">
     </script-->
     </metal:header>

Modified: kukit/azaxdemo/branch/zope2.8/browser/more_selectors.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/more_selectors.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/more_selectors.pt	Thu Aug 17 11:23:58 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="kukit" type="text/css" 
-          tal:attributes="href string:${context/@@absolute_url}/++resource++more_selectors.kss"/>
-    <metal:header use-macro="context/@@header_macros/header_resources" />
+          tal:attributes="href string:${context/absolute_url}/++resource++more_selectors.kss"/>
+    <metal:header use-macro="context/header_macros/macros/header_resources" />
     <style type="text/css">
         #update-status {
             border: 1px solid black;

Modified: kukit/azaxdemo/branch/zope2.8/browser/two_select_revisited.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/two_select_revisited.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/two_select_revisited.pt	Thu Aug 17 11:23:58 2006
@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="kukit" type="text/css"
-          tal:attributes="href string:${context/@@absolute_url}/++resource++two_select_revisited.kss"/>
-    <metal:header use-macro="context/@@header_macros/header_resources" />
+          tal:attributes="href string:${context/absolute_url}/++resource++two_select_revisited.kss"/>
+    <metal:header use-macro="context/header_macros/macros/header_resources" />
   </head>
   <body>
     <p><a href=".">All demos</a></p>

Modified: kukit/azaxdemo/branch/zope2.8/configure.zcml
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/configure.zcml	(original)
+++ kukit/azaxdemo/branch/zope2.8/configure.zcml	Thu Aug 17 11:23:58 2006
@@ -1,19 +1,8 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:browser="http://namespaces.zope.org/browser"
            xmlns:five="http://namespaces.zope.org/five"
-           xmlns:azax="http://namespaces.zope.org/azax"
-           xmlns:zcml="http://namespaces.zope.org/zcml"
-		   i18n_domain="azax"
-		   >
-
-  <!-- Things to do only on Zope2 -->
-  <configure zcml:condition="have compat_five">
-
-    <!-- Define a new permission -->
-     <permission
-        id="zope.View"
-        title="View"
-    />
+           xmlns:azax="http://namespaces.zope.org/azax">
+
 
   <interface
       interface=".interfaces.ISimpleContent"
@@ -24,86 +13,42 @@
 
   <five:defaultViewable class=".simplecontent.SimpleContent" />
 
-
   <content class=".simplecontent.SimpleContent">
     <implements
         interface=".interfaces.ISimpleContent"
         />
     <require
-        permission="zope.View"
+        permission="zope2.View"
         interface=".interfaces.ISimpleContent"
         />
   </content>
-
-   <browser:page
+ 
+  <browser:defaultView
       for=".interfaces.ISimpleContent"
-      template="browser/azax_demo_index.pt"
       name="index.html"
-      permission="zope.View"
       />
- 
-  </configure>
-
-  <!-- Things to do only on Zope3 -->
-  <configure zcml:condition="have compat_not_five">
-
-    <content class=".simplecontent_z3.SimpleContent">
-        <implements
-            interface=".interfaces.ISimpleContent"
-            />
-        <!--factory
-            id="zopeproducts.axaxdemo"
-            title="Azax demos folder"
-            description="A folder to hold a set of azax demos"
-        /-->
-    </content>
 
   <browser:page
       for=".interfaces.ISimpleContent"
       template="browser/azax_demo_index.pt"
       name="index.html"
-      permission="zope.View"
-      menu="zmi_views"
-      title="View demos"
+      permission="zope2.View"
       />
- 
-    <browser:addform
-        label="Add azax demos folder"
-        name="AddSimpleContent.html"
-        schema=".interfaces.ISimpleContent"
-        content_factory=".simplecontent_z3.SimpleContent"
-        fields=""
-        permission="zope.ManageContent"
-        />
-
-   <browser:addMenuItem
-        class=".simplecontent_z3.SimpleContent"
-        title="Azax demos folder"
-        description="A folder to hold a set of azax demos"
-        permission="zope.ManageContent"
-        view="AddSimpleContent.html"
-        />
-
-  </configure>
+  
 
-   <browser:defaultView
+  <!-- change tag content -->
+  <browser:page
       for=".interfaces.ISimpleContent"
-      name="index.html"
+      template="browser/azax_demo.pt"
+      name="demo1.html"
+      permission="zope2.View"
       />
 
   <browser:page
       for=".interfaces.ISimpleContent"
       template="browser/header_macros.pt"
       name="header_macros"
-      permission="zope.View"
-      />
-
-  <!-- change tag content -->
-  <browser:page
-      for=".interfaces.ISimpleContent"
-      template="browser/azax_demo.pt"
-      name="demo1.html"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:resource
@@ -116,7 +61,7 @@
       class=".azaxview.AzaxView"
       attribute="getDivContent"
       name="getDivContent"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:page
@@ -124,7 +69,7 @@
       class=".azaxview.AzaxView"
       attribute="copyFromDivContent"
       name="copyFromDivContent"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:page
@@ -132,7 +77,7 @@
       class=".azaxview.AzaxView"
       attribute="copyToDivContent"
       name="copyToDivContent"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:page
@@ -140,7 +85,7 @@
       class=".azaxview.AzaxView"
       attribute="moveToDivContent"
       name="moveToDivContent"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:page
@@ -148,7 +93,7 @@
       class=".azaxview.AzaxView"
       attribute="clearDivContent"
       name="clearDivContent"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
 
@@ -157,7 +102,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/azax_two_select.pt"
       name="two_selects.html"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:resource
@@ -170,7 +115,7 @@
       class=".azaxview.AzaxView"
       attribute="getCorrespondingSelect"
       name="getCorrespondingSelect"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
 
@@ -179,7 +124,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/azax_three_autoupdate.pt"
       name="three_autoupdate.html"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:resource
@@ -192,7 +137,7 @@
       class=".azaxview.AzaxView"
       attribute="getCurrentTime"
       name="getCurrentTime"
-      permission="zope.View"
+      permission="zope2.View"
       />
       
       
@@ -201,7 +146,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/azax_instant_edit.pt"
       name="azax_instant_edit.html"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:page
@@ -209,7 +154,7 @@
       class=".azaxview.AzaxView"
       attribute="getAutoupdateMarkup"
       name="getAutoupdateMarkup"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:resource
@@ -222,7 +167,7 @@
       class=".azaxview.AzaxView"
       attribute="getInputField"
       name="getInputField"
-      permission="zope.View"
+      permission="zope2.View"
       />
       
   <browser:page
@@ -230,7 +175,7 @@
       class=".azaxview.AzaxView"
       attribute="saveText"
       name="saveText"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <!-- xpath content -->
@@ -238,7 +183,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/azax_xpath.pt"
       name="azax_xpath.html"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:resource
@@ -251,7 +196,7 @@
       class=".azaxview.AzaxView"
       attribute="removeNodeXpath"
       name="removeNodeXpath"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <!-- cancel submit -->
@@ -259,7 +204,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/cancel_submit.pt"
       name="cancel_submit.html"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:resource
@@ -272,7 +217,7 @@
       class=".azaxview.AzaxView"
       attribute="cancelSubmitSave"
       name="save"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <!-- tree content -->
@@ -280,7 +225,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/azax_tree.pt"
       name="azax_tree.html"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:resource
@@ -293,7 +238,7 @@
       class=".azaxview.AzaxView"
       attribute="expandSubTree"
       name="expandSubTree"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:page
@@ -301,7 +246,7 @@
       class=".azaxview.AzaxView"
       attribute="collapseSubTree"
       name="collapseSubTree"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
 
@@ -310,7 +255,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/more_selectors.pt"
       name="more_selectors.html"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:resource
@@ -323,13 +268,13 @@
       class=".azaxview.AzaxView"
       attribute="clickedButton"
       name="clickedButton"
-      permission="zope.View"
+      permission="zope2.View"
       />
  
-      <azax:registerEventType
-        name="myCustomEventType"
+  	<azax:registerEventType
+		name="myCustomEventType"
         jsfile="browser/more_selectors.js"
-        />
+    	/>
 
 
   <!-- two_selects revisited content -->
@@ -337,7 +282,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/two_select_revisited.pt"
       name="two_select_revisited.html"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:resource
@@ -350,7 +295,7 @@
       class=".azaxview.AzaxView"
       attribute="updateSlaveSelector"
       name="updateSlaveSelector"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
 
@@ -359,7 +304,7 @@
       for=".interfaces.ISimpleContent"
       template="browser/form_submit.pt"
       name="form_submit.html"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
   <browser:resource
@@ -372,7 +317,7 @@
       class=".azaxview.AzaxView"
       attribute="formSubmitSave"
       name="formSave"
-      permission="zope.View"
+      permission="zope2.View"
       />
 
 

Modified: kukit/azaxdemo/branch/zope2.8/interfaces.py
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/interfaces.py	(original)
+++ kukit/azaxdemo/branch/zope2.8/interfaces.py	Thu Aug 17 11:23:58 2006
@@ -1,4 +1,4 @@
 from zope.interface import Interface
 
 class ISimpleContent(Interface):
-    pass
+    pass
\ No newline at end of file

Deleted: /kukit/azaxdemo/branch/zope2.8/meta.zcml
==============================================================================
--- /kukit/azaxdemo/branch/zope2.8/meta.zcml	Thu Aug 17 11:23:58 2006
+++ (empty file)
@@ -1,6 +0,0 @@
-<configure
-     xmlns="http://namespaces.zope.org/meta">
-
-   <include package=".configfeature" file="meta.zcml"/>
-
-</configure>

Deleted: /kukit/azaxdemo/branch/zope2.8/simplecontent_z3.py
==============================================================================
--- /kukit/azaxdemo/branch/zope2.8/simplecontent_z3.py	Thu Aug 17 11:23:58 2006
+++ (empty file)
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2005-2006
-# Authors:
-#   Godefroid Chapelle <gotcha at bubblenet.be>
-#   Bal?zs Re? <ree at greenfinity.hu>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-#
-
-'''\
-Simple content implementation
-'''
-
-from persistent import Persistent
-from zope.interface import implements
-from interfaces import ISimpleContent
-
-class SimpleContent(Persistent):
-    implements(ISimpleContent)

From reebalazs at codespeak.net  Thu Aug 17 12:21:21 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 17 Aug 2006 12:21:21 +0200 (CEST)
Subject: [Kukit-checkins] r31364 - in kukit/azax/branch/zope2.8/plugins: .
	json
Message-ID: <20060817102121.03AE810086@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 17 12:21:19 2006
New Revision: 31364

Removed:
   kukit/azax/branch/zope2.8/plugins/json/
Modified:
   kukit/azax/branch/zope2.8/plugins/configure.zcml
   kukit/azax/branch/zope2.8/plugins/registry.py
Log:
zope2.8 backport

Modified: kukit/azax/branch/zope2.8/plugins/configure.zcml
==============================================================================
--- kukit/azax/branch/zope2.8/plugins/configure.zcml	(original)
+++ kukit/azax/branch/zope2.8/plugins/configure.zcml	Thu Aug 17 12:21:19 2006
@@ -5,8 +5,6 @@
      
     <!-- XXX concatresource is now included locally. -->
     <include package="._concatresource" />
-
-    <include package=".json" />
     
      <!-- example plugin registration
      

Modified: kukit/azax/branch/zope2.8/plugins/registry.py
==============================================================================
--- kukit/azax/branch/zope2.8/plugins/registry.py	(original)
+++ kukit/azax/branch/zope2.8/plugins/registry.py	Thu Aug 17 12:21:19 2006
@@ -5,7 +5,6 @@
 # concatresource is an embedded product 
 import _concatresource
 from concatresource.interfaces import IConcatResourceAddon
-from json import getJsonAddonFiles
 
 def getRegistry(context=None):
     'Convenience method to get or create the registry.'
@@ -80,6 +79,6 @@
             files = self._addon_files
         except AttributeError:
             # Lazy setup of addon files
-            self._addon_files = files = getJsonAddonFiles()
+            self._addon_files = files = [] 
             files.extend(self.jsfiles.keys())
         return files

From reebalazs at codespeak.net  Fri Aug 18 14:43:59 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 18 Aug 2006 14:43:59 +0200 (CEST)
Subject: [Kukit-checkins] r31390 - kukit/kukit.js/trunk/kukit
Message-ID: <20060818124359.1DB4E10060@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 18 14:43:57 2006
New Revision: 31390

Modified:
   kukit/kukit.js/trunk/kukit/dom.js
   kukit/kukit.js/trunk/kukit/plugin.js
Log:
replaceHTML and dom.forceToDom fixes

- replaceHTML now manages multiple nodes insertion

- forceToDom must do the importNode even when converting from plaintext,
  this caused a problem on IE


Modified: kukit/kukit.js/trunk/kukit/dom.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/dom.js	(original)
+++ kukit/kukit.js/trunk/kukit/dom.js	Fri Aug 18 14:43:57 2006
@@ -99,33 +99,21 @@
         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);
-        }
+    }
+    // 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/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Fri Aug 18 14:43:57 2006
@@ -345,11 +345,22 @@
 kukit.ar.actionRegistry.register('replaceHTML', function(node, parms, eventrule) {
     parms = kukit.pl.completeParms(parms, ['html'], {}, 'replaceHTML action');
     parms.html = kukit.dom.forceToDom(parms.html);
-    // We only consider the first node (it must really have 1 node only)
-    var element = parms.html.firstChild;
-    var parentNode = node.parentNode;
-    parentNode.replaceChild(element, node);
-    kukit.setupEvents(element);
+    var elements = parms.html.childNodes;
+    var length = elements.length;
+    if (length > 0) {
+        var parentNode = node.parentNode;
+        var inserted = [];
+        // insert the last node
+        var next = elements[length-1];
+        parentNode.replaceChild(next, node);
+        inserted.push(next);
+        // then we go backwards with the rest of the nodes
+        for (var i=length-2; i>=0; i--) {
+            next = parentNode.insertBefore(elements[i], next);
+            inserted.push(next);
+        }
+        kukit.setupEvents(inserted);
+    }
 });
 kukit.cr.commandRegistry.registerFromAction('replaceHTML', kukit.cr.makeSelectorCommand);
 

From reebalazs at codespeak.net  Fri Aug 18 19:52:58 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 18 Aug 2006 19:52:58 +0200 (CEST)
Subject: [Kukit-checkins] r31394 - kukit/kukit.js/trunk/kukit
Message-ID: <20060818175258.C843D10060@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 18 19:52:56 2006
New Revision: 31394

Modified:
   kukit/kukit.js/trunk/kukit/commandreg.js
   kukit/kukit.js/trunk/kukit/dom.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
   kukit/kukit.js/trunk/kukit/selectorreg.js
Log:
nodeAttr param. producer extension, samenode selector, fixing css (command) selector

- Fix css selector
  
  - css selector in the commands was applied on current node, not on the document!
  - there was a bug in getSelector
  
- add samenode selector

  - samenode selector, now can be used to select the same node that triggered the event

- nodeAttr modification
  
  - enable recurseParent parameter
  - change from node[attrname] to node.getAttribute(attrname)


Modified: kukit/kukit.js/trunk/kukit/commandreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/commandreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/commandreg.js	Fri Aug 18 19:52:56 2006
@@ -84,12 +84,17 @@
 }
 
 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.sr.selectorRegistry.get(this.selectorType);
-    var nodes = selfunc(this.selector);
+    var nodes = selfunc(this.selector, orignode);
+    var printtype;
+    if (this.selectorType) {
+        printtype = this.selectorType;
+    } else {
+        printtype = 'default (' + kukit.sr.selectorRegistry.defaultSelectorType + ')';
+    }
+    kukit.logDebug('Selector type: ' +  printtype + ', selector : "' + this.selector + '", selected nodes:' + nodes.length);
     if (!nodes || nodes.length == 0) {
-        kukit.logError('Command found no nodes');
+        kukit.logWarning('Selector found no nodes');
     }
     for (var i=0;i < nodes.length;i++) {
         var node = nodes[i];

Modified: kukit/kukit.js/trunk/kukit/dom.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/dom.js	(original)
+++ kukit/kukit.js/trunk/kukit/dom.js	Fri Aug 18 19:52:56 2006
@@ -122,15 +122,17 @@
 // really the query should start from the document root, but
 // limited to in_nodes subtrees!
 kukit.dom.cssQuery = function(selector, in_nodes) {
-    if (typeof(in_nodes) == null) {
+    // to eliminate possible errors
+    if (typeof(in_nodes) != 'undefined' && in_nodes == null) {
         throw 'Selection error in kukit.dom.cssQuery';
     }
     // global scope, always.
-    return cssQuery(selector);
+    var result = cssQuery(selector);
     // This is very bad. However the binding makes sure that
     // nodes once bound will never be bound again
     // (also, noticed the following issue: cssQuery, when called
     // on an element, does not check the element itself.)
+    return result;
 };
 
 // Gets the textual content of the node

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Fri Aug 18 19:52:56 2006
@@ -127,8 +127,8 @@
             }
         } break;
         case 'nodeAttr': {
-            if (this.args.length != 1) {
-                throw 'nodeAttr method needs 1 argument (attrname)';
+            if (this.args.length != 1 && this.args.length != 2) {
+                throw 'nodeAttr method needs 1 or 2 argument (attrname, [recurseParents])';
             }
             if (this.args[0].toLowerCase() == 'style') {
                 throw 'nodeAttr method does not accept "style" as attrname';
@@ -176,10 +176,28 @@
         } break;
         case 'nodeAttr': {
             var argname =  this.args[0];
+            var recurseParents = false;
+            if (this.args.length == 2) {
+                kukit.pl.evalBool(this.args, 1, '2nd attribute of nodeAttr must be a boolean');
+                recurseParents = this.args[1];
+            }
             // XXX this works but not for kukit:xxx args
-            var value = node[argname];
-            // XXX this might have problems with certain attrs on IE, and completely broke on Opera
-            //var value = node.getAttribute(argname);
+            //var value = node[argname];
+            // XXX this might have problems with certain attrs on IE
+            var value = node.getAttribute(argname);
+            if (recurseParents) {
+                var element = node;
+                // need to recurse even if value="" ! We cannot figure out if there exists
+                // and attribute in a crossbrowser way, or it is set to "".
+                while (! value) {
+                    element = element.parentNode;
+                    if (! element) {
+                        break;
+                    }
+                    //value = element[argname];
+                    value = element.getAttribute(argname);
+                }
+            } 
             if (typeof(value) == 'undefined') {
                 // notfound arguments will get null
                 value = null;

Modified: kukit/kukit.js/trunk/kukit/selectorreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/selectorreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/selectorreg.js	Fri Aug 18 19:52:56 2006
@@ -74,13 +74,18 @@
     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);
+    // Always search globally
+    var nodes = kukit.dom.cssQuery(expr);
     return nodes;
 });
 
+kukit.sr.selectorRegistry.register('samenode', function(expr, orignode) {
+    nodes = [orignode];
+    return nodes;
+});
+
+

From reebalazs at codespeak.net  Fri Aug 18 19:53:03 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 18 Aug 2006 19:53:03 +0200 (CEST)
Subject: [Kukit-checkins] r31395 - in kukit/azax/trunk: . plugins
Message-ID: <20060818175303.DEA0510068@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 18 19:53:02 2006
New Revision: 31395

Modified:
   kukit/azax/trunk/plugins/configure.zcml
   kukit/azax/trunk/selectors.py
Log:
nodeAttr param. producer extension, samenode selector, fixing css (command) selector

- Fix css selector
  
  - css selector in the commands was applied on current node, not on the document!
  - there was a bug in getSelector
  
- add samenode selector

  - samenode selector, now can be used to select the same node that triggered the event

- nodeAttr modification
  
  - enable recurseParent parameter
  - change from node[attrname] to node.getAttribute(attrname)


Modified: kukit/azax/trunk/plugins/configure.zcml
==============================================================================
--- kukit/azax/trunk/plugins/configure.zcml	(original)
+++ kukit/azax/trunk/plugins/configure.zcml	Fri Aug 18 19:53:02 2006
@@ -287,4 +287,8 @@
         name="htmlid"
         />
 
+    <azax:registerSelectorType
+        name="samenode"
+        />
+
 </configure>

Modified: kukit/azax/trunk/selectors.py
==============================================================================
--- kukit/azax/trunk/selectors.py	(original)
+++ kukit/azax/trunk/selectors.py	Fri Aug 18 19:53:02 2006
@@ -37,4 +37,4 @@
 
     def __init__(self, type, selector):
         self.type = type
-        SelectorBase.__init__(selector)
+        SelectorBase.__init__(self, selector)

From reebalazs at codespeak.net  Fri Aug 18 20:22:57 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 18 Aug 2006 20:22:57 +0200 (CEST)
Subject: [Kukit-checkins] r31396 - kukit/kukit.js/trunk/kukit
Message-ID: <20060818182257.2B29E10060@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 18 20:22:55 2006
New Revision: 31396

Modified:
   kukit/kukit.js/trunk/kukit/commandreg.js
   kukit/kukit.js/trunk/kukit/selectorreg.js
Log:
Selector fixes

Modified: kukit/kukit.js/trunk/kukit/commandreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/commandreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/commandreg.js	Fri Aug 18 20:22:55 2006
@@ -85,7 +85,7 @@
 
 kukit.cr._Command_execute_selector = function(node, parms, eventrule, eventinstance, orignode) {
     var selfunc = kukit.sr.selectorRegistry.get(this.selectorType);
-    var nodes = selfunc(this.selector, orignode);
+    var nodes = selfunc(this.selector, null, orignode);
     var printtype;
     if (this.selectorType) {
         printtype = this.selectorType;

Modified: kukit/kukit.js/trunk/kukit/selectorreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/selectorreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/selectorreg.js	Fri Aug 18 20:22:55 2006
@@ -68,12 +68,11 @@
 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;
+    var node = document.getElementById(expr);
+    if (node) {
+        nodes.push(node);
+        }
     return nodes;
 });
 
@@ -83,7 +82,7 @@
     return nodes;
 });
 
-kukit.sr.selectorRegistry.register('samenode', function(expr, orignode) {
+kukit.sr.selectorRegistry.register('samenode', function(expr, node, orignode) {
     nodes = [orignode];
     return nodes;
 });

From reebalazs at codespeak.net  Fri Aug 18 20:47:21 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 18 Aug 2006 20:47:21 +0200 (CEST)
Subject: [Kukit-checkins] r31397 - kukit/azax/trunk
Message-ID: <20060818184721.5AD1710060@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 18 20:47:20 2006
New Revision: 31397

Modified:
   kukit/azax/trunk/azaxview.py
Log:
Fix command helper

Modified: kukit/azax/trunk/azaxview.py
==============================================================================
--- kukit/azax/trunk/azaxview.py	(original)
+++ kukit/azax/trunk/azaxview.py	Fri Aug 18 20:47:20 2006
@@ -63,8 +63,8 @@
         BrowserView.__init__(self, context, request)
         self.commands = AzaxCommands()
 
-    def addCommand(self, name, selector=None):
-        return self.commands.addCommand(name, selector=selector)
+    def addCommand(self, name, selector=None, **kw):
+        return self.commands.addCommand(name, selector=selector, **kw)
 
     def getCommands(self):
         return self.commands

From reebalazs at codespeak.net  Sun Aug 20 15:36:15 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sun, 20 Aug 2006 15:36:15 +0200 (CEST)
Subject: [Kukit-checkins] r31414 - kukit/kukit.js/trunk/kukit
Message-ID: <20060820133615.D818B10069@code0.codespeak.net>

Author: reebalazs
Date: Sun Aug 20 15:36:12 2006
New Revision: 31414

Modified:
   kukit/kukit.js/trunk/kukit/plugin.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
   kukit/kukit.js/trunk/kukit/utils.js
Log:
getAttribute and setAttribute DOM hacks for IE

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Sun Aug 20 15:36:12 2006
@@ -369,7 +369,7 @@
     if (parms.name.toLowerCase() == 'style') {
         throw 'Style attribute is not allowed with setAttribute';
     }
-    node.setAttribute(parms.name, parms.value);
+    kukit.ut.setAttribute(node, parms.name, parms.value);
 });
 kukit.cr.commandRegistry.registerFromAction('setAttribute', kukit.cr.makeSelectorCommand);
 

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Sun Aug 20 15:36:12 2006
@@ -181,10 +181,7 @@
                 kukit.pl.evalBool(this.args, 1, '2nd attribute of nodeAttr must be a boolean');
                 recurseParents = this.args[1];
             }
-            // XXX this works but not for kukit:xxx args
-            //var value = node[argname];
-            // XXX this might have problems with certain attrs on IE
-            var value = node.getAttribute(argname);
+            var value = kukit.ut.getAttribute(node, argname);
             if (recurseParents) {
                 var element = node;
                 // need to recurse even if value="" ! We cannot figure out if there exists
@@ -194,8 +191,7 @@
                     if (! element) {
                         break;
                     }
-                    //value = element[argname];
-                    value = element.getAttribute(argname);
+                    value = kukit.ut.getAttribute(element, argname);
                 }
             } 
             if (typeof(value) == 'undefined') {

Modified: kukit/kukit.js/trunk/kukit/utils.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/utils.js	(original)
+++ kukit/kukit.js/trunk/kukit/utils.js	Sun Aug 20 15:36:12 2006
@@ -178,3 +178,46 @@
     return this.elements[0];
 };
 
+/* Getting and setting node attibutes 
+   We need to provide workarounds for IE.
+*/
+
+kukit.ut.getAttribute = function(node, attrname) {
+    if (attrname.toLowerCase() == 'style') {
+        throw 'Style attribute is not allowed with getAttribute';
+    }
+    // Try first, there is chance that it works
+    // XXX this works but not for kukit:xxx args
+    //var value = node[argname];
+    var value = node.getAttribute(attrname);
+    if (! value) {
+        // Workarounds, in case we have not found above
+        if (attrname.toLowerCase() == 'class') {
+            // for IE
+            value = node.className;
+        } else if (attrname.toLowerCase() == 'for') {
+            // for IE
+            value = node.htmlFor;
+        }
+    }
+    return value;
+    // XXX We cannot distinguish between notfound and '', unfortunately
+};
+
+kukit.ut.setAttribute = function(node, attrname, value) {
+    if (attrname.toLowerCase() == 'style') {
+        throw 'Style attribute is not allowed with setAttribute';
+    }
+    if (attrname.toLowerCase() == 'class') {
+        // The class attribute cannot be set on IE, instead
+        // className must be used. However node.className = x
+        // works on both IE and FF.
+        node.className = value;
+    } else if (attrname.toLowerCase() == 'for') {
+        // On IE, workaround is needed. Since I am not sure, I use both methods.
+        node.htmlFor = value;
+        node.setAttribute(attrname, value);
+    } else {
+        node.setAttribute(attrname, value);
+    }
+};

From reebalazs at codespeak.net  Sun Aug 20 21:15:39 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sun, 20 Aug 2006 21:15:39 +0200 (CEST)
Subject: [Kukit-checkins] r31419 - in kukit/azax/trunk/plugins: . json
Message-ID: <20060820191539.9ADA210077@code0.codespeak.net>

Author: reebalazs
Date: Sun Aug 20 21:15:37 2006
New Revision: 31419

Modified:
   kukit/azax/trunk/plugins/json/utils.py
   kukit/azax/trunk/plugins/registry.py
Log:
Minimal necessary changes to Zope2.10, Zope3.3.0

Modified: kukit/azax/trunk/plugins/json/utils.py
==============================================================================
--- kukit/azax/trunk/plugins/json/utils.py	(original)
+++ kukit/azax/trunk/plugins/json/utils.py	Sun Aug 20 21:15:37 2006
@@ -3,11 +3,10 @@
 '''
 
 import os.path, logging
-import zope.component
-from zope.interface import implements
+import zope.component as capi
+from zope.interface import implements, Interface
 from zope.publisher.browser import TestRequest
 from interfaces import IJSONStreamWriteable
-from zope.component.exceptions import ComponentLookupError
 
 logger = logging.getLogger('azax')
 
@@ -18,9 +17,8 @@
     request = TestRequest()
     try:
         # use the files already registered to that concat resource
-        # XXX TODO DEPREC warning. Change this to getAdapter.
-        jsonrpc = zope.component.getResource('jsonrpc.js', request)
-    except ComponentLookupError:
+        jsonrpc = capi.getAdapter(request, Interface, 'jsonrpc.js')
+    except capi.ComponentLookupError:
         pass    # JSON not present.
     else:
         # JSON present.

Modified: kukit/azax/trunk/plugins/registry.py
==============================================================================
--- kukit/azax/trunk/plugins/registry.py	(original)
+++ kukit/azax/trunk/plugins/registry.py	Sun Aug 20 21:15:37 2006
@@ -1,5 +1,4 @@
-import zope.component
-from zope.component.exceptions import ComponentLookupError
+import zope.component as capi
 from interfaces import IAzaxPluginRegistry
 from zope.interface import implements
 # concatresource is an embedded product 
@@ -10,13 +9,12 @@
 def getRegistry(context=None):
     'Convenience method to get or create the registry.'
     try:
-        registry = zope.component.getUtility(IAzaxPluginRegistry)
-    except ComponentLookupError:
+        registry = capi.getUtility(IAzaxPluginRegistry)
+    except capi.ComponentLookupError:
         # Register the global utility, also register it for concatresources
         registry = AzaxPluginRegistry()
-        utilities = zope.component.getService(zope.component.servicenames.Utilities)
-        utilities.provideUtility(IAzaxPluginRegistry, registry)
-        utilities.provideUtility(IConcatResourceAddon, registry, name='kukit.js')
+        capi.provideUtility(registry, IAzaxPluginRegistry)
+        capi.provideUtility(registry, IConcatResourceAddon, name='kukit.js')
     return registry
     
 class AzaxPluginError(Exception):

From reebalazs at codespeak.net  Mon Aug 21 11:12:47 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon, 21 Aug 2006 11:12:47 +0200 (CEST)
Subject: [Kukit-checkins] r31429 - kukit/azax/trunk/plugins/json
Message-ID: <20060821091247.C1AC710075@code0.codespeak.net>

Author: reebalazs
Date: Mon Aug 21 11:12:45 2006
New Revision: 31429

Modified:
   kukit/azax/trunk/plugins/json/configure.zcml
Log:
remove depr. warning content -> class (! 2.8)

Modified: kukit/azax/trunk/plugins/json/configure.zcml
==============================================================================
--- kukit/azax/trunk/plugins/json/configure.zcml	(original)
+++ kukit/azax/trunk/plugins/json/configure.zcml	Mon Aug 21 11:12:45 2006
@@ -36,26 +36,26 @@
         />
         
         <!-- provide z3 security for command elements -->
-        <content class="azax.commands.AzaxCommands">
+        <class class="azax.commands.AzaxCommands">
             <require
                 permission="zope.Public"
                 attributes="__iter__"
                 />
-        </content>
+        </class>
  
-        <content class="azax.commands.AzaxCommand">
+        <class class="azax.commands.AzaxCommand">
             <require
                 permission="zope.Public"
                 attributes="__dict__"
                 />
-        </content>
+        </class>
         
-        <content class="azax.commands.AzaxParam">
+        <class class="azax.commands.AzaxParam">
             <require
                 permission="zope.Public"
                 attributes="name content"
                 />
-        </content>
+        </class>
 
     </configure>
 
@@ -79,26 +79,26 @@
         />
         
         <!-- provide z3 security for command elements -->
-        <content class="Products.azax.commands.AzaxCommands">
+        <class class="Products.azax.commands.AzaxCommands">
             <require
                 permission="zope.Public"
                 attributes="__iter__"
                 />
-        </content>
+        </class>
  
-        <content class="Products.azax.commands.AzaxCommand">
+        <class class="Products.azax.commands.AzaxCommand">
             <require
                 permission="zope.Public"
                 attributes="__dict__"
                 />
-        </content>
+        </class>
         
-        <content class="Products.azax.commands.AzaxParam">
+        <class class="Products.azax.commands.AzaxParam">
             <require
                 permission="zope.Public"
                 attributes="name content"
                 />
-        </content>
+        </class>
 
     </configure>
 

From reebalazs at codespeak.net  Mon Aug 21 11:13:23 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon, 21 Aug 2006 11:13:23 +0200 (CEST)
Subject: [Kukit-checkins] r31430 - kukit/azaxdemo/trunk
Message-ID: <20060821091323.01E9810075@code0.codespeak.net>

Author: reebalazs
Date: Mon Aug 21 11:13:22 2006
New Revision: 31430

Modified:
   kukit/azaxdemo/trunk/configure.zcml
Log:
remove depr. warning content -> class (! 2.8)

Modified: kukit/azaxdemo/trunk/configure.zcml
==============================================================================
--- kukit/azaxdemo/trunk/configure.zcml	(original)
+++ kukit/azaxdemo/trunk/configure.zcml	Mon Aug 21 11:13:22 2006
@@ -25,7 +25,7 @@
   <five:defaultViewable class=".simplecontent.SimpleContent" />
 
 
-  <content class=".simplecontent.SimpleContent">
+  <class class=".simplecontent.SimpleContent">
     <implements
         interface=".interfaces.ISimpleContent"
         />
@@ -33,7 +33,7 @@
         permission="zope.View"
         interface=".interfaces.ISimpleContent"
         />
-  </content>
+  </class>
 
    <browser:page
       for=".interfaces.ISimpleContent"
@@ -47,7 +47,7 @@
   <!-- Things to do only on Zope3 -->
   <configure zcml:condition="have compat_not_five">
 
-    <content class=".simplecontent_z3.SimpleContent">
+    <class class=".simplecontent_z3.SimpleContent">
         <implements
             interface=".interfaces.ISimpleContent"
             />
@@ -56,7 +56,7 @@
             title="Azax demos folder"
             description="A folder to hold a set of azax demos"
         /-->
-    </content>
+    </class>
 
   <browser:page
       for=".interfaces.ISimpleContent"

From reebalazs at codespeak.net  Mon Aug 21 12:21:41 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon, 21 Aug 2006 12:21:41 +0200 (CEST)
Subject: [Kukit-checkins] r31433 - kukit/azaxdemo/trunk/browser
Message-ID: <20060821102141.2456810074@code0.codespeak.net>

Author: reebalazs
Date: Mon Aug 21 12:21:37 2006
New Revision: 31433

Modified:
   kukit/azaxdemo/trunk/browser/azax_tree.kss
   kukit/azaxdemo/trunk/browser/azax_tree.pt
Log:
Change azax_tree demo to use kukit:xxx attributes

Modified: kukit/azaxdemo/trunk/browser/azax_tree.kss
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_tree.kss	(original)
+++ kukit/azaxdemo/trunk/browser/azax_tree.kss	Mon Aug 21 12:21:37 2006
@@ -1,9 +1,9 @@
 .state-expanded:click {
     action-server: collapseSubTree;
-    collapseSubTree-value: nodeAttr("id");
+    collapseSubTree-value: nodeAttr("kukit:node");
 }
 
 .state-collapsed:click {
     action-server: expandSubTree;
-    expandSubTree-value: nodeAttr("id");
+    expandSubTree-value: nodeAttr("kukit:node");
 }

Modified: kukit/azaxdemo/trunk/browser/azax_tree.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_tree.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_tree.pt	Mon Aug 21 12:21:37 2006
@@ -19,18 +19,21 @@
 
 <h3>Tree Demo</h3>
     <p id="text">This is not finished yet.</p>
+    <p>In this demo we use attributes in a special namespace. This makes
+    it possible to put attributes to nodes without producing crappy html or being
+    forced to reuse "id".</p>
     <form name="edit">
     <ul id="root">
-        <li class="state-collapsed" id="node:1">1</li>
-        <li class="state-expanded" id="node:2">2</li>
+        <li class="state-collapsed" id="node:1" kukit:node="1">1</li>
+        <li class="state-expanded" id="node:2" kukit:node="2">2</li>
         <ul id="childs:2">
-            <li class="state-collapsed" id="node:2/1">2.1</li>
-            <li class="state-collapsed" id="node:2/2">2.2</li>
+            <li class="state-collapsed" id="node:2/1" kukit:node="2/1">2.1</li>
+            <li class="state-collapsed" id="node:2/2" kukit:node="2/2">2.2</li>
         </ul>
-        <li class="state-expanded" id="node:3">3</li>
+        <li class="state-expanded" id="node:3" kukit:node="3">3</li>
         <ul id="subTree:3">
-            <li class="state-collapsed" id="node:3/1">3.1</li>
-            <li class="state-collapsed" id="node:3/2">3.2</li>
+            <li class="state-collapsed" id="node:3/1" kukit:node="3/1">3.1</li>
+            <li class="state-collapsed" id="node:3/2" kukit:node="3/2">3.2</li>
         </ul>
     </ul>
 

From reebalazs at codespeak.net  Mon Aug 21 12:46:11 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Mon, 21 Aug 2006 12:46:11 +0200 (CEST)
Subject: [Kukit-checkins] r31434 - kukit/kukit.js/trunk/kukit
Message-ID: <20060821104611.0EE3A10074@code0.codespeak.net>

Author: reebalazs
Date: Mon Aug 21 12:46:08 2006
New Revision: 31434

Modified:
   kukit/kukit.js/trunk/kukit/dom.js
   kukit/kukit.js/trunk/kukit/plugin.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
   kukit/kukit.js/trunk/kukit/utils.js
Log:
nodeAttr recursion: better stopping check + move attribute handling from utils to dom

Modified: kukit/kukit.js/trunk/kukit/dom.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/dom.js	(original)
+++ kukit/kukit.js/trunk/kukit/dom.js	Mon Aug 21 12:46:08 2006
@@ -163,3 +163,48 @@
     }
     return value;
 };
+
+/* Getting and setting node attibutes 
+   We need to provide workarounds for IE.
+*/
+
+kukit.dom.getAttribute = function(node, attrname) {
+    if (attrname.toLowerCase() == 'style') {
+        throw 'Style attribute is not allowed with getAttribute';
+    }
+    // Try first, there is chance that it works
+    // XXX this works but not for kukit:xxx args
+    //var value = node[argname];
+    var value = node.getAttribute(attrname);
+    if (! value) {
+        // Workarounds, in case we have not found above
+        if (attrname.toLowerCase() == 'class') {
+            // for IE
+            value = node.className;
+        } else if (attrname.toLowerCase() == 'for') {
+            // for IE
+            value = node.htmlFor;
+        }
+    }
+    return value;
+    // XXX We cannot distinguish between notfound and '', unfortunately
+};
+
+kukit.dom.setAttribute = function(node, attrname, value) {
+    if (attrname.toLowerCase() == 'style') {
+        throw 'Style attribute is not allowed with setAttribute';
+    }
+    if (attrname.toLowerCase() == 'class') {
+        // The class attribute cannot be set on IE, instead
+        // className must be used. However node.className = x
+        // works on both IE and FF.
+        node.className = value;
+    } else if (attrname.toLowerCase() == 'for') {
+        // On IE, workaround is needed. Since I am not sure, I use both methods.
+        node.htmlFor = value;
+        node.setAttribute(attrname, value);
+    } else {
+        node.setAttribute(attrname, value);
+    }
+};
+

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Mon Aug 21 12:46:08 2006
@@ -369,7 +369,7 @@
     if (parms.name.toLowerCase() == 'style') {
         throw 'Style attribute is not allowed with setAttribute';
     }
-    kukit.ut.setAttribute(node, parms.name, parms.value);
+    kukit.dom.setAttribute(node, parms.name, parms.value);
 });
 kukit.cr.commandRegistry.registerFromAction('setAttribute', kukit.cr.makeSelectorCommand);
 

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Mon Aug 21 12:46:08 2006
@@ -181,17 +181,17 @@
                 kukit.pl.evalBool(this.args, 1, '2nd attribute of nodeAttr must be a boolean');
                 recurseParents = this.args[1];
             }
-            var value = kukit.ut.getAttribute(node, argname);
+            var value = kukit.dom.getAttribute(node, argname);
             if (recurseParents) {
                 var element = node;
                 // need to recurse even if value="" ! We cannot figure out if there exists
                 // and attribute in a crossbrowser way, or it is set to "".
                 while (! value) {
                     element = element.parentNode;
-                    if (! element) {
+                    if (! element || ! element.getAttribute) {
                         break;
                     }
-                    value = kukit.ut.getAttribute(element, argname);
+                    value = kukit.dom.getAttribute(element, argname);
                 }
             } 
             if (typeof(value) == 'undefined') {

Modified: kukit/kukit.js/trunk/kukit/utils.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/utils.js	(original)
+++ kukit/kukit.js/trunk/kukit/utils.js	Mon Aug 21 12:46:08 2006
@@ -178,46 +178,3 @@
     return this.elements[0];
 };
 
-/* Getting and setting node attibutes 
-   We need to provide workarounds for IE.
-*/
-
-kukit.ut.getAttribute = function(node, attrname) {
-    if (attrname.toLowerCase() == 'style') {
-        throw 'Style attribute is not allowed with getAttribute';
-    }
-    // Try first, there is chance that it works
-    // XXX this works but not for kukit:xxx args
-    //var value = node[argname];
-    var value = node.getAttribute(attrname);
-    if (! value) {
-        // Workarounds, in case we have not found above
-        if (attrname.toLowerCase() == 'class') {
-            // for IE
-            value = node.className;
-        } else if (attrname.toLowerCase() == 'for') {
-            // for IE
-            value = node.htmlFor;
-        }
-    }
-    return value;
-    // XXX We cannot distinguish between notfound and '', unfortunately
-};
-
-kukit.ut.setAttribute = function(node, attrname, value) {
-    if (attrname.toLowerCase() == 'style') {
-        throw 'Style attribute is not allowed with setAttribute';
-    }
-    if (attrname.toLowerCase() == 'class') {
-        // The class attribute cannot be set on IE, instead
-        // className must be used. However node.className = x
-        // works on both IE and FF.
-        node.className = value;
-    } else if (attrname.toLowerCase() == 'for') {
-        // On IE, workaround is needed. Since I am not sure, I use both methods.
-        node.htmlFor = value;
-        node.setAttribute(attrname, value);
-    } else {
-        node.setAttribute(attrname, value);
-    }
-};

From reebalazs at codespeak.net  Tue Aug 22 15:29:57 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 22 Aug 2006 15:29:57 +0200 (CEST)
Subject: [Kukit-checkins] r31468 - kukit/kukit.js/trunk/kukit
Message-ID: <20060822132957.ED2EE1005A@code0.codespeak.net>

Author: reebalazs
Date: Tue Aug 22 15:29:55 2006
New Revision: 31468

Modified:
   kukit/kukit.js/trunk/kukit/kukit.js
   kukit/kukit.js/trunk/kukit/plugin.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
Log:
Load event changes

- making phases (initial pageload or insertion) distinguishable for bind events

- the load hack: load should have a delay on iframes, this enables a special usage
  and for example load a kupu editor into an embedded part. This is at the moment
  a solution that is only good for demo: it either works or not. Since I could not
  figure out a way to wait until the iframe is loaded (chances are good that it is
  impossible to achieve this in a cross browser compatible way), I apply a big
  delay and cross fingers that the page load finishes before.

Modified: kukit/kukit.js/trunk/kukit/kukit.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kukit.js	(original)
+++ kukit/kukit.js/trunk/kukit/kukit.js	Tue Aug 22 15:29:55 2006
@@ -101,17 +101,24 @@
 
 kukit.setupEvents = function(in_nodes) {
     var ts_start = (new Date()).valueOf();
+    // Decide phase. 1=initial, 2=insertion.
+    var phase;
+    if (typeof(in_nodes) == 'undefined') {
+        phase = 1;
+    } else {
+        phase = 2;
+    }
     var rules = kukit.rules;
     var ruletable = new kukit.rd.RuleTable();
     for (var y=0; y < rules.length; y++) {
-        rules[y].mergeForSelectedNodes(ruletable, in_nodes);
+        rules[y].mergeForSelectedNodes(ruletable, phase, in_nodes);
     }
     // bind special selectors first
-    if (typeof(in_nodes) == 'undefined') {
-        kukit.rd.methodTable.bindall();
+    if (phase == 1) {
+        kukit.rd.methodTable.bindall(phase);
     }
     // finally bind the merged events
-    ruletable.bindall()
+    ruletable.bindall(phase)
     var ts_end = (new Date()).valueOf();
     kukit.log('Setting up events in ' + (ts_end - ts_start) + ' ms');
 };

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Tue Aug 22 15:29:55 2006
@@ -271,10 +271,36 @@
 kukit.pl.LoadEventBinder = function() {
 };
 
-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()
+kukit.pl.LoadEventBinder.prototype.__bind__ = function(name, parms, func_to_bind, node, eventrule) {
+    parms = kukit.pl.completeParms(parms, [], {'initial': 'true', 'insert': 'true'}, 'load event binding');
+    kukit.pl.evalBool(parms, 'initial', 'load event binding');
+    kukit.pl.evalBool(parms, 'insert', 'load event binding');
+    // Bind the function to the onload event of the node.
+    // If this is an iframe node, we have the possibility
+    // to wait until the execution totally finishes, so we load the real load event.
+    // node._kukitmark contains the binding phase.
+    var phase = node._kukitmark;
+    if (phase == 1 && ! parms.initial) {
+        kukit.logDebug('EventRule #' + eventrule.getNr() + ' mergeid ' + eventrule.kss_selector.mergeid + 'event ignored, oninitial=false.');
+        return;
+    }
+    if (phase == 2 && ! parms.insert) {
+        kukit.logDebug('EventRule #' + eventrule.getNr() + ' mergeid ' + eventrule.kss_selector.mergeid + ' event ignored, oninsert=false.');
+        return;
+    }
+    if (node != null && node.tagName.toLowerCase() == 'iframe' && phase == 2) {
+        kukit.logDebug('EventRule #' + eventrule.getNr() + ' mergeid ' + eventrule.kss_selector.mergeid + ' event selected delayed execution.');
+        // This is really crap. We have no way to wait until the frame hase
+        // loaded, the only workaround is to wait. This works or not.
+        // XXX How could we do this in a solid way?
+        var timer = new kukit.pl.TimerCounter(1000, function() {
+            func_to_bind();
+        });
+        timer.start();
+    } else {
+        // for any other node than iframe, or even for iframe in phase1, we need to execute immediately.
+        func_to_bind();
+    }
 };
 
 kukit.er.eventRegistry.register(null, 'load', kukit.pl.LoadEventBinder, '__bind__', null);

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Tue Aug 22 15:29:55 2006
@@ -266,8 +266,8 @@
     }
 };
 
-kukit.rd.EventRule.prototype.mergeForSelectedNodes = function(ruletable, in_nodes) {
-    // Select all nodes within the in_nodes. (or undefined on initial node)
+kukit.rd.EventRule.prototype.mergeForSelectedNodes = function(ruletable, phase, in_nodes) {
+    // Select all nodes within the in_nodes for phase==2. (or undefined on initial node, phase==1)
     // Merge itself to the selected nodes.
     if (this.kss_selector.isEventSelector) {
         var nodes = kukit.dom.cssQuery(this.kss_selector.css, in_nodes);
@@ -277,7 +277,7 @@
             var node = nodes[y];
             // XXX never rebind to any node again!
             // this compensates that cssQuery is returning results out of the subtree
-            if (! node._kukitmark) {
+            if (typeof(node._kukitmark) == 'undefined') {
                 ruletable.add(node, this);
                 counter += 1;
                 }
@@ -568,18 +568,18 @@
     eventrule.mergeIntoDict(nodeval.val, eventrule.kss_selector.mergeid, eventrule);
 };
 
-kukit.rd.RuleTable.prototype.bindall = function() {
+kukit.rd.RuleTable.prototype.bindall = function(phase) {
     // Bind all nodes
     var counter = 0;
     for (var nodehash in this.nodes) {
         var nodeval = this.nodes[nodehash];
+        // XXX Mark the node, disabling rebinding in a second round
+        nodeval.node._kukitmark = phase;
         for (var id in nodeval.val) {
             var eventrule = nodeval.val[id];
             eventrule.bind(nodeval.node);            
         }
         counter += 1;
-        // XXX Mark the node, disabling rebinding in a second round
-        nodeval.node._kukitmark = true;
     }
     kukit.logDebug('Binding to ' + counter + ' nodes in grand total');
 };

From reebalazs at codespeak.net  Tue Aug 22 18:28:30 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 22 Aug 2006 18:28:30 +0200 (CEST)
Subject: [Kukit-checkins] r31492 - in kukit/azax/branch/zope2.8: . plugins
Message-ID: <20060822162830.8C5AC1005A@code0.codespeak.net>

Author: reebalazs
Date: Tue Aug 22 18:28:28 2006
New Revision: 31492

Modified:
   kukit/azax/branch/zope2.8/azaxview.py
   kukit/azax/branch/zope2.8/plugins/configure.zcml
   kukit/azax/branch/zope2.8/selectors.py
Log:
Merge changes from trunk

Modified: kukit/azax/branch/zope2.8/azaxview.py
==============================================================================
--- kukit/azax/branch/zope2.8/azaxview.py	(original)
+++ kukit/azax/branch/zope2.8/azaxview.py	Tue Aug 22 18:28:28 2006
@@ -63,8 +63,8 @@
         BrowserView.__init__(self, context, request)
         self.commands = AzaxCommands()
 
-    def addCommand(self, name, selector=None):
-        return self.commands.addCommand(name, selector=selector)
+    def addCommand(self, name, selector=None, **kw):
+        return self.commands.addCommand(name, selector=selector, **kw)
 
     def getCommands(self):
         return self.commands

Modified: kukit/azax/branch/zope2.8/plugins/configure.zcml
==============================================================================
--- kukit/azax/branch/zope2.8/plugins/configure.zcml	(original)
+++ kukit/azax/branch/zope2.8/plugins/configure.zcml	Tue Aug 22 18:28:28 2006
@@ -285,4 +285,8 @@
         name="htmlid"
         />
 
+    <azax:registerSelectorType
+        name="samenode"
+        />
+
 </configure>

Modified: kukit/azax/branch/zope2.8/selectors.py
==============================================================================
--- kukit/azax/branch/zope2.8/selectors.py	(original)
+++ kukit/azax/branch/zope2.8/selectors.py	Tue Aug 22 18:28:28 2006
@@ -37,4 +37,4 @@
 
     def __init__(self, type, selector):
         self.type = type
-        SelectorBase.__init__(selector)
+        SelectorBase.__init__(self, selector)

From reebalazs at codespeak.net  Tue Aug 22 18:31:45 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Tue, 22 Aug 2006 18:31:45 +0200 (CEST)
Subject: [Kukit-checkins] r31493 - in kukit/azaxdemo/branch/zope2.8: .
	browser
Message-ID: <20060822163145.432CA1005A@code0.codespeak.net>

Author: reebalazs
Date: Tue Aug 22 18:31:42 2006
New Revision: 31493

Modified:
   kukit/azaxdemo/branch/zope2.8/browser/azax_tree.kss
   kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt
   kukit/azaxdemo/branch/zope2.8/simplecontent.py
Log:
Merge changes from trunk

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_tree.kss
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_tree.kss	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_tree.kss	Tue Aug 22 18:31:42 2006
@@ -1,9 +1,9 @@
 .state-expanded:click {
     action-server: collapseSubTree;
-    collapseSubTree-value: nodeAttr("id");
+    collapseSubTree-value: nodeAttr("kukit:node");
 }
 
 .state-collapsed:click {
     action-server: expandSubTree;
-    expandSubTree-value: nodeAttr("id");
+    expandSubTree-value: nodeAttr("kukit:node");
 }

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt	Tue Aug 22 18:31:42 2006
@@ -19,18 +19,21 @@
 
 <h3>Tree Demo</h3>
     <p id="text">This is not finished yet.</p>
+    <p>In this demo we use attributes in a special namespace. This makes
+    it possible to put attributes to nodes without producing crappy html or being
+    forced to reuse "id".</p>
     <form name="edit">
     <ul id="root">
-        <li class="state-collapsed" id="node:1">1</li>
-        <li class="state-expanded" id="node:2">2</li>
+        <li class="state-collapsed" id="node:1" kukit:node="1">1</li>
+        <li class="state-expanded" id="node:2" kukit:node="2">2</li>
         <ul id="childs:2">
-            <li class="state-collapsed" id="node:2/1">2.1</li>
-            <li class="state-collapsed" id="node:2/2">2.2</li>
+            <li class="state-collapsed" id="node:2/1" kukit:node="2/1">2.1</li>
+            <li class="state-collapsed" id="node:2/2" kukit:node="2/2">2.2</li>
         </ul>
-        <li class="state-expanded" id="node:3">3</li>
+        <li class="state-expanded" id="node:3" kukit:node="3">3</li>
         <ul id="subTree:3">
-            <li class="state-collapsed" id="node:3/1">3.1</li>
-            <li class="state-collapsed" id="node:3/2">3.2</li>
+            <li class="state-collapsed" id="node:3/1" kukit:node="3/1">3.1</li>
+            <li class="state-collapsed" id="node:3/2" kukit:node="3/2">3.2</li>
         </ul>
     </ul>
 

Modified: kukit/azaxdemo/branch/zope2.8/simplecontent.py
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/simplecontent.py	(original)
+++ kukit/azaxdemo/branch/zope2.8/simplecontent.py	Tue Aug 22 18:31:42 2006
@@ -1,26 +1,19 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2005-2006
-# Authors:
-#   Godefroid Chapelle <gotcha at bubblenet.be>
-#   Tarek Ziad? <tz at nuxeo.com>
-#   Bal?zs Re? <ree at greenfinity.hu>
+##############################################################################
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
+# Copyright (c) 2004, 2005 Zope Corporation and Contributors.
+# All Rights Reserved.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
 #
+##############################################################################
+"""Simple content implementationm
 
-"""Simple content implementation
+$Id: simplecontent.py 12915 2005-05-31 10:23:19Z philikon $
 """
 from OFS.SimpleItem import SimpleItem
 from Globals import InitializeClass

From reebalazs at codespeak.net  Wed Aug 23 13:33:16 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Wed, 23 Aug 2006 13:33:16 +0200 (CEST)
Subject: [Kukit-checkins] r31532 - kukit/azax/trunk
Message-ID: <20060823113316.B08DB10033@code0.codespeak.net>

Author: reebalazs
Date: Wed Aug 23 13:33:15 2006
New Revision: 31532

Modified:
   kukit/azax/trunk/configure.zcml
Log:
Again compress the kukit.js

Modified: kukit/azax/trunk/configure.zcml
==============================================================================
--- kukit/azax/trunk/configure.zcml	(original)
+++ kukit/azax/trunk/configure.zcml	Wed Aug 23 13:33:15 2006
@@ -25,7 +25,7 @@
         kukit/kukit/forms.js
         kukit/kukit/plugin.js"
     name="kukit.js"
-    compress_level="none"
+    compress_level="safe"
   />
   <!-- Replace with 
     compress_level="none"

From reebalazs at codespeak.net  Wed Aug 23 13:34:51 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Wed, 23 Aug 2006 13:34:51 +0200 (CEST)
Subject: [Kukit-checkins] r31534 - kukit/azax/branch/zope2.8
Message-ID: <20060823113451.2C8D110036@code0.codespeak.net>

Author: reebalazs
Date: Wed Aug 23 13:34:49 2006
New Revision: 31534

Modified:
   kukit/azax/branch/zope2.8/configure.zcml
Log:
merge from trunk: Again compress the kukit.js

Modified: kukit/azax/branch/zope2.8/configure.zcml
==============================================================================
--- kukit/azax/branch/zope2.8/configure.zcml	(original)
+++ kukit/azax/branch/zope2.8/configure.zcml	Wed Aug 23 13:34:49 2006
@@ -25,7 +25,7 @@
         kukit/kukit/forms.js
         kukit/kukit/plugin.js"
     name="kukit.js"
-    compress_level="none"
+    compress_level="safe"
   />
   <!-- Replace with 
     compress_level="none"

From reebalazs at codespeak.net  Wed Aug 23 18:54:55 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Wed, 23 Aug 2006 18:54:55 +0200 (CEST)
Subject: [Kukit-checkins] r31571 - kukit/azax/trunk/plugins
Message-ID: <20060823165455.7BD4210060@code0.codespeak.net>

Author: reebalazs
Date: Wed Aug 23 18:54:53 2006
New Revision: 31571

Modified:
   kukit/azax/trunk/plugins/configure.zcml
Log:
Implement setKssAttribute action and kssAttr parameter producer.

Modified: kukit/azax/trunk/plugins/configure.zcml
==============================================================================
--- kukit/azax/trunk/plugins/configure.zcml	(original)
+++ kukit/azax/trunk/plugins/configure.zcml	Wed Aug 23 18:54:53 2006
@@ -197,6 +197,12 @@
         />
 
     <azax:registerAction
+        name="setKssAttribute"
+        command_factory="selector"
+        params_mandatory="name value"
+        />
+
+    <azax:registerAction
         name="setStyle"
         command_factory="selector"
         params_mandatory="name value"

From reebalazs at codespeak.net  Wed Aug 23 18:55:01 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Wed, 23 Aug 2006 18:55:01 +0200 (CEST)
Subject: [Kukit-checkins] r31572 - kukit/kukit.js/trunk/kukit
Message-ID: <20060823165501.11F091006C@code0.codespeak.net>

Author: reebalazs
Date: Wed Aug 23 18:54:59 2006
New Revision: 31572

Modified:
   kukit/kukit.js/trunk/kukit/dom.js
   kukit/kukit.js/trunk/kukit/plugin.js
   kukit/kukit.js/trunk/kukit/resourcedata.js
Log:
Implement setKssAttribute action and kssAttr parameter producer.

Modified: kukit/kukit.js/trunk/kukit/dom.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/dom.js	(original)
+++ kukit/kukit.js/trunk/kukit/dom.js	Wed Aug 23 18:54:59 2006
@@ -208,3 +208,82 @@
     }
 };
 
+
+/* Kukit attibutes: a workaround to provide attributes
+   in our own namespace.
+   Since namespaced attributes (kukit:name="value") are not allowed
+   even in transitional XHTML, we must provide a way to
+   substitute them. This is achieved by putting kukit-name-value
+   identifiers in the class attribute, separated by spaces.
+   We only read these attributes, writing happens
+   always in the kukit namespace.
+   XXX at the moment, deletion can be achieved with setting with
+   a value ''. This is consistent with DOM behaviour as we seem to
+   be getting '' for nonexistent values anyway.
+*/
+
+kukit.dom.namespace = 'kukit';
+
+kukit.dom.getKssClassAttribute = function(node, attrname) {
+    // Gets a given kss attribute from the class
+    var klass = kukit.dom.getAttribute(node, 'class');
+    var result = null;
+    if (klass) {
+        var splitclass = klass.split(/ +/);
+        for (var i=0; i<splitclass.length; i++) {
+            var elem = splitclass[i];
+            var splitelem = elem.split('-', 3);
+            if (splitelem.length == 3 && splitelem[0] == kukit.dom.namespace
+                    && splitelem[1] == attrname) {
+                // Found it. (The last one will be valid, in case of duplication)
+                var index = splitelem[0].length + splitelem[1].length + 2;
+                result = elem.substr(index);
+            }
+
+        }
+    }
+    return result;
+};
+
+kukit.dom.getKssAttribute = function(node, attrname) {
+    // Gets a given kss attribute 
+    // first from the namespace, then from the class
+    var result = kukit.dom.getAttribute(node, kukit.dom.namespace + ':' + attrname);
+    // XXX if this was '' it is the same as notfound, so it shadows the class attribute!
+    // This means setting an attribute to '' is the same as deleting it - at the moment
+    if (! result) {
+        result = kukit.dom.getKssClassAttribute(node, attrname);
+    }
+    return result;
+};
+
+kukit.dom.setKssAttribute = function(node, attrname, value) {
+    // Sets a given kss attribute on the namespace
+    kukit.dom.setAttribute(node, kukit.dom.namespace + ':' + attrname);
+};
+
+/* Recursive getting of node attributes
+   getter is a function that gets the value from the node.
+*/
+
+kukit.dom.getRecursiveAttribute = function(node, attrname, recurseParents, getter) {
+    var value = getter(node, attrname);
+    if (recurseParents) {
+        var element = node;
+        // need to recurse even if value="" ! We cannot figure out if there exists
+        // and attribute in a crossbrowser way, or it is set to "".
+        while (! value) {
+            element = element.parentNode;
+            if (! element || ! element.getAttribute) {
+                break;
+            }
+            value = getter(element, attrname);
+        }
+    } 
+    if (typeof(value) == 'undefined') {
+        // notfound arguments will get null
+        value = null;
+    }
+    return value;
+};
+

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Wed Aug 23 18:54:59 2006
@@ -399,6 +399,12 @@
 });
 kukit.cr.commandRegistry.registerFromAction('setAttribute', kukit.cr.makeSelectorCommand);
 
+kukit.ar.actionRegistry.register('setKssAttribute', function(node, parms, eventrule) {
+    parms = kukit.pl.completeParms(parms, ['name', 'value'], {}, 'setKssAttribute action');
+    kukit.dom.setKssAttribute(node, parms.name, parms.value);
+});
+kukit.cr.commandRegistry.registerFromAction('setKssAttribute', kukit.cr.makeSelectorCommand);
+
 kukit.ar.actionRegistry.register('setStyle', function(node, parms, eventrule) {
     parms = kukit.pl.completeParms(parms, ['name', 'value'], {}, 'setStyle action');
     node.style[parms.name] = parms.value;

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Wed Aug 23 18:54:59 2006
@@ -133,6 +133,17 @@
             if (this.args[0].toLowerCase() == 'style') {
                 throw 'nodeAttr method does not accept "style" as attrname';
             }
+            if (this.args[0].match(/[ ]/)) {
+                throw 'attrname parameter in nodeAttr method cannot contain space.';
+            }
+        } break;
+        case 'kssAttr': {
+            if (this.args.length != 1 && this.args.length != 2) {
+                throw 'nodeAttr method needs 1 or 2 argument (attrname, [recurseParents])';
+            }
+            if (this.args[0].match(/[ -]/)) {
+                throw 'attrname parameter in kssAttr method cannot contain "-" or space.';
+            }
         } break;
         case 'nodeContent': {
             if (this.args.length != 0 && this.args.length != 1) {
@@ -181,23 +192,17 @@
                 kukit.pl.evalBool(this.args, 1, '2nd attribute of nodeAttr must be a boolean');
                 recurseParents = this.args[1];
             }
-            var value = kukit.dom.getAttribute(node, argname);
-            if (recurseParents) {
-                var element = node;
-                // need to recurse even if value="" ! We cannot figure out if there exists
-                // and attribute in a crossbrowser way, or it is set to "".
-                while (! value) {
-                    element = element.parentNode;
-                    if (! element || ! element.getAttribute) {
-                        break;
-                    }
-                    value = kukit.dom.getAttribute(element, argname);
-                }
-            } 
-            if (typeof(value) == 'undefined') {
-                // notfound arguments will get null
-                value = null;
+            var value = kukit.dom.getRecursiveAttribute(node, argname, recurseParents, kukit.dom.getAttribute);
+            parms[key] = value;
+        } break;
+        case 'kssAttr': {
+            var argname =  this.args[0];
+            var recurseParents = false;
+            if (this.args.length == 2) {
+                kukit.pl.evalBool(this.args, 1, '2nd attribute of kssAttr must be a boolean');
+                recurseParents = this.args[1];
             }
+            var value = kukit.dom.getRecursiveAttribute(node, argname, recurseParents, kukit.dom.getKssAttribute);
             parms[key] = value;
         } break;
         case 'nodeContent': {

From reebalazs at codespeak.net  Wed Aug 23 20:07:19 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Wed, 23 Aug 2006 20:07:19 +0200 (CEST)
Subject: [Kukit-checkins] r31578 - kukit/azax/branch/zope2.8/plugins
Message-ID: <20060823180719.2257610060@code0.codespeak.net>

Author: reebalazs
Date: Wed Aug 23 20:07:17 2006
New Revision: 31578

Modified:
   kukit/azax/branch/zope2.8/plugins/configure.zcml
Log:
Merge from trunk

Modified: kukit/azax/branch/zope2.8/plugins/configure.zcml
==============================================================================
--- kukit/azax/branch/zope2.8/plugins/configure.zcml	(original)
+++ kukit/azax/branch/zope2.8/plugins/configure.zcml	Wed Aug 23 20:07:17 2006
@@ -195,6 +195,12 @@
         />
 
     <azax:registerAction
+        name="setKssAttribute"
+        command_factory="selector"
+        params_mandatory="name value"
+        />
+
+    <azax:registerAction
         name="setStyle"
         command_factory="selector"
         params_mandatory="name value"

From reebalazs at codespeak.net  Thu Aug 24 09:39:24 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 24 Aug 2006 09:39:24 +0200 (CEST)
Subject: [Kukit-checkins] r31579 - in kukit/azaxdemo/trunk: . browser
Message-ID: <20060824073924.D143110036@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 24 09:39:20 2006
New Revision: 31579

Modified:
   kukit/azaxdemo/trunk/azaxview.py
   kukit/azaxdemo/trunk/browser/azax_demo.pt
   kukit/azaxdemo/trunk/browser/azax_instant_edit.pt
   kukit/azaxdemo/trunk/browser/azax_three_autoupdate.pt
   kukit/azaxdemo/trunk/browser/azax_tree.kss
   kukit/azaxdemo/trunk/browser/azax_tree.pt
   kukit/azaxdemo/trunk/browser/azax_two_select.pt
   kukit/azaxdemo/trunk/browser/azax_xpath.pt
   kukit/azaxdemo/trunk/browser/cancel_submit.pt
   kukit/azaxdemo/trunk/browser/form_submit.pt
   kukit/azaxdemo/trunk/browser/more_selectors.pt
   kukit/azaxdemo/trunk/browser/two_select_revisited.pt
Log:
Add loggingpane links, change tree demo

Modified: kukit/azaxdemo/trunk/azaxview.py
==============================================================================
--- kukit/azaxdemo/trunk/azaxview.py	(original)
+++ kukit/azaxdemo/trunk/azaxview.py	Thu Aug 24 09:39:20 2006
@@ -104,14 +104,14 @@
         self.replaceInnerHTML('div#text', value+'<input type="hidden" name="value" value="'+value+'" />')
         return self.render()
     
-    def expandSubTree(self, value):
+    def expandSubTree(self, value, xvalue):
         'Expands given subtree'
-        self.replaceInnerHTML('#text', 'works, expand %s' % value)
+        self.replaceInnerHTML('#text', 'works, expand %s (xhtml attr: %s)' % (value, xvalue))
         return self.render()
         
-    def collapseSubTree(self, value):
+    def collapseSubTree(self, value, xvalue):
         'Collapses given subtree'
-        self.replaceInnerHTML('#text', 'works, collapse %s' % value)
+        self.replaceInnerHTML('#text', 'works, collapse %s (xhtml attr: %s)' % (value, xvalue))
         return self.render()
 
     def cancelSubmitSave(self, text_save):

Modified: kukit/azaxdemo/trunk/browser/azax_demo.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_demo.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_demo.pt	Thu Aug 24 09:39:20 2006
@@ -7,6 +7,7 @@
   <body>
   <!--a href="javascript:void(createLoggingPane(true));">logging</a-->
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
     <h2>Change tag content</h2>
     <h4>Top div</h4>
     <div id="demo" style="border: 1px solid black;padding: 15px">

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	Thu Aug 24 09:39:20 2006
@@ -6,6 +6,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
 
 <h3>Instant edit Demo</h3>
 	<div>

Modified: kukit/azaxdemo/trunk/browser/azax_three_autoupdate.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_three_autoupdate.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_three_autoupdate.pt	Thu Aug 24 09:39:20 2006
@@ -25,6 +25,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
     <h2>Three autoupdate</h2>
 
 <h3>Demo</h3>

Modified: kukit/azaxdemo/trunk/browser/azax_tree.kss
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_tree.kss	(original)
+++ kukit/azaxdemo/trunk/browser/azax_tree.kss	Thu Aug 24 09:39:20 2006
@@ -1,9 +1,11 @@
 .state-expanded:click {
     action-server: collapseSubTree;
-    collapseSubTree-value: nodeAttr("kukit:node");
+    collapseSubTree-value: kssAttr("node");
+    collapseSubTree-xvalue: kssAttr("xnode");
 }
 
 .state-collapsed:click {
     action-server: expandSubTree;
-    expandSubTree-value: nodeAttr("kukit:node");
+    expandSubTree-value: kssAttr("node");
+    expandSubTree-xvalue: kssAttr("xnode");
 }

Modified: kukit/azaxdemo/trunk/browser/azax_tree.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_tree.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_tree.pt	Thu Aug 24 09:39:20 2006
@@ -16,24 +16,31 @@
 </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
 
 <h3>Tree Demo</h3>
     <p id="text">This is not finished yet.</p>
     <p>In this demo we use attributes in a special namespace. This makes
-    it possible to put attributes to nodes without producing crappy html or being
-    forced to reuse "id".</p>
+    it possible to put attributes to nodes without being forced to reuse "id"
+	or otherwise produce invalid html.</p>
+    <p>There are two ways to provide these attributes in pages:
+    with real xhtml (mimetype text/xhtml), namespace attributes can be used, 
+	with transitional xhtml (mimetype text/html)
+	the attributes can be encoded into "class" attributes. Both are demonstrated
+	in this example in paraller, but in reality, one of these should be 
+	used depending on the content type of the page.</p>
     <form name="edit">
     <ul id="root">
-        <li class="state-collapsed" id="node:1" kukit:node="1">1</li>
-        <li class="state-expanded" id="node:2" kukit:node="2">2</li>
+        <li class="state-collapsed kukit-node-1" id="node:1" kukit:xnode="1">1</li>
+        <li class="state-expanded kukit-node-2" id="node:2" kukit:xnode="2">2</li>
         <ul id="childs:2">
-            <li class="state-collapsed" id="node:2/1" kukit:node="2/1">2.1</li>
-            <li class="state-collapsed" id="node:2/2" kukit:node="2/2">2.2</li>
+            <li class="state-collapsed kukit-node-2/1" id="node:2/1" kukit:xnode="2/1">2.1</li>
+            <li class="state-collapsed kukit-node-2/2" id="node:2/2" kukit:xnode="2/2">2.2</li>
         </ul>
-        <li class="state-expanded" id="node:3" kukit:node="3">3</li>
+        <li class="state-expanded kukit-node-3" id="node:3" kukit:xnode="3">3</li>
         <ul id="subTree:3">
-            <li class="state-collapsed" id="node:3/1" kukit:node="3/1">3.1</li>
-            <li class="state-collapsed" id="node:3/2" kukit:node="3/2">3.2</li>
+            <li class="state-collapsed kukit-node-3/1" id="node:3/1" kukit:xnode="3/1">3.1</li>
+            <li class="state-collapsed kukit-node-3/2" id="node:3/2" kukit:xnode="3/2">3.2</li>
         </ul>
     </ul>
 

Modified: kukit/azaxdemo/trunk/browser/azax_two_select.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_two_select.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_two_select.pt	Thu Aug 24 09:39:20 2006
@@ -6,6 +6,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
     <h2>Two Selects</h2>
    <form name="two">
        <select id="first" name="value">

Modified: kukit/azaxdemo/trunk/browser/azax_xpath.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_xpath.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_xpath.pt	Thu Aug 24 09:39:20 2006
@@ -7,6 +7,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
 
 <h3>xpath Demo</h3>
 <p>Some preliminary xpath demo. Godefroid's test area.

Modified: kukit/azaxdemo/trunk/browser/cancel_submit.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/cancel_submit.pt	(original)
+++ kukit/azaxdemo/trunk/browser/cancel_submit.pt	Thu Aug 24 09:39:20 2006
@@ -7,6 +7,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
 
 <h3>Cancel Submit Click Demo</h3>
    <p tal:condition="request/text_save | nothing"><span tal:replace="request/text_save | nothing" /> saved !</p>

Modified: kukit/azaxdemo/trunk/browser/form_submit.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/form_submit.pt	(original)
+++ kukit/azaxdemo/trunk/browser/form_submit.pt	Thu Aug 24 09:39:20 2006
@@ -8,6 +8,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
 
 <h3>Form Submit Demo</h3>
    <p tal:condition="request/text_save | nothing"><span tal:replace="request/text_save | nothing" /> saved !</p>

Modified: kukit/azaxdemo/trunk/browser/more_selectors.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/more_selectors.pt	(original)
+++ kukit/azaxdemo/trunk/browser/more_selectors.pt	Thu Aug 24 09:39:20 2006
@@ -11,17 +11,18 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
     <h2>More complex selectors</h2>
 
 <p>
-This demo implements the annoyUser kukit plugin that shows a simple
+This demo implements the annoyclicker-click kss plugin that shows a simple
 pattern of creating stateful (class-like) events in a plugin 
 and how to bind them from kss.
 </p>
 
 <p>
-The first button and the second button are bound to two event
-instances, the first one sends every 3rd click to the server and
+The first button and the second button are bound to two "event binder
+instances", the first one sends every 3rd click to the server and
 executes a local action otherwise; the second button does
 the same but with a count of two.
 </p>

Modified: kukit/azaxdemo/trunk/browser/two_select_revisited.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/two_select_revisited.pt	(original)
+++ kukit/azaxdemo/trunk/browser/two_select_revisited.pt	Thu Aug 24 09:39:20 2006
@@ -6,6 +6,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
     <h2>Master-slave selects revisited</h2>
     <form name="two">
         <div>

From reebalazs at codespeak.net  Thu Aug 24 09:40:40 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 24 Aug 2006 09:40:40 +0200 (CEST)
Subject: [Kukit-checkins] r31580 - in kukit/azaxdemo/branch/zope2.8: .
	browser
Message-ID: <20060824074040.81D3110036@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 24 09:40:37 2006
New Revision: 31580

Modified:
   kukit/azaxdemo/branch/zope2.8/azaxview.py
   kukit/azaxdemo/branch/zope2.8/browser/azax_demo.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_instant_edit.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_three_autoupdate.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_tree.kss
   kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_two_select.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_xpath.pt
   kukit/azaxdemo/branch/zope2.8/browser/cancel_submit.pt
   kukit/azaxdemo/branch/zope2.8/browser/form_submit.pt
   kukit/azaxdemo/branch/zope2.8/browser/more_selectors.pt
   kukit/azaxdemo/branch/zope2.8/browser/two_select_revisited.pt
Log:
Merge from trunk

Modified: kukit/azaxdemo/branch/zope2.8/azaxview.py
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/azaxview.py	(original)
+++ kukit/azaxdemo/branch/zope2.8/azaxview.py	Thu Aug 24 09:40:37 2006
@@ -100,14 +100,14 @@
         self.replaceInnerHTML('div#text', value+'<input type="hidden" name="value" value="'+value+'" />')
         return self.render()
     
-    def expandSubTree(self, value):
+    def expandSubTree(self, value, xvalue):
         'Expands given subtree'
-        self.replaceInnerHTML('#text', 'works, expand %s' % value)
+        self.replaceInnerHTML('#text', 'works, expand %s (xhtml attr: %s)' % (value, xvalue))
         return self.render()
         
-    def collapseSubTree(self, value):
+    def collapseSubTree(self, value, xvalue):
         'Collapses given subtree'
-        self.replaceInnerHTML('#text', 'works, collapse %s' % value)
+        self.replaceInnerHTML('#text', 'works, collapse %s (xhtml attr: %s)' % (value, xvalue))
         return self.render()
 
     def cancelSubmitSave(self, text_save):

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_demo.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_demo.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_demo.pt	Thu Aug 24 09:40:37 2006
@@ -7,6 +7,7 @@
   <body>
   <!--a href="javascript:void(createLoggingPane(true));">logging</a-->
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
     <h2>Change tag content</h2>
     <h4>Top div</h4>
     <div id="demo" style="border: 1px solid black;padding: 15px">

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_instant_edit.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_instant_edit.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_instant_edit.pt	Thu Aug 24 09:40:37 2006
@@ -6,6 +6,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
 
 <h3>Instant edit Demo</h3>
 	<div>

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_three_autoupdate.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_three_autoupdate.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_three_autoupdate.pt	Thu Aug 24 09:40:37 2006
@@ -25,6 +25,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
     <h2>Three autoupdate</h2>
 
 <h3>Demo</h3>

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_tree.kss
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_tree.kss	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_tree.kss	Thu Aug 24 09:40:37 2006
@@ -1,9 +1,11 @@
 .state-expanded:click {
     action-server: collapseSubTree;
-    collapseSubTree-value: nodeAttr("kukit:node");
+    collapseSubTree-value: kssAttr("node");
+    collapseSubTree-xvalue: kssAttr("xnode");
 }
 
 .state-collapsed:click {
     action-server: expandSubTree;
-    expandSubTree-value: nodeAttr("kukit:node");
+    expandSubTree-value: kssAttr("node");
+    expandSubTree-xvalue: kssAttr("xnode");
 }

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt	Thu Aug 24 09:40:37 2006
@@ -16,24 +16,31 @@
 </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
 
 <h3>Tree Demo</h3>
     <p id="text">This is not finished yet.</p>
     <p>In this demo we use attributes in a special namespace. This makes
-    it possible to put attributes to nodes without producing crappy html or being
-    forced to reuse "id".</p>
+    it possible to put attributes to nodes without being forced to reuse "id"
+	or otherwise produce invalid html.</p>
+    <p>There are two ways to provide these attributes in pages:
+    with real xhtml (mimetype text/xhtml), namespace attributes can be used, 
+	with transitional xhtml (mimetype text/html)
+	the attributes can be encoded into "class" attributes. Both are demonstrated
+	in this example in paraller, but in reality, one of these should be 
+	used depending on the content type of the page.</p>
     <form name="edit">
     <ul id="root">
-        <li class="state-collapsed" id="node:1" kukit:node="1">1</li>
-        <li class="state-expanded" id="node:2" kukit:node="2">2</li>
+        <li class="state-collapsed kukit-node-1" id="node:1" kukit:xnode="1">1</li>
+        <li class="state-expanded kukit-node-2" id="node:2" kukit:xnode="2">2</li>
         <ul id="childs:2">
-            <li class="state-collapsed" id="node:2/1" kukit:node="2/1">2.1</li>
-            <li class="state-collapsed" id="node:2/2" kukit:node="2/2">2.2</li>
+            <li class="state-collapsed kukit-node-2/1" id="node:2/1" kukit:xnode="2/1">2.1</li>
+            <li class="state-collapsed kukit-node-2/2" id="node:2/2" kukit:xnode="2/2">2.2</li>
         </ul>
-        <li class="state-expanded" id="node:3" kukit:node="3">3</li>
+        <li class="state-expanded kukit-node-3" id="node:3" kukit:xnode="3">3</li>
         <ul id="subTree:3">
-            <li class="state-collapsed" id="node:3/1" kukit:node="3/1">3.1</li>
-            <li class="state-collapsed" id="node:3/2" kukit:node="3/2">3.2</li>
+            <li class="state-collapsed kukit-node-3/1" id="node:3/1" kukit:xnode="3/1">3.1</li>
+            <li class="state-collapsed kukit-node-3/2" id="node:3/2" kukit:xnode="3/2">3.2</li>
         </ul>
     </ul>
 

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_two_select.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_two_select.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_two_select.pt	Thu Aug 24 09:40:37 2006
@@ -6,6 +6,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
     <h2>Two Selects</h2>
    <form name="two">
        <select id="first" name="value">

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_xpath.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_xpath.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_xpath.pt	Thu Aug 24 09:40:37 2006
@@ -7,6 +7,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
 
 <h3>xpath Demo</h3>
 <p>Some preliminary xpath demo. Godefroid's test area.

Modified: kukit/azaxdemo/branch/zope2.8/browser/cancel_submit.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/cancel_submit.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/cancel_submit.pt	Thu Aug 24 09:40:37 2006
@@ -7,6 +7,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
 
 <h3>Cancel Submit Click Demo</h3>
    <p tal:condition="request/text_save | nothing"><span tal:replace="request/text_save | nothing" /> saved !</p>

Modified: kukit/azaxdemo/branch/zope2.8/browser/form_submit.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/form_submit.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/form_submit.pt	Thu Aug 24 09:40:37 2006
@@ -8,6 +8,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
 
 <h3>Form Submit Demo</h3>
    <p tal:condition="request/text_save | nothing"><span tal:replace="request/text_save | nothing" /> saved !</p>

Modified: kukit/azaxdemo/branch/zope2.8/browser/more_selectors.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/more_selectors.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/more_selectors.pt	Thu Aug 24 09:40:37 2006
@@ -11,17 +11,18 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
     <h2>More complex selectors</h2>
 
 <p>
-This demo implements the annoyUser kukit plugin that shows a simple
+This demo implements the annoyclicker-click kss plugin that shows a simple
 pattern of creating stateful (class-like) events in a plugin 
 and how to bind them from kss.
 </p>
 
 <p>
-The first button and the second button are bound to two event
-instances, the first one sends every 3rd click to the server and
+The first button and the second button are bound to two "event binder
+instances", the first one sends every 3rd click to the server and
 executes a local action otherwise; the second button does
 the same but with a count of two.
 </p>

Modified: kukit/azaxdemo/branch/zope2.8/browser/two_select_revisited.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/two_select_revisited.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/two_select_revisited.pt	Thu Aug 24 09:40:37 2006
@@ -6,6 +6,7 @@
   </head>
   <body>
     <p><a href=".">All demos</a></p>
+    <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
     <h2>Master-slave selects revisited</h2>
     <form name="two">
         <div>

From reebalazs at codespeak.net  Fri Aug 25 12:49:10 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 25 Aug 2006 12:49:10 +0200 (CEST)
Subject: [Kukit-checkins] r31626 - in kukit/bluekit/trunk: . browser
Message-ID: <20060825104910.561481007B@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 25 12:49:07 2006
New Revision: 31626

Modified:
   kukit/bluekit/trunk/bluekitview.py
   kukit/bluekit/trunk/browser/mockup.js
   kukit/bluekit/trunk/browser/plugin.js
   kukit/bluekit/trunk/configure.zcml
Log:
Oper update, deprecation update

Modified: kukit/bluekit/trunk/bluekitview.py
==============================================================================
--- kukit/bluekit/trunk/bluekitview.py	(original)
+++ kukit/bluekit/trunk/bluekitview.py	Fri Aug 25 12:49:07 2006
@@ -31,11 +31,11 @@
         data = command.addParam('html', '<![CDATA[%s]]>' % (new_value, ))
 
     def doBluekit(self):
-        self.setHtmlAsChild('div#demo', '<h1>it worked</h1>')
+        self.replaceInnerHTML('div#demo', '<h1>it worked</h1>')
         self.prototypeResponse('<h1>patched again</h1><h2>and again</h2>')
         return self.render()
 
     def doBluekitUpdate(self):
-        self.setHtmlAsChild('div#demo', '<h1>Update worked</h1>')
+        self.replaceInnerHTML('div#demo', '<h1>Update worked</h1>')
         self.prototypeResponse('<h1>we did it</h1><h2>again</h2>')
         return self.render()

Modified: kukit/bluekit/trunk/browser/mockup.js
==============================================================================
--- kukit/bluekit/trunk/browser/mockup.js	(original)
+++ kukit/bluekit/trunk/browser/mockup.js	Fri Aug 25 12:49:07 2006
@@ -10,16 +10,19 @@
 
 //var foo = new Foo();
 
+
+// XXX Here is where kss wrapping / binding happens, this should be more separated.
+
 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);
+Foo.prototype.__bind__ = function(name, func_to_bind, oper) {
+    kukit.registerEventListener(oper.node, 'click', func_to_bind);
     return true;
 };
 
-Foo.prototype.__exec__ = function(name, parms, node) {
-    parms = kukit.pl.completeParms(parms, ['nodeid', 'url'], {});
-    this.update(parms.nodeid, parms.url);
+Foo.prototype.__exec__ = function(name, oper) {
+    oper.completeParms(['nodeid', 'url'], {});
+    this.update(oper.parms.nodeid, oper.parms.url);
     return true;
 };
 

Modified: kukit/bluekit/trunk/browser/plugin.js
==============================================================================
--- kukit/bluekit/trunk/browser/plugin.js	(original)
+++ kukit/bluekit/trunk/browser/plugin.js	Fri Aug 25 12:49:07 2006
@@ -1,14 +1,15 @@
 
 /* kss plugins for prototype, bling support */
 
-kukit.cr.makeGlobalCommand('prototypeResponse', function(node) {
-    parms = kukit.pl.completeParms(this.params, ['html'], {}, 'addAfter command');
+kukit.ar.actionRegistry.register('prototypeResponse', function(oper) {
+    oper.completeParms(['html'], {}, 'addAfter command');
     // 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.responseText = oper.parms.html.firstChild.data;
     this.transport.responseXML = null;
 });
+kukit.cr.commandRegistry.registerFromAction('prototypeResponse', kukit.cr.makeGlobalCommand);
 
 

Modified: kukit/bluekit/trunk/configure.zcml
==============================================================================
--- kukit/bluekit/trunk/configure.zcml	(original)
+++ kukit/bluekit/trunk/configure.zcml	Fri Aug 25 12:49:07 2006
@@ -59,9 +59,10 @@
         name="bluekit-update"
         />
 
-    <azax:registerCommand
+    <azax:registerAction
         name="prototypeResponse"
         jsfile="browser/plugin.js"
+		command_factory="global"
         />
 
 

From reebalazs at codespeak.net  Fri Aug 25 12:52:17 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 25 Aug 2006 12:52:17 +0200 (CEST)
Subject: [Kukit-checkins] r31627 - in kukit/kukit.js/trunk: kukit tests
Message-ID: <20060825105217.81F391007B@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 25 12:52:13 2006
New Revision: 31627

Added:
   kukit/kukit.js/trunk/kukit/oper.js
Modified:
   kukit/kukit.js/trunk/kukit/commandreg.js
   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/kukit/utils.js
   kukit/kukit.js/trunk/tests/runner.html
   kukit/kukit.js/trunk/tests/runtests.sh
Log:
Oper refactoring, eventinstance -> binderinstance name changes, attach browserevent on the oper object

Modified: kukit/kukit.js/trunk/kukit/commandreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/commandreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/commandreg.js	Fri Aug 25 12:52:13 2006
@@ -83,9 +83,9 @@
     return command;
 }
 
-kukit.cr._Command_execute_selector = function(node, parms, eventrule, eventinstance, orignode) {
+kukit.cr._Command_execute_selector = function(oper) {
     var selfunc = kukit.sr.selectorRegistry.get(this.selectorType);
-    var nodes = selfunc(this.selector, null, orignode);
+    var nodes = selfunc(this.selector, null, oper.orignode);
     var printtype;
     if (this.selectorType) {
         printtype = this.selectorType;
@@ -97,10 +97,10 @@
         kukit.logWarning('Selector found no nodes');
     }
     for (var i=0;i < nodes.length;i++) {
-        var node = nodes[i];
+        oper.node = nodes[i];
         //XXX error handling for wrong command name
         kukit.logDebug('Command Name: ' + this.name);
-        this.executeOnSingleNode(node, parms, eventrule, eventinstance);
+        this.executeOnSingleNode(oper);
     }
 };
 

Modified: kukit/kukit.js/trunk/kukit/eventreg.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/eventreg.js	(original)
+++ kukit/kukit.js/trunk/kukit/eventreg.js	Fri Aug 25 12:52:13 2006
@@ -152,7 +152,7 @@
 *
 */
 
-kukit.er.EventBinder_calldefault = function(namespace, name, parms, node) {
+kukit.er.EventBinder_calldefault = function(namespace, name, oper) {
     // private method for calling just a default method.
     // params should be alredy prepared.
     var methodname = kukit.er.eventRegistry.get(namespace, name).defaultactionmethodname;
@@ -162,7 +162,8 @@
             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);
+        oper.binderinstance = this;
+        method.call(this, name, oper);
     }
 }
 
@@ -170,7 +171,7 @@
 *  desired event action. Parameters will be these + those
 *  defined in the rule.
 *
-* Call example: eventinstance.__trigger_event__('doit', {'extravalue': '5'}, node);
+* Call example: binderinstance.__trigger_event__('doit', {'extravalue': '5'}, node);
 */
 
 kukit.er.EventBinder__trigger_event__ = function(name, parms, node) {
@@ -183,15 +184,23 @@
     // 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);
+        var oper = new kukit.op.Oper();
+        oper.parms = parms;
+        oper.eventrule = eventrule;
+        // node is null.
+        this._EventBinder_triggerevent(name, oper);
         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);
+    var opers = kukit.er.binderInstanceRegistry.getBinding(this, name);
+    for (var i=0; i<opers.length; i++) {
+        var oper = opers[i];
+        var newoper = new kukit.op.Oper();
+        newoper.parms = parms;
+        newoper.node = oper.node;
+        newoper.eventrule = oper.eventrule;
+        this._EventBinder_triggerevent(name, newoper);
         executed += 1;
     }
     // look up the behaviour event rule. This may fail (eventrule = null)
@@ -202,24 +211,29 @@
     if (eventrule != null || executed + special == 0) {
         // behaviour method is executed on the old node
         // XXX bad, very bad
-        this._EventBinder_triggerevent(name, parms, node, eventrule);
+        var oper = new kukit.op.Oper();
+        oper.parms = parms;
+        oper.node = node;
+        oper.eventrule = eventrule;
+        this._EventBinder_triggerevent(name, oper);
         special += 1;
     }
     kukit.logDebug('Event "' + name + '" executed on ' + executed + ' nodes, ' + special + ' special kss targets.');
 }
 
-kukit.er.EventBinder_triggerevent = function(name, parms, node, eventrule) {
+kukit.er.EventBinder_triggerevent = function(name, oper) {
     // Private. Called from __trigger_event__ or from main event execution.
-    if (eventrule) {
+    if (oper.eventrule) {
         // Call the actions, if we had an event rule.
         // This includes calling the default action.
-        eventrule.actions.execute(node, eventrule, parms, this);
+        oper.binderinstance = this;
+        oper.eventrule.actions.execute(oper);
     } else {
         // In case there is no event rule, just call the default event action.
         // 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);
+        this._EventBinder_calldefault(namespace, name, oper);
     }
 };
 
@@ -235,72 +249,71 @@
 *
 */
 
-kukit.er.EventInstanceRegistry = function () {
+kukit.er.BinderInstanceRegistry = function () {
     this.content = {};
 };
 
-kukit.er.EventInstanceRegistry.prototype.getOrCreateEvent = function (id, classname, namespace) {
+kukit.er.BinderInstanceRegistry.prototype.getOrCreateBinder = function (id, classname, namespace) {
     // Get or create the event.
-    var eventinstance = this.content[id];
-    if (typeof(eventinstance) == 'undefined') {
+    var binderinstance = this.content[id];
+    if (typeof(binderinstance) == '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))();
+        binderinstance = 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) {
+        binderinstance.__binder_id__ = id;
+        binderinstance.__binder_classname__ = classname;
+        binderinstance.__event_namespace__ = namespace;
+        binderinstance.__event_rules__ = [];
+    } else if (binderinstance.__binder_classname__ != classname) {
         // just paranoia
-        throw 'Conflicting class for event id "' + id + '", "' + eventinstance.__event_classname__
+        throw 'Conflicting class for event id "' + id + '", "' + binderinstance.__binder_classname__
                 + '" != "' + classname + '"';
     }
-    return eventinstance;
+    return binderinstance;
 };
 
-kukit.er.EventInstanceRegistry.prototype.markBinding = function (eventinstance, node, eventrule) {
+kukit.er.BinderInstanceRegistry.prototype.markBinding = function (oper) {
     // Marks that the instance was bound to this rule
-    var name = eventrule.kss_selector.name;
-    rules_already_bound = eventinstance.__event_rules__[name];
+    var name = oper.eventrule.kss_selector.name;
+    rules_already_bound = oper.binderinstance.__event_rules__[name];
     if (typeof(rules_already_bound) == 'undefined') {
         // Create an empty list.
-        rules_already_bound = eventinstance.__event_rules__[name] = [];
+        rules_already_bound = oper.binderinstance.__event_rules__[name] = [];
     }
-    var item = {'eventrule': eventrule, 'node': node};
-    rules_already_bound.push(item);
+    rules_already_bound.push(oper);
 };
 
-kukit.er.EventInstanceRegistry.prototype.getBinding = function (eventinstance, name) {
+kukit.er.BinderInstanceRegistry.prototype.getBinding = function (binderinstance, 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') {
+    var opers = binderinstance.__event_rules__[name];
+    if (typeof(opers) == 'undefined') {
         // Create an empty list.
-        items = eventinstance.__event_rules__[name] = [];
+        opers = binderinstance.__event_rules__[name] = [];
     }
     // Return it
-    return items;
+    return opers;
 };
 
-kukit.er.EventInstanceRegistry.prototype.getEventById = function (id) {
+kukit.er.BinderInstanceRegistry.prototype.getBinderById = function (id) {
     // Get an event.
-    var eventinstance = this.content[id];
-    if (typeof(eventinstance) == 'undefined') {
+    var binderinstance = this.content[id];
+    if (typeof(binderinstance) == 'undefined') {
         throw 'Event with id "' + id + '" not found.'
     }
-    return eventinstance;
+    return binderinstance;
 };
 
-kukit.er.EventInstanceRegistry.prototype.getSingletonEventByName = function (namespace, name) {
+kukit.er.BinderInstanceRegistry.prototype.getSingletonBinderByName = function (namespace, name) {
     //Get classname
-    var classname = eventRegistry.prototype.get(namespace, name).classname;
+    var classname = kukit.er.eventRegistry.get(namespace, name).classname;
     // Get an event.
     var id = kukit.rd.makeId(namespace, classname);
-    var eventinstance = this.content[id];
-    if (typeof(eventinstance) == 'undefined') {
+    var binderinstance = this.content[id];
+    if (typeof(binderinstance) == 'undefined') {
         throw 'Singleton event with namespace "' + namespace + '" and (event) name "' + name + '" not found.'
     }
-    return eventinstance;
+    return binderinstance;
 };
 
-kukit.er.eventInstanceRegistry = new kukit.er.EventInstanceRegistry();
+kukit.er.binderInstanceRegistry = new kukit.er.BinderInstanceRegistry();

Modified: kukit/kukit.js/trunk/kukit/kukit.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kukit.js	(original)
+++ kukit/kukit.js/trunk/kukit/kukit.js	Fri Aug 25 12:52:13 2006
@@ -179,7 +179,7 @@
     var encoded = query.encode();
     // sending form
     var ts = new Date().getTime();
-    kukit.logDebug('TS: '+ts);
+    //kukit.logDebug('TS: '+ts);
     var tsurl = url + "?kukitTimeStamp=" + ts;
     domDoc.open("POST", tsurl, true);
     domDoc.onreadystatechange = notifyServer_done;
@@ -307,19 +307,23 @@
     this.commands[this.commands.length] = command;
 };
 
-kukit.CommandProcessor.prototype.executeCommands = function(backparms) {
-    // node, eventrule, eventinstance are given on backparms, in case
+kukit.CommandProcessor.prototype.executeCommands = function(oper) {
+    // node, eventrule, binderinstance are given on oper, in case
     // the command was called up from an event
-    if (typeof(backparms) == 'undefined' || backparms == null) {
-        backparms = {'node': null, 'eventrule': null, 'eventinstance': null};
+    if (typeof(oper) == 'undefined' || oper == null) {
+        oper = new kukit.op.Oper();
     }
     var commands = this.commands;
     for (var y=0;y < commands.length;y++) {
         var command = commands[y];
+        var newoper = new kukit.op.Oper();
+        // XXX TODO change from command.params to parms
+        newoper.parms = command.params;
+        newoper.eventrule = oper.eventrule;
+        newoper.binderinstance = oper.binderinstance;
+        newoper.orignode = oper.node;
         try {
-            // XXX TODO change from command.params to parms
-            command.execute(null, command.params, backparms.eventrule, 
-                backparms.eventinstance, backparms.node);
+            command.execute(newoper); 
         } catch (e) {
             // augment the error message
             throw new kukit.CommandExecutionError(e, command); 

Added: kukit/kukit.js/trunk/kukit/oper.js
==============================================================================
--- (empty file)
+++ kukit/kukit.js/trunk/kukit/oper.js	Fri Aug 25 12:52:13 2006
@@ -0,0 +1,151 @@
+/*
+* Copyright (c) 2006
+* Authors:
+*   Godefroid Chapelle <gotcha at bubblenet.be>
+*   Florian Schulze <florian.schulze at gmx.net>
+*   Bal?zs Re? <ree at greenfinity.hu>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as published
+* by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+* 02111-1307, USA.
+*/
+
+
+/* Operation object
+*
+*  This is a single parameter that contains a collection
+*  of operation objects to pass by, at various
+*  operations.
+*
+*  Node and parms are the one to be accessed really, but the rest
+*  is also accessible to read for special event implementations.
+*
+*
+*  The members are:
+*
+*  node: the node in focus, to which the event triggered
+*
+*  parms: a dictionary that holds the parameters to the function.
+*      All parameters are named ones.
+*
+*  eventrule: The eventrule associated by the trigger.
+*
+*  binderinstance: The event binder instance that holds the event state
+*       and on which all events are executed.
+*
+*  orignode: in case when a command has returned from a server action, 
+*      this holds the original node that triggered the event first.
+*
+*  browserevent: the original browser event.
+*
+*/
+
+kukit.op = {};
+
+kukit.op.Oper = function () {
+    this.node = null;
+    this.parms = {};
+    this.eventrule = null;
+    this.binderinstance = null;
+    this.orignode = null;
+    this.browserevent = null;
+};
+
+kukit.op.Oper.prototype.update = function(dict) {
+    if (typeof(dict) == 'undefined') {
+        dict = {};
+    }
+    for (var key in dict) {
+        if (key == 'node' || key == 'parms' || key == 'eventrule' 
+                || key == 'binderinstance' || key == 'orignode') {
+            throw 'Illegal update on oper object, protected attribute "' + key + '"';
+        }
+        this[key] = dict[key];
+    }
+};
+
+kukit.op.Oper.prototype.logDebug = function() {
+    var result = [];
+    for (var key in this){
+        if (key == 'parms') {
+            var res2 = [];
+            for (var k2 in this.parms){
+                res2.push(k2 + '="' + this.parms[k2] + '"');
+            }
+            result.push('parms={' + res2.join(',') + '}');
+        } else if (typeof(kukit.op.Oper.prototype[key]) == 'undefined') {
+            result.push(key + '=' + this[key]);
+        }
+    }
+    kukit.logDebug('Oper contents: ' + result.join(', '));
+};
+
+kukit.op.Oper.prototype.executeClientAction = function(name) {
+    var func = kukit.ar.actionRegistry.get(name);
+    func(this);
+};
+
+kukit.op.Oper.prototype.executeServerAction = function(name) {
+    var action = kukit.calculateAbsoluteURL(name);
+    // oper will be accessible to some commands that execute in return
+    kukit.notifyServer(action, this.parms, this);
+};
+
+/* Utility for parameter checking */
+
+kukit.op.Oper.prototype.completeParms = function(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: oper.completeParms(['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];
+        if (typeof(this.parms[next]) == 'undefined') {
+            throw 'Missing mandatory parameter "' + next + '" in ' + errname;
+        }
+        newparms[next] = this.parms[next];
+    }
+    for (var key in defaults){
+        var val = this.parms[key];
+        if (typeof(val) == 'undefined') {
+            newparms[key] = defaults[key];
+        } else {
+            newparms[key] = val;
+        }
+    }
+    for (var key in this.parms){
+        if (typeof(newparms[key]) == 'undefined') {
+            if (allow_excess) {
+                newparms[key] = this.parms[key];
+            } else {
+                throw 'Excess parameter "' + key + '" in ' + errname;
+            }
+        }
+    }
+    this.parms = newparms;
+};
+
+kukit.op.Oper.prototype.evalBool = function(key, errname) {
+    var value = this.parms[key];
+    this.parms[key] = kukit.ut.evalBool(value, 'for key "' + key + '" in ' + errname);
+};
+
+kukit.op.Oper.prototype.evalInt = function(key, errname) {
+    var value = this.parms[key];
+    this.parms[key] = kukit.ut.evalInt(value, 'for key "' + key + '" in ' + errname);
+};
+

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Fri Aug 25 12:52:13 2006
@@ -24,56 +24,6 @@
 
 kukit.pl = {};
 
-/* Utility for parameter checking */
-
-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];
-        if (typeof(parms[next]) == 'undefined') {
-            throw 'Missing mandatory parameter "' + next + '" in ' + errname;
-        }
-        newparms[next] = parms[next];
-    }
-    for (var key in defaults){
-        var val = parms[key];
-        if (typeof(val) == 'undefined') {
-            newparms[key] = defaults[key];
-        } else {
-            newparms[key] = val;
-        }
-    }
-    for (var key in parms){
-        if (typeof(newparms[key]) == 'undefined') {
-            if (allow_excess) {
-                newparms[key] = parms[key];
-            } else {
-                throw 'Excess parameter "' + key + '" in ' + errname;
-            }
-        }
-    }
-    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 
 * 
@@ -113,25 +63,25 @@
 kukit.pl.NativeEventBinder = function() {
 };
 
-kukit.pl.NativeEventBinder.prototype.__bind__node = function(name, parms, func_to_bind, node) {
-    if (node == null) {
+kukit.pl.NativeEventBinder.prototype.__bind__node = function(name, func_to_bind, oper) {
+    if (oper.node == null) {
         throw 'Native event must be bound to a node.';
     }
-    this.__bind__(name, parms, func_to_bind, node);
+    this.__bind__(name, func_to_bind, oper);
 };
 
-kukit.pl.NativeEventBinder.prototype.__bind__nodeorwindow = function(name, parms, func_to_bind, node) {
-    if (node == null) {
-        node = window;
+kukit.pl.NativeEventBinder.prototype.__bind__nodeorwindow = function(name, func_to_bind, oper) {
+    if (oper.node == null) {
+        oper.node = window;
     }
-    this.__bind__(name, parms, func_to_bind, node);
+    this.__bind__(name, func_to_bind, oper);
 };
 
-kukit.pl.NativeEventBinder.prototype.__bind__nodeordocument = function(name, parms, func_to_bind, node) {
-    if (node == null) {
-        node = document;
+kukit.pl.NativeEventBinder.prototype.__bind__nodeordocument = function(name, func_to_bind, oper) {
+    if (oper.node == null) {
+        oper.node = document;
     }
-    this.__bind__(name, parms, func_to_bind, node);
+    this.__bind__(name, func_to_bind, oper);
 };
 
 // Sigh. We need this.
@@ -139,22 +89,23 @@
     kukit.pl.have_Safari = navigator.vendor && navigator.vendor.indexOf('Apple') != -1;
 } catch (e) {}
 
-kukit.pl.NativeEventBinder.prototype.__bind__ = function(name, parms, func_to_bind, node) {
-    parms = kukit.pl.completeParms(parms, [], {'preventdefault': '', 'allowbubbling': ''}, 'native event binding');
-    kukit.pl.evalBool(parms, 'preventdefault', 'native event binding');
-    kukit.pl.evalBool(parms, 'allowbubbling', 'native event binding');
-    if (parms.preventdefault) {
+kukit.pl.NativeEventBinder.prototype.__bind__ = function(name, func_to_bind, oper) {
+    oper.completeParms([], {'preventdefault': '', 'allowbubbling': ''}, 'native event binding');
+    oper.evalBool('preventdefault', 'native event binding');
+    oper.evalBool('allowbubbling', 'native event binding');
+    if (oper.parms.preventdefault) {
         if (name != 'click') {
             throw 'In native events only the click event can have preventdefault.';
         }
     }
-    var allowbubbling = parms.allowbubbling;
-    var preventdefault = parms.preventdefault;
+    var allowbubbling = oper.parms.allowbubbling;
+    var preventdefault = oper.parms.preventdefault;
+    var node = oper.node;
     var func = function(e) {
         target = kukit.pl.getTargetForBrowserEvent(e);
         if (allowbubbling || target == node) {
-            // Execute the action
-            func_to_bind();
+            // Execute the action, provide browserevent on oper
+            func_to_bind({'browserevent': e});
             // Cancel default event ?
             if (preventdefault) {
                 // W3C style
@@ -172,8 +123,8 @@
     // necessary since Safari does not prevent the <a href...> following
     // (in case of allowbubbling we have to apply it to all clicks, as there
     // might be a link inside that we cannot detect on the current node)
-    if (parms.preventdefault && kukit.pl.have_Safari 
-            && (parms.allowbubbling || name == 'click' && node.tagName.toLowerCase() == 'a')) {
+    if (preventdefault && kukit.pl.have_Safari 
+            && (allowbubbling || name == 'click' && node.tagName.toLowerCase() == 'a')) {
         function cancelClickSafari() {
             return false;
         }
@@ -249,17 +200,17 @@
     this.counters = {};
 };
 
-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();
+kukit.pl.TimeoutEventBinder.prototype.__bind__ = function(name, func_to_bind, oper) {
+    oper.completeParms(['delay'], {}, 'timeout event binding');
+    var key = oper.eventrule.getNr();
     if (this.counters[key]) {
         // Don't bind the counter if we matched this eventrule already
         kukit.logDebug('timer event key ignored for actionEvent #' + key + ' ' 
-            + eventrule.selector);
+            + oper.eventrule.selector);
     } else {   
         kukit.logDebug('timer event key entered for actionEvent #' + key + ' ' 
-            + eventrule.selector);
-        var counter = new kukit.pl.TimerCounter(parms.delay, func_to_bind, true) 
+            + oper.eventrule.selector);
+        var counter = new kukit.pl.TimerCounter(oper.parms.delay, func_to_bind, true) 
         this.counters[key] = counter;
         // Start the counter
         counter.start();
@@ -271,25 +222,25 @@
 kukit.pl.LoadEventBinder = function() {
 };
 
-kukit.pl.LoadEventBinder.prototype.__bind__ = function(name, parms, func_to_bind, node, eventrule) {
-    parms = kukit.pl.completeParms(parms, [], {'initial': 'true', 'insert': 'true'}, 'load event binding');
-    kukit.pl.evalBool(parms, 'initial', 'load event binding');
-    kukit.pl.evalBool(parms, 'insert', 'load event binding');
+kukit.pl.LoadEventBinder.prototype.__bind__ = function(name, func_to_bind, oper) {
+    oper.completeParms([], {'initial': 'true', 'insert': 'true'}, 'load event binding');
+    oper.evalBool('initial', 'load event binding');
+    oper.evalBool('insert', 'load event binding');
     // Bind the function to the onload event of the node.
     // If this is an iframe node, we have the possibility
     // to wait until the execution totally finishes, so we load the real load event.
     // node._kukitmark contains the binding phase.
-    var phase = node._kukitmark;
-    if (phase == 1 && ! parms.initial) {
-        kukit.logDebug('EventRule #' + eventrule.getNr() + ' mergeid ' + eventrule.kss_selector.mergeid + 'event ignored, oninitial=false.');
+    var phase = oper.node._kukitmark;
+    if (phase == 1 && ! oper.parms.initial) {
+        kukit.logDebug('EventRule #' + oper.eventrule.getNr() + ' mergeid ' + oper.eventrule.kss_selector.mergeid + 'event ignored, oninitial=false.');
         return;
     }
-    if (phase == 2 && ! parms.insert) {
-        kukit.logDebug('EventRule #' + eventrule.getNr() + ' mergeid ' + eventrule.kss_selector.mergeid + ' event ignored, oninsert=false.');
+    if (phase == 2 && ! oper.parms.insert) {
+        kukit.logDebug('EventRule #' + oper.eventrule.getNr() + ' mergeid ' + oper.eventrule.kss_selector.mergeid + ' event ignored, oninsert=false.');
         return;
     }
-    if (node != null && node.tagName.toLowerCase() == 'iframe' && phase == 2) {
-        kukit.logDebug('EventRule #' + eventrule.getNr() + ' mergeid ' + eventrule.kss_selector.mergeid + ' event selected delayed execution.');
+    if (oper.node != null && oper.node.tagName.toLowerCase() == 'iframe' && phase == 2) {
+        kukit.logDebug('EventRule #' + oper.eventrule.getNr() + ' mergeid ' + oper.eventrule.kss_selector.mergeid + ' event selected delayed execution.');
         // This is really crap. We have no way to wait until the frame hase
         // loaded, the only workaround is to wait. This works or not.
         // XXX How could we do this in a solid way?
@@ -314,35 +265,38 @@
 * They also get registered as commands
 */
 
-kukit.ar.actionRegistry.register("logDebug", function (node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, [], {'message': 'Logging from Event'}, 'logDebug action');
+kukit.ar.actionRegistry.register("logDebug", function (oper) {
+    oper.completeParms([], {'message': 'Logging from Event'}, 'logDebug action');
+    var node = oper.node;
     var nodeName = '<DOCUMENT>';
     if (node != null) {
         nodeName = node.nodeName;
     }
-    kukit.logDebug(parms.message + ', rule=#' + eventrule.getNr() + ', node=' + nodeName); 
+    kukit.logDebug(oper.parms.message + ', rule=#' + oper.eventrule.getNr() + ', node=' + nodeName); 
     }
 );
 kukit.cr.commandRegistry.registerFromAction('logDebug', kukit.cr.makeGlobalCommand);
 
-kukit.ar.actionRegistry.register("log", function (node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, [], {'message': 'Logging from Event'}, 'log action');
+kukit.ar.actionRegistry.register("log", function (oper) {
+    oper.completeParms([], {'message': 'Logging from Event'}, 'log action');
+    var node = oper.node;
     var nodeName = '<DOCUMENT>';
     if (node != null) {
         nodeName = node.nodeName;
     }
-    kukit.log(parms.message + ', rule=#' + eventrule.getNr() + ', node=' + nodeName); 
+    kukit.log(oper.parms.message + ', rule=#' + oper.eventrule.getNr() + ', node=' + nodeName); 
     }
 );
 kukit.cr.commandRegistry.registerFromAction('log', kukit.cr.makeGlobalCommand);
 
-kukit.ar.actionRegistry.register("alert", function (node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, [], {'message': 'Logging from Event'}, 'alert action');
+kukit.ar.actionRegistry.register("alert", function (oper) {
+    oper.completeParms([], {'message': 'Logging from Event'}, 'alert action');
+    var node = oper.node;
     var nodeName = '<DOCUMENT>';
     if (node != null) {
         nodeName = node.nodeName;
     }
-    alert(parms.message + ', rule=#' + eventrule.getNr() + ', node=' + nodeName); 
+    alert(oper.parms.message + ', rule=#' + oper.eventrule.getNr() + ', node=' + nodeName); 
     }
 );
 kukit.cr.commandRegistry.registerFromAction('alert', kukit.cr.makeGlobalCommand);
@@ -353,25 +307,27 @@
 */
 
 // accepts both string and dom.
-kukit.ar.actionRegistry.register('replaceInnerHTML', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, ['html'], {}, 'replaceInnerHTML action');
+kukit.ar.actionRegistry.register('replaceInnerHTML', function(oper) {
+    oper.completeParms(['html'], {}, 'replaceInnerHTML action');
+    var node = oper.node;
     var inserted;
-    if (typeof(parms.html) == 'string') {
-        node.innerHTML = parms.html;
+    if (typeof(oper.parms.html) == 'string') {
+        node.innerHTML = oper.parms.html;
         inserted = node.childNodes; 
     } else {
-        parms.html = kukit.dom.forceToDom(parms.html);
+        oper.parms.html = kukit.dom.forceToDom(oper.parms.html);
         kukit.dom.clearChildNodes(node);
-        inserted = kukit.dom.appendChildren(parms.html.childNodes, node);
+        inserted = kukit.dom.appendChildren(oper.parms.html.childNodes, node);
     }
     kukit.setupEvents(inserted);
 });
 kukit.cr.commandRegistry.registerFromAction('replaceInnerHTML', kukit.cr.makeSelectorCommand);
 
-kukit.ar.actionRegistry.register('replaceHTML', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, ['html'], {}, 'replaceHTML action');
-    parms.html = kukit.dom.forceToDom(parms.html);
-    var elements = parms.html.childNodes;
+kukit.ar.actionRegistry.register('replaceHTML', function(oper) {
+    oper.completeParms(['html'], {}, 'replaceHTML action');
+    var node = oper.node;
+    oper.parms.html = kukit.dom.forceToDom(oper.parms.html);
+    var elements = oper.parms.html.childNodes;
     var length = elements.length;
     if (length > 0) {
         var parentNode = node.parentNode;
@@ -390,33 +346,33 @@
 });
 kukit.cr.commandRegistry.registerFromAction('replaceHTML', kukit.cr.makeSelectorCommand);
 
-kukit.ar.actionRegistry.register('setAttribute', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, ['name', 'value'], {}, 'setAttribute action');
-    if (parms.name.toLowerCase() == 'style') {
+kukit.ar.actionRegistry.register('setAttribute', function(oper) {
+    oper.completeParms(['name', 'value'], {}, 'setAttribute action');
+    if (oper.parms.name.toLowerCase() == 'style') {
         throw 'Style attribute is not allowed with setAttribute';
     }
-    kukit.dom.setAttribute(node, parms.name, parms.value);
+    kukit.dom.setAttribute(oper.node, oper.parms.name, oper.parms.value);
 });
 kukit.cr.commandRegistry.registerFromAction('setAttribute', kukit.cr.makeSelectorCommand);
 
-kukit.ar.actionRegistry.register('setKssAttribute', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, ['name', 'value'], {}, 'setKssAttribute action');
-    kukit.dom.setKssAttribute(node, parms.name, parms.value);
+kukit.ar.actionRegistry.register('setKssAttribute', function(oper) {
+    oper.completeParms(['name', 'value'], {}, 'setKssAttribute action');
+    kukit.dom.setKssAttribute(oper.node, oper.parms.name, oper.parms.value);
 });
 kukit.cr.commandRegistry.registerFromAction('setKssAttribute', kukit.cr.makeSelectorCommand);
 
-kukit.ar.actionRegistry.register('setStyle', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, ['name', 'value'], {}, 'setStyle action');
-    node.style[parms.name] = parms.value;
+kukit.ar.actionRegistry.register('setStyle', function(oper) {
+    oper.completeParms(['name', 'value'], {}, 'setStyle action');
+    oper.node.style[oper.parms.name] = oper.parms.value;
 });
 kukit.cr.commandRegistry.registerFromAction('setStyle', kukit.cr.makeSelectorCommand);
 
-kukit.ar.actionRegistry.register('insertHTMLAfter', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, ['html'], {}, 'insertHTMLAfter action');
-    parms.html = kukit.dom.forceToDom(parms.html);
-    var content = document.importNode(parms.html, true);
-    var parentNode = node.parentNode;
-    var toNode = kukit.dom.getNextSiblingTag(node);
+kukit.ar.actionRegistry.register('insertHTMLAfter', function(oper) {
+    oper.completeParms(['html'], {}, 'insertHTMLAfter action');
+    oper.parms.html = kukit.dom.forceToDom(oper.parms.html);
+    var content = document.importNode(oper.parms.html, true);
+    var parentNode = oper.node.parentNode;
+    var toNode = kukit.dom.getNextSiblingTag(oper.node);
     var inserted;
     if (toNode == null) {
         inserted = kukit.dom.appendChildren(content.childNodes, parentNode);
@@ -429,45 +385,44 @@
 });
 kukit.cr.commandRegistry.registerFromAction('insertHTMLAfter', kukit.cr.makeSelectorCommand);
 
-kukit.ar.actionRegistry.register('deleteNodeAfter', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, [], {}, 'deleteNodeAfter action');
-    var parentNode = node.parentNode;
-    var toNode = kukit.dom.getNextSiblingTag(node);
+kukit.ar.actionRegistry.register('deleteNodeAfter', function(oper) {
+    oper.completeParms([], {}, 'deleteNodeAfter action');
+    var parentNode = oper.node.parentNode;
+    var toNode = kukit.dom.getNextSiblingTag(oper.node);
     if (toNode != null) {
         parentNode.removeChild(toNode);
     }  
 });
 kukit.cr.commandRegistry.registerFromAction('deleteNodeAfter', kukit.cr.makeSelectorCommand);
 
-kukit.ar.actionRegistry.register('deleteNodeBefore', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, [], {}, 'deleteNodeBefore action');
-    var parentNode = node.parentNode;
-    var toNode = kukit.dom.getPreviousSiblingTag(node);
+kukit.ar.actionRegistry.register('deleteNodeBefore', function(oper) {
+    oper.completeParms([], {}, 'deleteNodeBefore action');
+    var parentNode = oper.node.parentNode;
+    var toNode = kukit.dom.getPreviousSiblingTag(oper.node);
     parentNode.removeChild(toNode);
 });
 kukit.cr.commandRegistry.registerFromAction('deleteNodeBefore', kukit.cr.makeSelectorCommand);
 
-kukit.ar.actionRegistry.register('deleteNode', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, [], {}, 'deleteNode action');
-    var parentNode = node.parentNode;
-    parentNode.removeChild(node);
+kukit.ar.actionRegistry.register('deleteNode', function(oper) {
+    oper.completeParms([], {}, 'deleteNode action');
+    var parentNode = oper.node.parentNode;
+    parentNode.removeChild(oper.node);
 });
 kukit.cr.commandRegistry.registerFromAction('deleteNode', kukit.cr.makeSelectorCommand);
 
-kukit.ar.actionRegistry.register('clearChildNodes', function(node, parms, eventrule) {
+kukit.ar.actionRegistry.register('clearChildNodes', function(oper) {
     // TODO get rid of none
-    parms = kukit.pl.completeParms(parms, [], {'none': false}, 'clearChildNodes action');
-    kukit.dom.clearChildNodes(node);
+    oper.completeParms([], {'none': false}, 'clearChildNodes action');
+    kukit.dom.clearChildNodes(oper.node);
 });
 kukit.cr.commandRegistry.registerFromAction('clearChildNodes', kukit.cr.makeSelectorCommand);
 
-kukit.ar.actionRegistry.register('moveNodeAfter', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, ['html_id'], {}, 'moveNodeAfter action');
+kukit.ar.actionRegistry.register('moveNodeAfter', function(oper) {
+    oper.completeParms(['html_id'], {}, 'moveNodeAfter action');
+    var node = oper.node;
     var parentNode = node.parentNode;
     parentNode.removeChild(node);
-      
-    var toNode = document.getElementById(parms.html_id);
-      
+    var toNode = document.getElementById(oper.parms.html_id);
     var nextNode = kukit.dom.getNextSiblingTag(toNode);
     if (nextNode == null) {
         toNode.parentNode.appendChild(node);
@@ -477,40 +432,42 @@
 });
 kukit.cr.commandRegistry.registerFromAction('moveNodeAfter', kukit.cr.makeSelectorCommand);
 
-kukit.ar.actionRegistry.register('copyChildNodesFrom', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, ['html_id'], {}, 'copyChildNodesFrom action');
-    var fromNode = document.getElementById(parms.html_id);
-    Sarissa.copyChildNodes(fromNode, node);
+kukit.ar.actionRegistry.register('copyChildNodesFrom', function(oper) {
+    oper.completeParms(['html_id'], {}, 'copyChildNodesFrom action');
+    var fromNode = document.getElementById(oper.parms.html_id);
+    Sarissa.copyChildNodes(fromNode, oper.node);
 });
 kukit.cr.commandRegistry.registerFromAction('copyChildNodesFrom', kukit.cr.makeSelectorCommand);
 
-kukit.ar.actionRegistry.register('copyChildNodesTo', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, ['html_id'], {}, 'copyChildNodesTo action');
-    toNode = document.getElementById(parms.html_id);
-    Sarissa.copyChildNodes(node, toNode);
+kukit.ar.actionRegistry.register('copyChildNodesTo', function(oper) {
+    oper.completeParms(['html_id'], {}, 'copyChildNodesTo action');
+    toNode = document.getElementById(oper.parms.html_id);
+    Sarissa.copyChildNodes(oper.node, toNode)
 });
 kukit.cr.commandRegistry.registerFromAction('copyChildNodesTo', kukit.cr.makeSelectorCommand);
 
-kukit.ar.actionRegistry.register('setStateVar', function(node, parms, eventrule) {
-    parms = kukit.pl.completeParms(parms, ['varname', 'value'], {}, 'setStateVar action');
-    kukit.statevars[parms.varname] = parms.value;
+kukit.ar.actionRegistry.register('setStateVar', function(oper) {
+    oper.completeParms(['varname', 'value'], {}, 'setStateVar action');
+    kukit.statevars[oper.parms.varname] = oper.parms.value;
 });
 kukit.cr.commandRegistry.registerFromAction('setStateVar', kukit.cr.makeGlobalCommand);
 
-kukit.ar.actionRegistry.register('triggerEvent', function(node, parms, eventrule, eventinstance) {
+kukit.ar.actionRegistry.register('triggerEvent', function(oper) {
     // allows excess parms in the following check.
-    parms = kukit.pl.completeParms(parms, ['name'], {'id': null, 'namespace': null}, 'triggerEvent action', true);
+    oper.completeParms(['name'], {'id': null, 'namespace': null}, 'triggerEvent action', true);
+    var parms = oper.parms;
+    var binderinstance = oper.binderinstance;
     if (parms.id) {
         // by id
-        eventinstance = kukit.er.eventInstanceRegistry.getEventById(parms.id);
+        binderinstance = kukit.er.binderInstanceRegistry.getBinderById(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 triggerEvent action, rule=#' + eventrule.getNr() + ', node=' + node.nodeName; 
+        if (parms.namespace != null && parms.namespace != binderinstance.__event_namespace__) {
+            throw 'Id and namespace are conflicting in triggerEvent action, rule=#' + oper.eventrule.getNr() + ', node=' + oper.node.nodeName; 
         }
     } else {
-        if (eventinstance == null) {
+        if (binderinstance == null) {
             // singleton by class
-            eventinstance = kukit.er.eventInstanceRegistry.getSingletonEventByName(parms.namespace, parms.name);
+            binderinstance = kukit.er.binderInstanceRegistry.getSingletonBinderByName(parms.namespace, parms.name);
         }
     }
     // marshall it, the rest of the parms will be passed
@@ -520,7 +477,7 @@
             actionparms[key] = parms[key];
         }
     }
-    eventinstance.__trigger_event__(parms.name, actionparms, node);
+    binderinstance.__trigger_event__(parms.name, actionparms, oper.node);
 });
 kukit.cr.commandRegistry.registerFromAction('triggerEvent', kukit.cr.makeGlobalCommand);
 

Modified: kukit/kukit.js/trunk/kukit/resourcedata.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/resourcedata.js	(original)
+++ kukit/kukit.js/trunk/kukit/resourcedata.js	Fri Aug 25 12:52:13 2006
@@ -189,7 +189,7 @@
             var argname =  this.args[0];
             var recurseParents = false;
             if (this.args.length == 2) {
-                kukit.pl.evalBool(this.args, 1, '2nd attribute of nodeAttr must be a boolean');
+                kukit.ut.evalBool(this.args[1], '2nd attribute of nodeAttr must be a boolean');
                 recurseParents = this.args[1];
             }
             var value = kukit.dom.getRecursiveAttribute(node, argname, recurseParents, kukit.dom.getAttribute);
@@ -199,7 +199,7 @@
             var argname =  this.args[0];
             var recurseParents = false;
             if (this.args.length == 2) {
-                kukit.pl.evalBool(this.args, 1, '2nd attribute of kssAttr must be a boolean');
+                kukit.ut.evalBool(this.args[1], '2nd attribute of kssAttr must be a boolean');
                 recurseParents = this.args[1];
             }
             var value = kukit.dom.getRecursiveAttribute(node, argname, recurseParents, kukit.dom.getKssAttribute);
@@ -297,9 +297,9 @@
     }
 };
 
-kukit.rd.EventRule.prototype.getEventInstance = function() {
+kukit.rd.EventRule.prototype.getBinderInstance = function() {
     // Gets the event instance for the rule.
-    return kukit.er.eventInstanceRegistry.getOrCreateEvent(this.kss_selector.id, this.kss_selector.classname, 
+    return kukit.er.binderInstanceRegistry.getOrCreateBinder(this.kss_selector.id, this.kss_selector.classname, 
         this.kss_selector.namespace);
 };
 
@@ -315,26 +315,36 @@
 */
 
 kukit.rd.EventRule.prototype.bind = function(node) {
-    var eventinstance = this.getEventInstance();
+    var oper = new kukit.op.Oper()
+    oper.node = node;
+    oper.binderinstance = this.getBinderInstance();
+    oper.eventrule = this;
+    oper.parms = {};
     var namespace = this.kss_selector.namespace;
     var name = this.kss_selector.name;
-    var parms = this.parms;
     var methodname = kukit.er.eventRegistry.get(namespace, name).bindmethodname
     if (! methodname) {
         throw 'Could not bind event name "' + name + '" on namespace "' + namespace + '", because the method is not defined as bindable.';
         }
-    var method = eventinstance[methodname];
+    var method = oper.binderinstance[methodname];
     if (! method) {
         throw 'Could not bind event name "' + name + '" on namespace "' + namespace + '", because the method "' + methodname + '" does not exist.';
         }
-    var self = this;
-    var func_to_bind = function() {
-        eventinstance._EventBinder_triggerevent(name, {}, node, self);
+    var func_to_bind = function(dict) {
+        oper.update(dict);
+        //oper.logDebug();
+        oper.binderinstance._EventBinder_triggerevent(name, oper);
     }
     // do the binding    
-    method.call(eventinstance, name, parms, func_to_bind, node, this);
+    var bindoper = new kukit.op.Oper()
+    bindoper.node = node;
+    bindoper.binderinstance = oper.binderinstance;
+    bindoper.eventrule = this;
+    bindoper.parms = this.parms;
+    method.call(bindoper.binderinstance, name, func_to_bind, bindoper);
     // mark on the instance as bound
-    kukit.er.eventInstanceRegistry.markBinding(eventinstance, node, this);
+    // XXX XXX oper!
+    kukit.er.binderInstanceRegistry.markBinding(oper);
 };
 
 
@@ -419,18 +429,18 @@
     }
 };
 
-kukit.rd.ActionSet.prototype.execute = function(node, eventrule, defaultparms, eventinstance) {
+kukit.rd.ActionSet.prototype.execute = function(oper) {
     for (var key in this.content) {
         var action = this.content[key];
-        action.execute(node, eventrule, defaultparms, eventinstance);
+        action.execute(oper);
     }
     // 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);
+        var namespace = oper.eventrule.kss_selector.namespace;
+        var name = oper.eventrule.kss_selector.name;
+        oper.binderinstance._EventBinder_calldefault(namespace, name, oper);
     }
 };
 
@@ -493,47 +503,17 @@
     return parms;
 };
 
-
-kukit.rd.executeClientAction = function(name, node, eventrule, parms, eventinstance) {
-    var func = kukit.ar.actionRegistry.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);
+kukit.rd.Action.prototype.execute = function(oper) {
+    oper.parms = this.getParms(oper.node, oper.parms);
     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);
+        var namespace = oper.eventrule.kss_selector.namespace;
+        var name = oper.eventrule.kss_selector.name;
+        oper.binderinstance._EventBinder_calldefault(namespace, name, oper);
     } else if (this.isRemote) {
-        kukit.rd.executeServerAction(this.name, node, eventrule, parms, eventinstance);
+        oper.executeServerAction(this.name);
     } else {
-        kukit.rd.executeClientAction(this.name, node, eventrule, parms, eventinstance);
+        oper.executeClientAction(this.name);
     }
 };
 
@@ -630,7 +610,7 @@
     eventrule.mergeIntoDict(dict, eventrule.kss_selector.mergeid, eventrule);
 };
 
-kukit.rd.MethodTable.prototype.getMergedRule = function(category, name, eventinstance) {
+kukit.rd.MethodTable.prototype.getMergedRule = function(category, name, binderinstance) {
     // Returns the rule for a given event instance, 
     // Get the entry by category (= document or behaviour)
     var dict = this.content[category];
@@ -638,8 +618,8 @@
         throw 'Unknown method rule category "' + category + '"';
     }
     // look up the rule
-    var namespace = eventinstance.__event_namespace__;
-    var id = eventinstance.__event_id__;
+    var namespace = binderinstance.__event_namespace__;
+    var id = binderinstance.__binder_id__;
     var mergeid = kukit.rd.makeMergeId(id, namespace, name);
     var mergedrule = dict[mergeid];
     if (typeof(mergedrule) == 'undefined') {

Modified: kukit/kukit.js/trunk/kukit/utils.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/utils.js	(original)
+++ kukit/kukit.js/trunk/kukit/utils.js	Fri Aug 25 12:52:13 2006
@@ -178,3 +178,23 @@
     return this.elements[0];
 };
 
+kukit.ut.evalBool = function(value, errname) {
+    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 + '" ' + errname;
+    }
+    return value;
+};
+
+kukit.ut.evalInt = function(value, errname) {
+    try {
+        value = parseInt(value);
+    } catch(e) {
+        throw 'Bad integer value "' + value + '" ' + errname;
+    }
+    return value;
+};
+

Modified: kukit/kukit.js/trunk/tests/runner.html
==============================================================================
--- kukit/kukit.js/trunk/tests/runner.html	(original)
+++ kukit/kukit.js/trunk/tests/runner.html	Fri Aug 25 12:52:13 2006
@@ -16,6 +16,8 @@
         <script type="text/javascript" src="ecmaunit.js"> </script>
         <script type="text/javascript" src="unittestUtilities.js"> </script>
         <script type="text/javascript" src="../kukit/utils.js"> </script>
+        <script type="text/javascript" src="../kukit/oper.js"> </script>
+        <script type="text/javascript" src="../kukit/requestmanager.js"> </script>
         <script type="text/javascript" src="../kukit/requestmanager.js"> </script>
         <script type="text/javascript" src="../kukit/kukit.js"> </script>
         <script type="text/javascript" src="../kukit/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	Fri Aug 25 12:52:13 2006
@@ -2,6 +2,7 @@
 	-f ecmaunit.js \
 	-f unittestUtilities.js \
 	-f ../kukit/utils.js \
+	-f ../kukit/oper.js \
 	-f ../kukit/requestmanager.js \
 	-f ../kukit/kukit.js \
 	-f ../kukit/tokenizer.js \

From reebalazs at codespeak.net  Fri Aug 25 12:53:17 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 25 Aug 2006 12:53:17 +0200 (CEST)
Subject: [Kukit-checkins] r31628 - kukit/azaxdemo/trunk/browser
Message-ID: <20060825105317.7803B1007B@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 25 12:53:15 2006
New Revision: 31628

Modified:
   kukit/azaxdemo/trunk/browser/more_selectors.js
Log:
Oper refactoring

Modified: kukit/azaxdemo/trunk/browser/more_selectors.js
==============================================================================
--- kukit/azaxdemo/trunk/browser/more_selectors.js	(original)
+++ kukit/azaxdemo/trunk/browser/more_selectors.js	Fri Aug 25 12:53:15 2006
@@ -5,33 +5,29 @@
 kukit.more_selectors.AnnoyClickerEvent = function() {
 };
 
-kukit.more_selectors.AnnoyClickerEvent.prototype.__bind_click__ = function(name, parms, func_to_bind, node, eventrule) {
+kukit.more_selectors.AnnoyClickerEvent.prototype.__bind_click__ = function(name, func_to_bind, oper) {
     // validate and set parameters
-    parms = kukit.pl.completeParms(parms, [], {'count': '3'}, 'annoyClicker event binding');
-    var count;
-    try {
-        count = parseInt(parms.count);
-    } catch(e) {
-        throw 'Parameter count must be an integer, "' + parms.count + '"';
-    }
-    if (count < 1)
-        throw 'Parameter count must be > 0, "' + parms.count + '"';
+    oper.completeParms([], {'count': '3'}, 'annoyClicker event binding');
+    oper.evalInt('count', 'annoyClicker event binding');
+    if (oper.parms.count < 1)
+        throw 'Parameter count must be > 0, "' + oper.parms.count + '"';
     // overwrite countsomuch
-    this.countsomuch = count;
+    this.countsomuch = oper.parms.count;
     this.count = this.countsomuch;
     // Just bind the event via the native event binder
-    kukit.pl.NativeEventBinder.prototype.__bind__('click', {}, func_to_bind, node);
+    oper.parms = {};
+    kukit.pl.NativeEventBinder.prototype.__bind__('click', func_to_bind, oper);
 };
 
-kukit.more_selectors.AnnoyClickerEvent.prototype.__default_click__ = function(name, parms, node) {
-    parms = kukit.pl.completeParms(parms, [], {}, 'annoyClicker event binding');
+kukit.more_selectors.AnnoyClickerEvent.prototype.__default_click__ = function(name, oper) {
+    oper.completeParms([], {}, 'annoyClicker event binding');
     this.count -= 1;
     if (this.count == 0) {
         // Continue with the real action.
         this.count = this.countsomuch;
-        this.__trigger_event__('doit', {}, node);
+        this.__trigger_event__('doit', {}, oper.node);
     } else {
-        this.__trigger_event__('annoy', {}, node);
+        this.__trigger_event__('annoy', {}, oper.node);
     }
 };
 

From reebalazs at codespeak.net  Fri Aug 25 12:55:13 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 25 Aug 2006 12:55:13 +0200 (CEST)
Subject: [Kukit-checkins] r31629 - kukit/azax/trunk
Message-ID: <20060825105513.278AC1007B@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 25 12:55:11 2006
New Revision: 31629

Modified:
   kukit/azax/trunk/configure.zcml
Log:
Oper refactoring

Modified: kukit/azax/trunk/configure.zcml
==============================================================================
--- kukit/azax/trunk/configure.zcml	(original)
+++ kukit/azax/trunk/configure.zcml	Fri Aug 25 12:55:11 2006
@@ -12,6 +12,7 @@
 
   <browser:concatresource
     files="kukit/kukit/utils.js
+        kukit/kukit/oper.js
         kukit/kukit/requestmanager.js
         kukit/kukit/kukit.js
         kukit/kukit/tokenizer.js

From reebalazs at codespeak.net  Fri Aug 25 12:56:55 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 25 Aug 2006 12:56:55 +0200 (CEST)
Subject: [Kukit-checkins] r31630 - kukit/azax/branch/zope2.8
Message-ID: <20060825105655.7FA3C1007B@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 25 12:56:54 2006
New Revision: 31630

Modified:
   kukit/azax/branch/zope2.8/configure.zcml
Log:
Merge from trunk (oper refactoring)

Modified: kukit/azax/branch/zope2.8/configure.zcml
==============================================================================
--- kukit/azax/branch/zope2.8/configure.zcml	(original)
+++ kukit/azax/branch/zope2.8/configure.zcml	Fri Aug 25 12:56:54 2006
@@ -12,6 +12,7 @@
 
   <browser:concatresource
     files="kukit/kukit/utils.js
+        kukit/kukit/oper.js
         kukit/kukit/requestmanager.js
         kukit/kukit/kukit.js
         kukit/kukit/tokenizer.js

From reebalazs at codespeak.net  Fri Aug 25 12:58:25 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 25 Aug 2006 12:58:25 +0200 (CEST)
Subject: [Kukit-checkins] r31631 - kukit/azaxdemo/branch/zope2.8/browser
Message-ID: <20060825105825.A1B911007B@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 25 12:58:24 2006
New Revision: 31631

Modified:
   kukit/azaxdemo/branch/zope2.8/browser/more_selectors.js
Log:
Merge from trunk (Oper refactoring)

Modified: kukit/azaxdemo/branch/zope2.8/browser/more_selectors.js
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/more_selectors.js	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/more_selectors.js	Fri Aug 25 12:58:24 2006
@@ -5,33 +5,29 @@
 kukit.more_selectors.AnnoyClickerEvent = function() {
 };
 
-kukit.more_selectors.AnnoyClickerEvent.prototype.__bind_click__ = function(name, parms, func_to_bind, node, eventrule) {
+kukit.more_selectors.AnnoyClickerEvent.prototype.__bind_click__ = function(name, func_to_bind, oper) {
     // validate and set parameters
-    parms = kukit.pl.completeParms(parms, [], {'count': '3'}, 'annoyClicker event binding');
-    var count;
-    try {
-        count = parseInt(parms.count);
-    } catch(e) {
-        throw 'Parameter count must be an integer, "' + parms.count + '"';
-    }
-    if (count < 1)
-        throw 'Parameter count must be > 0, "' + parms.count + '"';
+    oper.completeParms([], {'count': '3'}, 'annoyClicker event binding');
+    oper.evalInt('count', 'annoyClicker event binding');
+    if (oper.parms.count < 1)
+        throw 'Parameter count must be > 0, "' + oper.parms.count + '"';
     // overwrite countsomuch
-    this.countsomuch = count;
+    this.countsomuch = oper.parms.count;
     this.count = this.countsomuch;
     // Just bind the event via the native event binder
-    kukit.pl.NativeEventBinder.prototype.__bind__('click', {}, func_to_bind, node);
+    oper.parms = {};
+    kukit.pl.NativeEventBinder.prototype.__bind__('click', func_to_bind, oper);
 };
 
-kukit.more_selectors.AnnoyClickerEvent.prototype.__default_click__ = function(name, parms, node) {
-    parms = kukit.pl.completeParms(parms, [], {}, 'annoyClicker event binding');
+kukit.more_selectors.AnnoyClickerEvent.prototype.__default_click__ = function(name, oper) {
+    oper.completeParms([], {}, 'annoyClicker event binding');
     this.count -= 1;
     if (this.count == 0) {
         // Continue with the real action.
         this.count = this.countsomuch;
-        this.__trigger_event__('doit', {}, node);
+        this.__trigger_event__('doit', {}, oper.node);
     } else {
-        this.__trigger_event__('annoy', {}, node);
+        this.__trigger_event__('annoy', {}, oper.node);
     }
 };
 

From reebalazs at codespeak.net  Fri Aug 25 18:13:21 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Fri, 25 Aug 2006 18:13:21 +0200 (CEST)
Subject: [Kukit-checkins] r31651 - kukit/kukit.js/trunk/kukit
Message-ID: <20060825161321.756AA10084@code0.codespeak.net>

Author: reebalazs
Date: Fri Aug 25 18:13:19 2006
New Revision: 31651

Modified:
   kukit/kukit.js/trunk/kukit/plugin.js
   kukit/kukit.js/trunk/kukit/utils.js
Log:
timeout event: add repeat parm, move TimerCounter to utils

Modified: kukit/kukit.js/trunk/kukit/plugin.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/plugin.js	(original)
+++ kukit/kukit.js/trunk/kukit/plugin.js	Fri Aug 25 18:13:19 2006
@@ -158,59 +158,25 @@
 // per event rule. No matter how many nodes matched it. 
 // 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, restart) {
-    this.delay = delay;
-    this.func = func;
-    if (typeof(restart) == 'undefined') {
-        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();
-    }
-    this.timer = setTimeout(func, this.delay);
-};
-
-kukit.pl.TimerCounter.prototype.timeout = function() {
-    // Call the event action
-    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);
-    }
-};
+// or only once if repeat=false is given.
 
 kukit.pl.TimeoutEventBinder = function() {
     this.counters = {};
 };
 
 kukit.pl.TimeoutEventBinder.prototype.__bind__ = function(name, func_to_bind, oper) {
-    oper.completeParms(['delay'], {}, 'timeout event binding');
+    oper.completeParms(['delay'], {'repeat': 'true'}, 'timeout event binding');
+    oper.evalBool('repeat', 'timeout event binding');
     var key = oper.eventrule.getNr();
-    if (this.counters[key]) {
+    if (oper.parms.repeat && this.counters[key]) {
         // Don't bind the counter if we matched this eventrule already
+        // (this is only checked if this event is repeating)
         kukit.logDebug('timer event key ignored for actionEvent #' + key + ' ' 
-            + oper.eventrule.selector);
+            + oper.eventrule.kss_selector.css);
     } else {   
         kukit.logDebug('timer event key entered for actionEvent #' + key + ' ' 
-            + oper.eventrule.selector);
-        var counter = new kukit.pl.TimerCounter(oper.parms.delay, func_to_bind, true) 
+            + oper.eventrule.kss_selector.css);
+        var counter = new kukit.ut.TimerCounter(oper.parms.delay, func_to_bind, oper.parms.repeat) 
         this.counters[key] = counter;
         // Start the counter
         counter.start();
@@ -244,7 +210,7 @@
         // This is really crap. We have no way to wait until the frame hase
         // loaded, the only workaround is to wait. This works or not.
         // XXX How could we do this in a solid way?
-        var timer = new kukit.pl.TimerCounter(1000, function() {
+        var timer = new kukit.ut.TimerCounter(1000, function() {
             func_to_bind();
         });
         timer.start();

Modified: kukit/kukit.js/trunk/kukit/utils.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/utils.js	(original)
+++ kukit/kukit.js/trunk/kukit/utils.js	Fri Aug 25 18:13:19 2006
@@ -198,3 +198,43 @@
     return value;
 };
 
+
+/* Timer counter for repeating or one time timing */
+
+kukit.ut.TimerCounter = function(delay, func, restart) {
+    this.delay = delay;
+    this.func = func;
+    if (typeof(restart) == 'undefined') {
+        restart = false;
+    }
+    this.restart = restart;
+    this.timer;
+};
+
+kukit.ut.TimerCounter.prototype.start = function() {
+    if (this.timer) {
+        throw 'Timer already started.';
+    }
+    var self = this;
+    var func = function() {
+        self.timeout();
+    }
+    this.timer = setTimeout(func, this.delay);
+};
+
+kukit.ut.TimerCounter.prototype.timeout = function() {
+    // Call the event action
+    this.func();
+    // Restart the timer
+    if (this.restart) {
+        this.timer = null;
+        this.start();
+    }
+};
+
+kukit.ut.TimerCounter.prototype.clear = function() {
+    if (this.timer) {
+        window.clearTimeout(this.timer);
+    }
+};
+

From reebalazs at codespeak.net  Sat Aug 26 08:25:39 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sat, 26 Aug 2006 08:25:39 +0200 (CEST)
Subject: [Kukit-checkins] r31665 - kukit/azaxdemo/trunk/browser
Message-ID: <20060826062539.64AC11007D@code0.codespeak.net>

Author: reebalazs
Date: Sat Aug 26 08:25:37 2006
New Revision: 31665

Modified:
   kukit/azaxdemo/trunk/browser/azax_tree.pt
Log:
Fix typo

Modified: kukit/azaxdemo/trunk/browser/azax_tree.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_tree.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_tree.pt	Sat Aug 26 08:25:37 2006
@@ -27,7 +27,7 @@
     with real xhtml (mimetype text/xhtml), namespace attributes can be used, 
 	with transitional xhtml (mimetype text/html)
 	the attributes can be encoded into "class" attributes. Both are demonstrated
-	in this example in paraller, but in reality, one of these should be 
+	in this example in parallel, but in reality, one of these should be 
 	used depending on the content type of the page.</p>
     <form name="edit">
     <ul id="root">

From reebalazs at codespeak.net  Sat Aug 26 08:26:52 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sat, 26 Aug 2006 08:26:52 +0200 (CEST)
Subject: [Kukit-checkins] r31666 - kukit/azaxdemo/branch/zope2.8/browser
Message-ID: <20060826062652.009361007D@code0.codespeak.net>

Author: reebalazs
Date: Sat Aug 26 08:26:51 2006
New Revision: 31666

Modified:
   kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt
Log:
Merge from trunk / fix typo

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt	Sat Aug 26 08:26:51 2006
@@ -27,7 +27,7 @@
     with real xhtml (mimetype text/xhtml), namespace attributes can be used, 
 	with transitional xhtml (mimetype text/html)
 	the attributes can be encoded into "class" attributes. Both are demonstrated
-	in this example in paraller, but in reality, one of these should be 
+	in this example in parallel, but in reality, one of these should be 
 	used depending on the content type of the page.</p>
     <form name="edit">
     <ul id="root">

From reebalazs at codespeak.net  Sun Aug 27 16:19:01 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sun, 27 Aug 2006 16:19:01 +0200 (CEST)
Subject: [Kukit-checkins] r31735 - kukit/azaxdemo/trunk/browser
Message-ID: <20060827141901.7B78B100F2@code0.codespeak.net>

Author: reebalazs
Date: Sun Aug 27 16:18:58 2006
New Revision: 31735

Modified:
   kukit/azaxdemo/trunk/browser/azax_demo.pt
   kukit/azaxdemo/trunk/browser/azax_instant_edit.pt
   kukit/azaxdemo/trunk/browser/azax_three_autoupdate.pt
   kukit/azaxdemo/trunk/browser/azax_tree.pt
   kukit/azaxdemo/trunk/browser/azax_two_select.pt
   kukit/azaxdemo/trunk/browser/azax_xpath.pt
   kukit/azaxdemo/trunk/browser/cancel_submit.pt
   kukit/azaxdemo/trunk/browser/form_submit.pt
   kukit/azaxdemo/trunk/browser/more_selectors.pt
   kukit/azaxdemo/trunk/browser/two_select_revisited.pt
Log:
Add links to kss resource in demo pages

Modified: kukit/azaxdemo/trunk/browser/azax_demo.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_demo.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_demo.pt	Sun Aug 27 16:18:58 2006
@@ -8,6 +8,7 @@
   <!--a href="javascript:void(createLoggingPane(true));">logging</a-->
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++azax_demo.kss">View KSS resource</a></p>
     <h2>Change tag content</h2>
     <h4>Top div</h4>
     <div id="demo" style="border: 1px solid black;padding: 15px">

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	Sun Aug 27 16:18:58 2006
@@ -7,6 +7,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++azax_instant_edit.kss">View KSS resource</a></p>
 
 <h3>Instant edit Demo</h3>
 	<div>

Modified: kukit/azaxdemo/trunk/browser/azax_three_autoupdate.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_three_autoupdate.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_three_autoupdate.pt	Sun Aug 27 16:18:58 2006
@@ -26,6 +26,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++azax_three_autoupdate.kss">View KSS resource</a></p>
     <h2>Three autoupdate</h2>
 
 <h3>Demo</h3>

Modified: kukit/azaxdemo/trunk/browser/azax_tree.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_tree.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_tree.pt	Sun Aug 27 16:18:58 2006
@@ -17,6 +17,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++azax_tree.kss">View KSS resource</a></p>
 
 <h3>Tree Demo</h3>
     <p id="text">This is not finished yet.</p>

Modified: kukit/azaxdemo/trunk/browser/azax_two_select.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_two_select.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_two_select.pt	Sun Aug 27 16:18:58 2006
@@ -7,6 +7,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++azax_two_selects.kss">View KSS resource</a></p>
     <h2>Two Selects</h2>
    <form name="two">
        <select id="first" name="value">

Modified: kukit/azaxdemo/trunk/browser/azax_xpath.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/azax_xpath.pt	(original)
+++ kukit/azaxdemo/trunk/browser/azax_xpath.pt	Sun Aug 27 16:18:58 2006
@@ -8,6 +8,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++azax_xpath.kss">View KSS resource</a></p>
 
 <h3>xpath Demo</h3>
 <p>Some preliminary xpath demo. Godefroid's test area.

Modified: kukit/azaxdemo/trunk/browser/cancel_submit.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/cancel_submit.pt	(original)
+++ kukit/azaxdemo/trunk/browser/cancel_submit.pt	Sun Aug 27 16:18:58 2006
@@ -8,6 +8,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++cancel_submit.kss">View KSS resource</a></p>
 
 <h3>Cancel Submit Click Demo</h3>
    <p tal:condition="request/text_save | nothing"><span tal:replace="request/text_save | nothing" /> saved !</p>

Modified: kukit/azaxdemo/trunk/browser/form_submit.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/form_submit.pt	(original)
+++ kukit/azaxdemo/trunk/browser/form_submit.pt	Sun Aug 27 16:18:58 2006
@@ -9,6 +9,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++form_submit.kss">View KSS resource</a></p>
 
 <h3>Form Submit Demo</h3>
    <p tal:condition="request/text_save | nothing"><span tal:replace="request/text_save | nothing" /> saved !</p>

Modified: kukit/azaxdemo/trunk/browser/more_selectors.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/more_selectors.pt	(original)
+++ kukit/azaxdemo/trunk/browser/more_selectors.pt	Sun Aug 27 16:18:58 2006
@@ -12,6 +12,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++more_selectors.kss">View KSS resource</a></p>
     <h2>More complex selectors</h2>
 
 <p>

Modified: kukit/azaxdemo/trunk/browser/two_select_revisited.pt
==============================================================================
--- kukit/azaxdemo/trunk/browser/two_select_revisited.pt	(original)
+++ kukit/azaxdemo/trunk/browser/two_select_revisited.pt	Sun Aug 27 16:18:58 2006
@@ -7,6 +7,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++two_select_revisited.kss">View KSS resource</a></p>
     <h2>Master-slave selects revisited</h2>
     <form name="two">
         <div>

From reebalazs at codespeak.net  Sun Aug 27 16:19:56 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Sun, 27 Aug 2006 16:19:56 +0200 (CEST)
Subject: [Kukit-checkins] r31736 - kukit/azaxdemo/branch/zope2.8/browser
Message-ID: <20060827141956.78335100F2@code0.codespeak.net>

Author: reebalazs
Date: Sun Aug 27 16:19:53 2006
New Revision: 31736

Modified:
   kukit/azaxdemo/branch/zope2.8/browser/azax_demo.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_instant_edit.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_three_autoupdate.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_two_select.pt
   kukit/azaxdemo/branch/zope2.8/browser/azax_xpath.pt
   kukit/azaxdemo/branch/zope2.8/browser/cancel_submit.pt
   kukit/azaxdemo/branch/zope2.8/browser/form_submit.pt
   kukit/azaxdemo/branch/zope2.8/browser/more_selectors.pt
   kukit/azaxdemo/branch/zope2.8/browser/two_select_revisited.pt
Log:
Merge from trunk / Add links to kss resource in demo pages

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_demo.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_demo.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_demo.pt	Sun Aug 27 16:19:53 2006
@@ -8,6 +8,7 @@
   <!--a href="javascript:void(createLoggingPane(true));">logging</a-->
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++azax_demo.kss">View KSS resource</a></p>
     <h2>Change tag content</h2>
     <h4>Top div</h4>
     <div id="demo" style="border: 1px solid black;padding: 15px">

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_instant_edit.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_instant_edit.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_instant_edit.pt	Sun Aug 27 16:19:53 2006
@@ -7,6 +7,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++azax_instant_edit.kss">View KSS resource</a></p>
 
 <h3>Instant edit Demo</h3>
 	<div>

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_three_autoupdate.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_three_autoupdate.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_three_autoupdate.pt	Sun Aug 27 16:19:53 2006
@@ -26,6 +26,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++azax_three_autoupdate.kss">View KSS resource</a></p>
     <h2>Three autoupdate</h2>
 
 <h3>Demo</h3>

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_tree.pt	Sun Aug 27 16:19:53 2006
@@ -17,6 +17,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++azax_tree.kss">View KSS resource</a></p>
 
 <h3>Tree Demo</h3>
     <p id="text">This is not finished yet.</p>

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_two_select.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_two_select.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_two_select.pt	Sun Aug 27 16:19:53 2006
@@ -7,6 +7,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++azax_two_selects.kss">View KSS resource</a></p>
     <h2>Two Selects</h2>
    <form name="two">
        <select id="first" name="value">

Modified: kukit/azaxdemo/branch/zope2.8/browser/azax_xpath.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/azax_xpath.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/azax_xpath.pt	Sun Aug 27 16:19:53 2006
@@ -8,6 +8,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++azax_xpath.kss">View KSS resource</a></p>
 
 <h3>xpath Demo</h3>
 <p>Some preliminary xpath demo. Godefroid's test area.

Modified: kukit/azaxdemo/branch/zope2.8/browser/cancel_submit.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/cancel_submit.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/cancel_submit.pt	Sun Aug 27 16:19:53 2006
@@ -8,6 +8,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++cancel_submit.kss">View KSS resource</a></p>
 
 <h3>Cancel Submit Click Demo</h3>
    <p tal:condition="request/text_save | nothing"><span tal:replace="request/text_save | nothing" /> saved !</p>

Modified: kukit/azaxdemo/branch/zope2.8/browser/form_submit.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/form_submit.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/form_submit.pt	Sun Aug 27 16:19:53 2006
@@ -9,6 +9,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++form_submit.kss">View KSS resource</a></p>
 
 <h3>Form Submit Demo</h3>
    <p tal:condition="request/text_save | nothing"><span tal:replace="request/text_save | nothing" /> saved !</p>

Modified: kukit/azaxdemo/branch/zope2.8/browser/more_selectors.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/more_selectors.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/more_selectors.pt	Sun Aug 27 16:19:53 2006
@@ -12,6 +12,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++more_selectors.kss">View KSS resource</a></p>
     <h2>More complex selectors</h2>
 
 <p>

Modified: kukit/azaxdemo/branch/zope2.8/browser/two_select_revisited.pt
==============================================================================
--- kukit/azaxdemo/branch/zope2.8/browser/two_select_revisited.pt	(original)
+++ kukit/azaxdemo/branch/zope2.8/browser/two_select_revisited.pt	Sun Aug 27 16:19:53 2006
@@ -7,6 +7,7 @@
   <body>
     <p><a href=".">All demos</a></p>
     <p><a href="javascript:void(createLoggingPane(true))">Start logging pane</a></p>
+    <p><a href="./++resource++two_select_revisited.kss">View KSS resource</a></p>
     <h2>Master-slave selects revisited</h2>
     <form name="two">
         <div>

From reebalazs at codespeak.net  Thu Aug 31 08:10:36 2006
From: reebalazs at codespeak.net (reebalazs at codespeak.net)
Date: Thu, 31 Aug 2006 08:10:36 +0200 (CEST)
Subject: [Kukit-checkins] r31864 - kukit/kukit.js/trunk/kukit
Message-ID: <20060831061036.49BEB10075@code0.codespeak.net>

Author: reebalazs
Date: Thu Aug 31 08:10:33 2006
New Revision: 31864

Modified:
   kukit/kukit.js/trunk/kukit/kssparser.js
Log:
On kss parsing errors, also log error in addition to throwing the exception

Modified: kukit/kukit.js/trunk/kukit/kssparser.js
==============================================================================
--- kukit/kukit.js/trunk/kukit/kssparser.js	(original)
+++ kukit/kukit.js/trunk/kukit/kssparser.js	Thu Aug 31 08:10:33 2006
@@ -476,8 +476,11 @@
         parser = new kukit.kssp.document(src, null, true);
     } catch(e) {
         if (e.name == 'ParsingError') {
+            // Log the message
+            var msg = 'Error parsing ' + this.href + ' : ' + e.toString();
+            kukit.logFatal(msg);
             // just throw it too...
-            throw 'Error parsing ' + this.href + ' : ' + e.toString();
+            throw msg;
         } else {
             throw e;
         }

From gotcha at codespeak.net  Thu Aug 31 12:55:33 2006
From: gotcha at codespeak.net (gotcha at codespeak.net)
Date: Thu, 31 Aug 2006 12:55:33 +0200 (CEST)
Subject: [Kukit-checkins] r31871 - kukit/azax/branch/zope2.8
Message-ID: <20060831105533.985B810071@code0.codespeak.net>

Author: gotcha
Date: Thu Aug 31 12:55:31 2006
New Revision: 31871

Modified:
   kukit/azax/branch/zope2.8/__init__.py
   kukit/azax/branch/zope2.8/azaxview.py
   kukit/azax/branch/zope2.8/commands.py
Log:
move helpers to commands class

Modified: kukit/azax/branch/zope2.8/__init__.py
==============================================================================
--- kukit/azax/branch/zope2.8/__init__.py	(original)
+++ kukit/azax/branch/zope2.8/__init__.py	Thu Aug 31 12:55:31 2006
@@ -1,3 +1,23 @@
+# -*- coding: ISO-8859-15 -*-
+# Copyright (c) 2006
+# Authors:
+#   Godefroid Chapelle <gotcha at bubblenet.be>
+#   Balazs Ree <ree at greenfinity.hu>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
 __all__ = ('AzaxBaseView', 'force_unicode', 'AzaxUnicodeError', 'AzaxCommands') 
 
 import mimetypes
@@ -31,3 +51,4 @@
         pass #sys.modules['azax'] = sys.modules[globals()['__name__']]
 except ImportError:
     pass
+

Modified: kukit/azax/branch/zope2.8/azaxview.py
==============================================================================
--- kukit/azax/branch/zope2.8/azaxview.py	(original)
+++ kukit/azax/branch/zope2.8/azaxview.py	Thu Aug 31 12:55:31 2006
@@ -35,17 +35,7 @@
     from Products.Five import BrowserView
 except ImportError:
     from zope.app.publisher.browser import BrowserView
-from commands import AzaxCommands, AzaxCommand
-from parsers import XmlParser, HtmlParser
-try:
-    from zope.deprecation import deprecated
-except ImportError:
-    import warnings
-    def deprecated(method, message):
-        def deprecated_method(self, *args, **kw):
-            warnings.warn(message, DeprecationWarning, 2)
-            return method(self, *args, **kw)
-        return deprecated_method
+from commands import AzaxCommands
 
 class AzaxBaseView(BrowserView):
     """ Base azax view
@@ -54,125 +44,18 @@
     generate it out.
     """
     
-    def render(self):
-        '''All methods must use this to return their command set
-        '''
-        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, **kw):
-        return self.commands.addCommand(name, selector=selector, **kw)
-
-    def getCommands(self):
-        return self.commands
-
-    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)
-            
-    def getHtmlIdSelector(self, selector):
-        return self.commands.getHtmlIdSelector(selector)
-            
-    # --
-    # default set of commands
-    # --
-    
-    # XXX the list is not full: maybe complete them?
-    
-    def replaceInnerHTML(self, selector, new_value):
-        """ see interfaces.py """
-        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
-        command = self.addCommand('replaceInnerHTML', selector)
-        data = command.addParam('html', new_value)
-
-    def replaceHTML(self, selector, new_value):
-        """ see interfaces.py """
-        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
-        command = self.addCommand('replaceHTML', selector)
-        data = command.addParam('html', new_value)
-    
-    def setAttribute(self, selector, name, value):
-        """ see interfaces.py """
-        command = self.addCommand('setAttribute', selector)
-        data = command.addParam('name', name)
-        data = command.addParam('value', value)
-
-    def setStyle(self, selector, name, value):
-        """ see interfaces.py """
-        command = self.addCommand('setStyle', selector)
-        data = command.addParam('name', name)
-        data = command.addParam('value', value)
-    
-    def insertHTMLAfter(self, selector, new_value):
-        """ see interfaces.py """
-        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
-        command = self.addCommand('insertHTMLAfter', selector)
-        data = command.addParam('html', new_value)
-
-    def clearChildNodes(self, selector):
-        """ see interfaces.py """
-        command = self.addCommand('clearChildNodes', selector)
-    
-    def deleteNode(self, selector):
-        """ see interfaces.py """
-        command = self.addCommand('deleteNode', selector)
-
-    def deleteNodeAfter(self, selector):
-        """ see interfaces.py """
-        command = self.addCommand('deleteNodeAfter', selector)
-
-    def deleteNodeBefore(self, selector):
-        """ see interfaces.py """
-        command = self.addCommand('deleteNodeBefore', selector)
-
-    def copyChildNodesFrom(self, selector, id):
-        """ see interfaces.py """
-        command = self.addCommand('copyChildNodesFrom', selector)
-        data = command.addParam('html_id', id)
-
-    def moveNodeAfter(self, selector, id):
-        """ see interfaces.py """
-        command = self.addCommand('moveNodeAfter', selector)
-        data = command.addParam('html_id', id)
-
-    def copyChildNodesTo(self, selector, id):
-        """ see interfaces.py """
-        command = self.addCommand('copyChildNodesTo', selector)
-        data = command.addParam('html_id', id)
-
-    def setStateVar(self, varname, value):
-        """ see interfaces.py """
-        command = self.addCommand('setStateVar')
-        command.addParam('varname', varname)
-        command.addParam('value', value)
-
-    def triggerEvent(self, name, **kw):
-        """ see interfaces.py """
-        command = self.addCommand('triggerEvent')
-        command.addParam('name', name)
-        for key, value in kw.iteritems():
-            command.addParam(key, value)
-    
-    # XXX Deprecated ones
+    def render(self):
+        '''All methods must use this to return their command set
+        '''
+        return self.commands.render(self.request)
 
-    def moveChildrenTo(self, selector, id):
-        """ see interfaces.py """
-        self.copyChildrenTo(selector, id)
-        self.clearChildren(selector)
-    moveChildrenTo = deprecated(moveChildrenTo, 'No more supported, use a sequence of copyChildrenTo and clearChildren')
+    def __getattr__(self, name):
+        if hasattr(self.commands, name):
+            return getattr(self.commands, name)
+        else:
+            raise AttributeError(name)
 
-    setHtmlAsChild = deprecated(replaceInnerHTML, 'use replaceInnerHTML instead')
-    addAfter = deprecated(insertHTMLAfter, 'use insertHTMLAfter instead')
-    clearChildren = deprecated(clearChildNodes, 'use clearChildNodes instead')
-    removeNode = deprecated(deleteNode, 'use deleteNode instead')
-    removeNextSibling = deprecated(deleteNodeAfter, 'use deleteNodeAfter instead')
-    removePreviousSibling = deprecated(deleteNodeBefore, 'use deleteNodeBefore instead')
-    copyChildrenFrom = deprecated(copyChildNodesFrom, 'use copyChildNodesFrom instead')
-    copyChildrenTo = deprecated(copyChildNodesTo, 'use copyChildNodesTo instead')
-    setStatevar = deprecated(setStateVar, 'use setStateVar (capital V) instead')

Modified: kukit/azax/branch/zope2.8/commands.py
==============================================================================
--- kukit/azax/branch/zope2.8/commands.py	(original)
+++ kukit/azax/branch/zope2.8/commands.py	Thu Aug 31 12:55:31 2006
@@ -33,6 +33,9 @@
 from zope.interface import Interface
 import zope.component
 from selectors import Selector, CssSelector, HtmlIdSelector
+from parsers import XmlParser, HtmlParser
+
+from deprecated import deprecated
 
 class AzaxCommands(list):
     implements(IAzaxCommands)
@@ -60,6 +63,105 @@
     def getHtmlIdSelector(self, selector):
         return HtmlIdSelector(selector)
 
+    # --
+    # default set of commands
+    # --
+    
+    # XXX the list is not full: maybe complete them?
+    
+    def replaceInnerHTML(self, selector, new_value):
+        """ see interfaces.py """
+        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
+        command = self.addCommand('replaceInnerHTML', selector)
+        data = command.addParam('html', new_value)
+
+    def replaceHTML(self, selector, new_value):
+        """ see interfaces.py """
+        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
+        command = self.addCommand('replaceHTML', selector)
+        data = command.addParam('html', new_value)
+    
+    def setAttribute(self, selector, name, value):
+        """ see interfaces.py """
+        command = self.addCommand('setAttribute', selector)
+        data = command.addParam('name', name)
+        data = command.addParam('value', value)
+
+    def setStyle(self, selector, name, value):
+        """ see interfaces.py """
+        command = self.addCommand('setStyle', selector)
+        data = command.addParam('name', name)
+        data = command.addParam('value', value)
+    
+    def insertHTMLAfter(self, selector, new_value):
+        """ see interfaces.py """
+        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
+        command = self.addCommand('insertHTMLAfter', selector)
+        data = command.addParam('html', new_value)
+
+    def clearChildNodes(self, selector):
+        """ see interfaces.py """
+        command = self.addCommand('clearChildNodes', selector)
+    
+    def deleteNode(self, selector):
+        """ see interfaces.py """
+        command = self.addCommand('deleteNode', selector)
+
+    def deleteNodeAfter(self, selector):
+        """ see interfaces.py """
+        command = self.addCommand('deleteNodeAfter', selector)
+
+    def deleteNodeBefore(self, selector):
+        """ see interfaces.py """
+        command = self.addCommand('deleteNodeBefore', selector)
+
+    def copyChildNodesFrom(self, selector, id):
+        """ see interfaces.py """
+        command = self.addCommand('copyChildNodesFrom', selector)
+        data = command.addParam('html_id', id)
+
+    def moveNodeAfter(self, selector, id):
+        """ see interfaces.py """
+        command = self.addCommand('moveNodeAfter', selector)
+        data = command.addParam('html_id', id)
+
+    def copyChildNodesTo(self, selector, id):
+        """ see interfaces.py """
+        command = self.addCommand('copyChildNodesTo', selector)
+        data = command.addParam('html_id', id)
+
+    def setStateVar(self, varname, value):
+        """ see interfaces.py """
+        command = self.addCommand('setStateVar')
+        command.addParam('varname', varname)
+        command.addParam('value', value)
+
+    def triggerEvent(self, name, **kw):
+        """ see interfaces.py """
+        command = self.addCommand('triggerEvent')
+        command.addParam('name', name)
+        for key, value in kw.iteritems():
+            command.addParam(key, value)
+
+    # XXX Deprecated ones
+
+    def moveChildrenTo(self, selector, id):
+        """ see interfaces.py """
+        self.copyChildrenTo(selector, id)
+        self.clearChildren(selector)
+    moveChildrenTo = deprecated(moveChildrenTo, 'No more supported, use a sequence of copyChildrenTo and clearChildren')
+
+    setHtmlAsChild = deprecated(replaceInnerHTML, 'use replaceInnerHTML instead')
+    addAfter = deprecated(insertHTMLAfter, 'use insertHTMLAfter instead')
+    clearChildren = deprecated(clearChildNodes, 'use clearChildNodes instead')
+    removeNode = deprecated(deleteNode, 'use deleteNode instead')
+    removeNextSibling = deprecated(deleteNodeAfter, 'use deleteNodeAfter instead')
+    removePreviousSibling = deprecated(deleteNodeBefore, 'use deleteNodeBefore instead')
+    copyChildrenFrom = deprecated(copyChildNodesFrom, 'use copyChildNodesFrom instead')
+    copyChildrenTo = deprecated(copyChildNodesTo, 'use copyChildNodesTo instead')
+    setStatevar = deprecated(setStateVar, 'use setStateVar (capital V) instead')
+
+    # end deprecated
 
 class AzaxParam:
     implements(IAzaxParam)

From gotcha at codespeak.net  Thu Aug 31 12:56:09 2006
From: gotcha at codespeak.net (gotcha at codespeak.net)
Date: Thu, 31 Aug 2006 12:56:09 +0200 (CEST)
Subject: [Kukit-checkins] r31872 - kukit/azax/branch/zope2.8
Message-ID: <20060831105609.B530110071@code0.codespeak.net>

Author: gotcha
Date: Thu Aug 31 12:56:08 2006
New Revision: 31872

Added:
   kukit/azax/branch/zope2.8/deprecated.py
Log:
change deprecation imports

Added: kukit/azax/branch/zope2.8/deprecated.py
==============================================================================
--- (empty file)
+++ kukit/azax/branch/zope2.8/deprecated.py	Thu Aug 31 12:56:08 2006
@@ -0,0 +1,27 @@
+# -*- coding: ISO-8859-15 -*-
+# Copyright (c) 2006
+# Authors:
+#   Godefroid Chapelle <gotcha at bubblenet.be>
+#   Balazs Ree <ree at greenfinity.hu>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
+import warnings
+def deprecated(method, message):
+    def deprecated_method(self, *args, **kw):
+        warnings.warn(message, DeprecationWarning, 2)
+        return method(self, *args, **kw)
+    return deprecated_method
+

From gotcha at codespeak.net  Thu Aug 31 13:30:48 2006
From: gotcha at codespeak.net (gotcha at codespeak.net)
Date: Thu, 31 Aug 2006 13:30:48 +0200 (CEST)
Subject: [Kukit-checkins] r31873 - kukit/azax/trunk
Message-ID: <20060831113048.C1AAE1006E@code0.codespeak.net>

Author: gotcha
Date: Thu Aug 31 13:30:46 2006
New Revision: 31873

Added:
   kukit/azax/trunk/deprecated.py
      - copied unchanged from r31872, kukit/azax/branch/zope2.8/deprecated.py
Modified:
   kukit/azax/trunk/__init__.py
   kukit/azax/trunk/azaxview.py
   kukit/azax/trunk/commands.py
Log:
merge 31872 from zope2.8 branch

Modified: kukit/azax/trunk/__init__.py
==============================================================================
--- kukit/azax/trunk/__init__.py	(original)
+++ kukit/azax/trunk/__init__.py	Thu Aug 31 13:30:46 2006
@@ -1,3 +1,23 @@
+# -*- coding: ISO-8859-15 -*-
+# Copyright (c) 2006
+# Authors:
+#   Godefroid Chapelle <gotcha at bubblenet.be>
+#   Balazs Ree <ree at greenfinity.hu>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
 __all__ = ('AzaxBaseView', 'force_unicode', 'AzaxUnicodeError', 'AzaxCommands') 
 
 import mimetypes
@@ -31,3 +51,4 @@
         pass #sys.modules['azax'] = sys.modules[globals()['__name__']]
 except ImportError:
     pass
+

Modified: kukit/azax/trunk/azaxview.py
==============================================================================
--- kukit/azax/trunk/azaxview.py	(original)
+++ kukit/azax/trunk/azaxview.py	Thu Aug 31 13:30:46 2006
@@ -35,17 +35,7 @@
     from Products.Five import BrowserView
 except ImportError:
     from zope.app.publisher.browser import BrowserView
-from commands import AzaxCommands, AzaxCommand
-from parsers import XmlParser, HtmlParser
-try:
-    from zope.deprecation import deprecated
-except ImportError:
-    import warnings
-    def deprecated(method, message):
-        def deprecated_method(self, *args, **kw):
-            warnings.warn(message, DeprecationWarning, 2)
-            return method(self, *args, **kw)
-        return deprecated_method
+from commands import AzaxCommands
 
 class AzaxBaseView(BrowserView):
     """ Base azax view
@@ -54,125 +44,18 @@
     generate it out.
     """
     
-    def render(self):
-        '''All methods must use this to return their command set
-        '''
-        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, **kw):
-        return self.commands.addCommand(name, selector=selector, **kw)
-
-    def getCommands(self):
-        return self.commands
-
-    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)
-            
-    def getHtmlIdSelector(self, selector):
-        return self.commands.getHtmlIdSelector(selector)
-            
-    # --
-    # default set of commands
-    # --
-    
-    # XXX the list is not full: maybe complete them?
-    
-    def replaceInnerHTML(self, selector, new_value):
-        """ see interfaces.py """
-        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
-        command = self.addCommand('replaceInnerHTML', selector)
-        data = command.addParam('html', new_value)
-
-    def replaceHTML(self, selector, new_value):
-        """ see interfaces.py """
-        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
-        command = self.addCommand('replaceHTML', selector)
-        data = command.addParam('html', new_value)
-    
-    def setAttribute(self, selector, name, value):
-        """ see interfaces.py """
-        command = self.addCommand('setAttribute', selector)
-        data = command.addParam('name', name)
-        data = command.addParam('value', value)
-
-    def setStyle(self, selector, name, value):
-        """ see interfaces.py """
-        command = self.addCommand('setStyle', selector)
-        data = command.addParam('name', name)
-        data = command.addParam('value', value)
-    
-    def insertHTMLAfter(self, selector, new_value):
-        """ see interfaces.py """
-        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
-        command = self.addCommand('insertHTMLAfter', selector)
-        data = command.addParam('html', new_value)
-
-    def clearChildNodes(self, selector):
-        """ see interfaces.py """
-        command = self.addCommand('clearChildNodes', selector)
-    
-    def deleteNode(self, selector):
-        """ see interfaces.py """
-        command = self.addCommand('deleteNode', selector)
-
-    def deleteNodeAfter(self, selector):
-        """ see interfaces.py """
-        command = self.addCommand('deleteNodeAfter', selector)
-
-    def deleteNodeBefore(self, selector):
-        """ see interfaces.py """
-        command = self.addCommand('deleteNodeBefore', selector)
-
-    def copyChildNodesFrom(self, selector, id):
-        """ see interfaces.py """
-        command = self.addCommand('copyChildNodesFrom', selector)
-        data = command.addParam('html_id', id)
-
-    def moveNodeAfter(self, selector, id):
-        """ see interfaces.py """
-        command = self.addCommand('moveNodeAfter', selector)
-        data = command.addParam('html_id', id)
-
-    def copyChildNodesTo(self, selector, id):
-        """ see interfaces.py """
-        command = self.addCommand('copyChildNodesTo', selector)
-        data = command.addParam('html_id', id)
-
-    def setStateVar(self, varname, value):
-        """ see interfaces.py """
-        command = self.addCommand('setStateVar')
-        command.addParam('varname', varname)
-        command.addParam('value', value)
-
-    def triggerEvent(self, name, **kw):
-        """ see interfaces.py """
-        command = self.addCommand('triggerEvent')
-        command.addParam('name', name)
-        for key, value in kw.iteritems():
-            command.addParam(key, value)
-    
-    # XXX Deprecated ones
+    def render(self):
+        '''All methods must use this to return their command set
+        '''
+        return self.commands.render(self.request)
 
-    def moveChildrenTo(self, selector, id):
-        """ see interfaces.py """
-        self.copyChildrenTo(selector, id)
-        self.clearChildren(selector)
-    moveChildrenTo = deprecated(moveChildrenTo, 'No more supported, use a sequence of copyChildrenTo and clearChildren')
+    def __getattr__(self, name):
+        if hasattr(self.commands, name):
+            return getattr(self.commands, name)
+        else:
+            raise AttributeError(name)
 
-    setHtmlAsChild = deprecated(replaceInnerHTML, 'use replaceInnerHTML instead')
-    addAfter = deprecated(insertHTMLAfter, 'use insertHTMLAfter instead')
-    clearChildren = deprecated(clearChildNodes, 'use clearChildNodes instead')
-    removeNode = deprecated(deleteNode, 'use deleteNode instead')
-    removeNextSibling = deprecated(deleteNodeAfter, 'use deleteNodeAfter instead')
-    removePreviousSibling = deprecated(deleteNodeBefore, 'use deleteNodeBefore instead')
-    copyChildrenFrom = deprecated(copyChildNodesFrom, 'use copyChildNodesFrom instead')
-    copyChildrenTo = deprecated(copyChildNodesTo, 'use copyChildNodesTo instead')
-    setStatevar = deprecated(setStateVar, 'use setStateVar (capital V) instead')

Modified: kukit/azax/trunk/commands.py
==============================================================================
--- kukit/azax/trunk/commands.py	(original)
+++ kukit/azax/trunk/commands.py	Thu Aug 31 13:30:46 2006
@@ -33,6 +33,9 @@
 from zope.interface import Interface
 import zope.component
 from selectors import Selector, CssSelector, HtmlIdSelector
+from parsers import XmlParser, HtmlParser
+
+from deprecated import deprecated
 
 class AzaxCommands(list):
     implements(IAzaxCommands)
@@ -60,6 +63,105 @@
     def getHtmlIdSelector(self, selector):
         return HtmlIdSelector(selector)
 
+    # --
+    # default set of commands
+    # --
+    
+    # XXX the list is not full: maybe complete them?
+    
+    def replaceInnerHTML(self, selector, new_value):
+        """ see interfaces.py """
+        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
+        command = self.addCommand('replaceInnerHTML', selector)
+        data = command.addParam('html', new_value)
+
+    def replaceHTML(self, selector, new_value):
+        """ see interfaces.py """
+        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
+        command = self.addCommand('replaceHTML', selector)
+        data = command.addParam('html', new_value)
+    
+    def setAttribute(self, selector, name, value):
+        """ see interfaces.py """
+        command = self.addCommand('setAttribute', selector)
+        data = command.addParam('name', name)
+        data = command.addParam('value', value)
+
+    def setStyle(self, selector, name, value):
+        """ see interfaces.py """
+        command = self.addCommand('setStyle', selector)
+        data = command.addParam('name', name)
+        data = command.addParam('value', value)
+    
+    def insertHTMLAfter(self, selector, new_value):
+        """ see interfaces.py """
+        new_value = HtmlParser(new_value)().encode('ascii', 'xmlcharrefreplace')
+        command = self.addCommand('insertHTMLAfter', selector)
+        data = command.addParam('html', new_value)
+
+    def clearChildNodes(self, selector):
+        """ see interfaces.py """
+        command = self.addCommand('clearChildNodes', selector)
+    
+    def deleteNode(self, selector):
+        """ see interfaces.py """
+        command = self.addCommand('deleteNode', selector)
+
+    def deleteNodeAfter(self, selector):
+        """ see interfaces.py """
+        command = self.addCommand('deleteNodeAfter', selector)
+
+    def deleteNodeBefore(self, selector):
+        """ see interfaces.py """
+        command = self.addCommand('deleteNodeBefore', selector)
+
+    def copyChildNodesFrom(self, selector, id):
+        """ see interfaces.py """
+        command = self.addCommand('copyChildNodesFrom', selector)
+        data = command.addParam('html_id', id)
+
+    def moveNodeAfter(self, selector, id):
+        """ see interfaces.py """
+        command = self.addCommand('moveNodeAfter', selector)
+        data = command.addParam('html_id', id)
+
+    def copyChildNodesTo(self, selector, id):
+        """ see interfaces.py """
+        command = self.addCommand('copyChildNodesTo', selector)
+        data = command.addParam('html_id', id)
+
+    def setStateVar(self, varname, value):
+        """ see interfaces.py """
+        command = self.addCommand('setStateVar')
+        command.addParam('varname', varname)
+        command.addParam('value', value)
+
+    def triggerEvent(self, name, **kw):
+        """ see interfaces.py """
+        command = self.addCommand('triggerEvent')
+        command.addParam('name', name)
+        for key, value in kw.iteritems():
+            command.addParam(key, value)
+
+    # XXX Deprecated ones
+
+    def moveChildrenTo(self, selector, id):
+        """ see interfaces.py """
+        self.copyChildrenTo(selector, id)
+        self.clearChildren(selector)
+    moveChildrenTo = deprecated(moveChildrenTo, 'No more supported, use a sequence of copyChildrenTo and clearChildren')
+
+    setHtmlAsChild = deprecated(replaceInnerHTML, 'use replaceInnerHTML instead')
+    addAfter = deprecated(insertHTMLAfter, 'use insertHTMLAfter instead')
+    clearChildren = deprecated(clearChildNodes, 'use clearChildNodes instead')
+    removeNode = deprecated(deleteNode, 'use deleteNode instead')
+    removeNextSibling = deprecated(deleteNodeAfter, 'use deleteNodeAfter instead')
+    removePreviousSibling = deprecated(deleteNodeBefore, 'use deleteNodeBefore instead')
+    copyChildrenFrom = deprecated(copyChildNodesFrom, 'use copyChildNodesFrom instead')
+    copyChildrenTo = deprecated(copyChildNodesTo, 'use copyChildNodesTo instead')
+    setStatevar = deprecated(setStateVar, 'use setStateVar (capital V) instead')
+
+    # end deprecated
 
 class AzaxParam:
     implements(IAzaxParam)

From gotcha at codespeak.net  Thu Aug 31 23:25:16 2006
From: gotcha at codespeak.net (gotcha at codespeak.net)
Date: Thu, 31 Aug 2006 23:25:16 +0200 (CEST)
Subject: [Kukit-checkins] r31901 - kukit/azax/branch/zope2.8
Message-ID: <20060831212516.8B4A81006E@code0.codespeak.net>

Author: gotcha
Date: Thu Aug 31 23:25:15 2006
New Revision: 31901

Modified:
   kukit/azax/branch/zope2.8/azaxview.py
   kukit/azax/branch/zope2.8/interfaces.py
Log:
macros ; callable from PythonScripts

Modified: kukit/azax/branch/zope2.8/azaxview.py
==============================================================================
--- kukit/azax/branch/zope2.8/azaxview.py	(original)
+++ kukit/azax/branch/zope2.8/azaxview.py	Thu Aug 31 23:25:15 2006
@@ -35,6 +35,12 @@
     from Products.Five import BrowserView
 except ImportError:
     from zope.app.publisher.browser import BrowserView
+
+from zope.interface import implements
+from zope.app import zapi
+
+from interfaces import IAzaxView
+from interfaces import IAzaxMacro
 from commands import AzaxCommands
 
 class AzaxBaseView(BrowserView):
@@ -44,6 +50,8 @@
     generate it out.
     """
     
+    implements(IAzaxView)
+
     def __init__(self, context, request):
         BrowserView.__init__(self, context, request)
         self.commands = AzaxCommands()
@@ -54,8 +62,13 @@
         return self.commands.render(self.request)
 
     def __getattr__(self, name):
-        if hasattr(self.commands, name):
+        if name == '__provides__':
+            raise AttributeError(name)
+        elif hasattr(self.commands, name):
             return getattr(self.commands, name)
         else:
             raise AttributeError(name)
 
+    def executeMacro(self, name, *args, **kwargs):
+        adapter = zapi.getAdapter(self, IAzaxMacro, name)
+        adapter.execute(*args, **kwargs)

Modified: kukit/azax/branch/zope2.8/interfaces.py
==============================================================================
--- kukit/azax/branch/zope2.8/interfaces.py	(original)
+++ kukit/azax/branch/zope2.8/interfaces.py	Thu Aug 31 23:25:15 2006
@@ -92,3 +92,12 @@
 
     def getContent(self):
         ''
+
+class IAzaxMacro(Interface):
+    def execute(*args, **kwargs):
+        ''
+
+class IAzaxView(Interface):
+    #XXX document all interface
+    def render():
+        ''

From gotcha at codespeak.net  Thu Aug 31 23:47:14 2006
From: gotcha at codespeak.net (gotcha at codespeak.net)
Date: Thu, 31 Aug 2006 23:47:14 +0200 (CEST)
Subject: [Kukit-checkins] r31902 - kukit/azax/trunk
Message-ID: <20060831214714.4DCE010060@code0.codespeak.net>

Author: gotcha
Date: Thu Aug 31 23:47:12 2006
New Revision: 31902

Modified:
   kukit/azax/trunk/azaxview.py
   kukit/azax/trunk/interfaces.py
Log:
macros ; callable from PythonScripts

Modified: kukit/azax/trunk/azaxview.py
==============================================================================
--- kukit/azax/trunk/azaxview.py	(original)
+++ kukit/azax/trunk/azaxview.py	Thu Aug 31 23:47:12 2006
@@ -35,6 +35,12 @@
     from Products.Five import BrowserView
 except ImportError:
     from zope.app.publisher.browser import BrowserView
+
+from zope.interface import implements
+from zope.app import zapi
+
+from interfaces import IAzaxView
+from interfaces import IAzaxMacro
 from commands import AzaxCommands
 
 class AzaxBaseView(BrowserView):
@@ -44,6 +50,8 @@
     generate it out.
     """
     
+    implements(IAzaxView)
+
     def __init__(self, context, request):
         BrowserView.__init__(self, context, request)
         self.commands = AzaxCommands()
@@ -54,8 +62,13 @@
         return self.commands.render(self.request)
 
     def __getattr__(self, name):
-        if hasattr(self.commands, name):
+        if name == '__provides__':
+            raise AttributeError(name)
+        elif hasattr(self.commands, name):
             return getattr(self.commands, name)
         else:
             raise AttributeError(name)
 
+    def executeMacro(self, name, *args, **kwargs):
+        adapter = zapi.getAdapter(self, IAzaxMacro, name)
+        adapter.execute(*args, **kwargs)

Modified: kukit/azax/trunk/interfaces.py
==============================================================================
--- kukit/azax/trunk/interfaces.py	(original)
+++ kukit/azax/trunk/interfaces.py	Thu Aug 31 23:47:12 2006
@@ -92,3 +92,12 @@
 
     def getContent(self):
         ''
+
+class IAzaxMacro(Interface):
+    def execute(*args, **kwargs):
+        ''
+
+class IAzaxView(Interface):
+    #XXX document all interface
+    def render():
+        ''