[KSS-checkins] r50937 - in kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core: . browser docs pluginregistry/browser plugins/core/demo plugins/core/demo/binderclasses plugins/core/demo/binderclasses/selenium_tests plugins/core/demo/binderids plugins/core/demo/binderids/selenium_tests plugins/core/demo/coreplugin plugins/core/demo/parameterfunction plugins/core/demo/selenium_tests tests
reebalazs at codespeak.net
reebalazs at codespeak.net
Wed Jan 23 17:36:21 CET 2008
Author: reebalazs
Date: Wed Jan 23 17:36:19 2008
New Revision: 50937
Added:
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderclasses/
- copied from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderclasses/README
- copied unchanged from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/README
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderclasses/__init__.py
- copied unchanged from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/__init__.py
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderclasses/configure.zcml
- copied unchanged from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/configure.zcml
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderclasses/kss_binder_classes.js
- copied unchanged from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/kss_binder_classes.js
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderclasses/kss_binder_classes.kss
- copied unchanged from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/kss_binder_classes.kss
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderclasses/kss_binder_classes.pt
- copied unchanged from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/kss_binder_classes.pt
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderclasses/selenium_tests/
- copied from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/selenium_tests/
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderclasses/selenium_tests/README.txt
- copied unchanged from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/selenium_tests/README.txt
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderclasses/selenium_tests/binderclasses.html
- copied unchanged from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/selenium_tests/binderclasses.html
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderclasses/zopeconfig.py
- copied unchanged from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/zopeconfig.py
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderids/selenium_tests/binderids.html
- copied unchanged from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderids/selenium_tests/binderids.html
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/0_ecmaunit_tests.html
- copied, changed from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/selenium_tests/0_ecmaunit_tests.html
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/protocol.html
- copied unchanged from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/selenium_tests/protocol.html
Removed:
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/docs/
Modified:
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/browser/errorresponse.pt
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/commands.py
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/pluginregistry/browser/develui.css
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderids/binderids.kss
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderids/binderids.pt
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/configure.zcml
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.kss
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.pt
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/error_handling.kss
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/error_handling.pt
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/more_selectors.js
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/more_selectors.kss
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/more_selectors.pt
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/parameterfunction/forms.kss
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/protocol.pt
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/error_handling.html
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/html_inserts.html
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/more_selectors.html
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/configure-online.zcml
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/kukitresponse_test.pt
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/test_browserview.py
kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/test_kssview_core.py
Log:
Rebase branch on gotcha's last merge
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/browser/errorresponse.pt
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/browser/errorresponse.pt (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/browser/errorresponse.pt Wed Jan 23 17:36:19 2008
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<kukit xmlns="http://www.kukit.org/commands/1.0"
+<kukit xmlns="http://www.kukit.org/commands/1.1"
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal">
<commands>
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/commands.py
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/commands.py (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/commands.py Wed Jan 23 17:36:19 2008
@@ -22,6 +22,7 @@
in the defined format
'''
+from xml.sax.saxutils import escape as xml_escape
from zope.interface import implements
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from interfaces import IKSSCommands, IKSSCommand, IKSSParam, IKSSCommandView
@@ -106,6 +107,16 @@
# just send complex data types directly with AddParam
def addParam(self, name, content=''):
+ # Check for the size of the content. Larger than 4K will give
+ # problems with Firefox (which splits text nodes). Therefore
+ # we give this special treatment.
+ if len(content) > 4096:
+ return self.addCdataParam(name, content)
+ else:
+ # Escape all XML characters
+ return self._addParam(name, content=xml_escape(content))
+
+ def _addParam(self, name, content=''):
'Add the param as is'
param = KSSParam(name, content)
self.params.append(param)
@@ -115,14 +126,14 @@
# Some helpers
#
- def addUnicodeParam(self, name, content=''):
+ def addUnicodeParam(self, name, content=u''):
'Add the param as unicode'
- self.addParam(name, content=content)
+ self.addParam(name, content)
- def addStringParam(self, name, content='', encoding='utf'):
+ def addStringParam(self, name, content='', encoding='utf8'):
'Add the param as an encoded string, by default UTF-8'
- content = unicode(content, 'utf')
- self.addParam(name, content=content)
+ content = unicode(content, encoding)
+ self.addUnicodeParam(name, content=content)
def addHtmlParam(self, name, content=''):
'Add the param as an HTML content.'
@@ -134,12 +145,14 @@
def addXmlParam(self, name, content=''):
'Add the param as XML content'
content = XmlParser(content)().encode('ascii', 'xmlcharrefreplace')
- self.addParam(name, content=content)
+ self._addParam(name, content=content)
def addCdataParam(self, name, content=''):
'Add the param as a CDATA node'
- content = '<![CDATA[%s]]>' % (content, )
- self.addParam(name, content=content)
+ # Replace `>` part of `]]>` with the entity ref so it won't
+ # accidentally close the CDATA (required by the XML spec)
+ content = '<![CDATA[%s]]>' % content.replace(']]>', ']]>')
+ self._addParam(name, content=content)
# --
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/pluginregistry/browser/develui.css
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/pluginregistry/browser/develui.css (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/pluginregistry/browser/develui.css Wed Jan 23 17:36:19 2008
@@ -1,6 +1,30 @@
+html {
+ background-color: white;
+}
+
body {
font-family: Verdana, Arial, sans-serif;
font-size: 11pt;
+ background-color: #FAFAED;
+ border: 1px solid #A8A890;
+ padding: 1em;
+ margin: 3em;
+}
+
+h1, h2, h3, h4, h5, a {
+ color: #FF4916;
+}
+
+h1, h2, h3, h4, h5 {
+ border-bottom: 1px solid #A8A890;
+}
+
+h1 {
+ font-size: 130%;
+}
+
+h2 {
+ font-size: 120%;
}
h3 {
@@ -14,7 +38,7 @@
font-size: 80%;
}
-#global-links ul {
+#global-links ul, #log-reset {
display: table-row;
}
@@ -22,50 +46,54 @@
display: table-cell;
}
-#global-links a {
+#global-links a, #log-reset a {
display: block;
padding: 0.25em;
margin: 0.25em;
- border: 1px solid #FF8888;
- color: #CC0000;
+ border: 1px solid #FF4916;
+ color: #FF4916;
text-decoration: none;
}
#global-links a:hover {
- border-color: #FF0000;
- background-color: #FFCCCC;
+ border-color: #FF4916;
+ background-color: #FF4916;
+ color: white;
}
#target {
padding: 1em;
margin: 0.5em 0;
- border: 1px solid #CCCCCC;
- background-color: #EEEEEE;
+ border: 1px solid #A8A890;
+ background-color: #D8D8C0;
}
.cursorPointer {
cursor: pointer;
}
-.click {
- color: #880000;
+code, .click {
+ color: #FF4916;
}
radio.click {
- background-color: #880000;
+ background-color: #FF4916;
}
a.button, .clickable {
width: auto;
padding: 0.2em;
- border: 1px solid #FF8888;
- color: #CC0000;
+ border: 1px solid #FF4916;
+ color: #FF4916;
text-decoration: none;
font-size: 80%;
+ background-color: #FAFAED;
}
fieldset {
margin: 0.5em 0;
+ border: 2px solid #A8A890;
+ background-color: white;
}
fieldset div {
@@ -74,13 +102,13 @@
.help {
font-size: 80%;
- color: #AAAAAA;
+ color: #A8A890;
}
-.help pre {
+pre {
color: black;
- border: 1px solid #CCCCCC;
- background-color: #EEEEEE;
+ border: 1px solid #A8A890;
+ background-color: #D8D8C0;
padding: 0.5em;
margin: 0.25em;
}
@@ -89,6 +117,14 @@
padding : 1em;
}
+.log {
+ margin: 0;
+ padding: 0.4em;
+ background: #A8A890;
+ color: white;
+ font-style: italic;
+}
+
.production, .error {
color: red;
}
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderids/binderids.kss
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderids/binderids.kss (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderids/binderids.kss Wed Jan 23 17:36:19 2008
@@ -4,17 +4,20 @@
*/
.buttons:click(manual) {
- action-client: alert;
- alert-message: "manual";
+ action-client: insertHTMLAsLastChild;
+ insertHTMLAsLastChild-kssSelector: #logger;
+ insertHTMLAsLastChild-html: "manual";
}
#button1:click(manual2) {
- action-client: alert;
- alert-message: "manual2";
+ action-client: insertHTMLAsLastChild;
+ insertHTMLAsLastChild-kssSelector: #logger;
+ insertHTMLAsLastChild-html: "manual2";
}
.buttons.bindable_by_parm:click(kssAttr(binderid)) {
- action-client: alert;
- alert-message: kssAttr(binderid);
+ action-client: insertHTMLAsLastChild;
+ insertHTMLAsLastChild-kssSelector: #logger;
+ insertHTMLAsLastChild-html: kssAttr(binderid);
}
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderids/binderids.pt
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderids/binderids.pt (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/binderids/binderids.pt Wed Jan 23 17:36:19 2008
@@ -12,8 +12,8 @@
Events bound to different binders will not merge.
(Note that this is not the typical usage
if event ids, only a simple check that it really works.
- )If you click the buttons, you need to
- receive alerts per each event bound.
+ )If you click the buttons, you must
+ receive logs per each event bound.
</p>
<hr/>
@@ -28,6 +28,10 @@
value="button3">
<hr/>
+
+ <br />
+
+ <p metal:use-macro="context/@@body_macros/logger">logger</p>
<p>First we bind an event with id "manual" to each button.
We also bind event with id "manual2" to the first button. Then
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/configure.zcml
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/configure.zcml (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/configure.zcml Wed Jan 23 17:36:19 2008
@@ -16,6 +16,7 @@
<include package=".coreplugin" />
<include package=".binderids" />
<include package=".markup" />
+ <include package=".binderclasses" />
<!--
Set up the demos in the root of this package
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.kss
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.kss (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.kss Wed Jan 23 17:36:19 2008
@@ -1,30 +1,27 @@
#parent-node:click {
evt-click-allowbubbling: true;
evt-click-preventdefault: true;
- action-client: insertHTMLBefore;
- insertHTMLBefore-kssSelector: #log-end;
- insertHTMLBefore-html: "containing DIV. ";
+ action-client: insertHTMLAsLastChild;
+ insertHTMLAsLastChild-kssSelector: #logger;
+ insertHTMLAsLastChild-html: "containing DIV. ";
}
#bubbling-node:click {
evt-click-preventdefault: true;
- action-client: insertHTMLBefore;
- insertHTMLBefore-kssSelector: #log-end;
- insertHTMLBefore-html: "bubbling P. ";
+ action-client: insertHTMLAsLastChild;
+ insertHTMLAsLastChild-kssSelector: #logger;
+ insertHTMLAsLastChild-html: "bubbling P. ";
}
#not-bubbling-node:click {
evt-click-preventdefault: true;
evt-click-preventbubbling: true;
- action-client: insertHTMLBefore;
- insertHTMLBefore-kssSelector: #log-end;
- insertHTMLBefore-html: "not bubbling P. ";
+ action-client: insertHTMLAsLastChild;
+ insertHTMLAsLastChild-kssSelector: #logger;
+ insertHTMLAsLastChild-html: "not bubbling P. ";
}
#log-reset a:click, #log-reset:click {
action-client: clearChildNodes;
clearChildNodes-kssSelector: #logger;
- action-client: insertHTMLAsLastChild;
- insertHTMLAsLastChild-kssSelector: #logger;
- insertHTMLAsLastChild-html: "<p id='log-end'></p>";
}
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.pt
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.pt (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.pt Wed Jan 23 17:36:19 2008
@@ -40,11 +40,6 @@
Some text
</p>
</div>
- <h1>Log</h1>
- <p id="log-reset"><a>Reset log</a></p>
- <p class="log">You clicked :</p>
- <div id="logger" class="log">
- <p id='log-end'></p>
- </div>
+ <p metal:use-macro="context/@@body_macros/logger">logger</p>
</body>
</html>
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/error_handling.kss
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/error_handling.kss (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/error_handling.kss Wed Jan 23 17:36:19 2008
@@ -13,9 +13,9 @@
.handled:click {
- errTest-error: insertHTMLBefore;
- insertHTMLBefore-kssSelector: #log-end;
- insertHTMLBefore-html: "Error handler activated.";
+ errTest-error: insertHTMLAsLastChild;
+ insertHTMLAsLastChild-kssSelector: #logger;
+ insertHTMLAsLastChild-html: "Error handler activated.";
}
/* Spinner control
@@ -41,7 +41,4 @@
#log-reset a:click, #log-reset:click {
action-client: clearChildNodes;
clearChildNodes-kssSelector: #logger;
- action-client: insertHTMLAsLastChild;
- insertHTMLAsLastChild-kssSelector: #logger;
- insertHTMLAsLastChild-html: "<p id='log-end'></p>";
}
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/error_handling.pt
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/error_handling.pt (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/error_handling.pt Wed Jan 23 17:36:19 2008
@@ -64,12 +64,6 @@
their number (currently in 4): click like crazy on the buttons and you will see that
your server will not get hogged. More will be told about this topic in the upcoming
documentation.</p>
- <h1>Log</h1>
- <p id="log-reset"><a>Reset log</a></p>
- <p class="log">Error log :</p>
- <div id="logger" class="log">
- <p id='log-end'></p>
- </div>
-
+ <p metal:use-macro="context/@@body_macros/logger">logger</p>
</body>
</html>
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/more_selectors.js
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/more_selectors.js (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/more_selectors.js Wed Jan 23 17:36:19 2008
@@ -3,9 +3,8 @@
kukit.more_selectors = {};
kukit.more_selectors.AnnoyClickerEvent = function() {
-};
-kukit.more_selectors.AnnoyClickerEvent.prototype.__bind_click__ = function(name, func_to_bind, oper) {
+this.__bind_click__ = function(name, func_to_bind, oper) {
// validate and set parameters
oper.evaluateParameters([], {'count': '3'}, 'annoyClicker event binding');
oper.evalInt('count', 'annoyClicker event binding');
@@ -14,23 +13,25 @@
// overwrite countsomuch
this.countsomuch = oper.parms.count;
this.count = this.countsomuch;
- // Just bind the event via the native event binder
+ // register this as a "click" browser event
oper.parms = {};
- kukit.pl.NativeEventBinder.prototype.__bind__('click', func_to_bind, oper);
+ kukit.pl.registerBrowserEvent(oper, null, 'click');
};
-kukit.more_selectors.AnnoyClickerEvent.prototype.__default_click__ = function(name, oper) {
+this.__default_click__ = function(name, oper) {
oper.evaluateParameters([], {}, 'annoyClicker event binding');
this.count -= 1;
if (this.count == 0) {
// Continue with the real action.
this.count = this.countsomuch;
- this.__continueEvent__('doit', oper.node, {});
+ this.continueEvent('doit', oper.node, {});
} else {
- this.__continueEvent__('annoy', oper.node, {});
+ this.continueEvent('annoy', oper.node, {});
}
};
+};
+
kukit.eventsGlobalRegistry.register('annoyclicker', 'click', kukit.more_selectors.AnnoyClickerEvent, '__bind_click__', '__default_click__');
kukit.eventsGlobalRegistry.register('annoyclicker', 'annoy', kukit.more_selectors.AnnoyClickerEvent, null, null);
kukit.eventsGlobalRegistry.register('annoyclicker', 'doit', kukit.more_selectors.AnnoyClickerEvent, null, null);
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/more_selectors.kss
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/more_selectors.kss (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/more_selectors.kss Wed Jan 23 17:36:19 2008
@@ -1,9 +1,6 @@
#log-reset a:click, #log-reset:click {
action-client: clearChildNodes;
clearChildNodes-kssSelector: #logger;
- action-client: insertHTMLAsLastChild;
- insertHTMLAsLastChild-kssSelector: #logger;
- insertHTMLAsLastChild-html: "<p id='log-end'></p>";
}
#button-one:annoyclicker-click(annoyMe) {
@@ -17,9 +14,9 @@
}
behaviour:annoyclicker-annoy(annoyMe) {
- action-client: insertHTMLBefore;
- insertHTMLBefore-kssSelector: #log-end;
- insertHTMLBefore-html: "Keep trying until you get there. ";
+ action-client: insertHTMLAsLastChild;
+ insertHTMLAsLastChild-kssSelector: #logger;
+ insertHTMLAsLastChild-html: "Keep trying until you get there. ";
}
#button-two:annoyclicker-click(annoyYou) {
@@ -32,7 +29,7 @@
}
behaviour:annoyclicker-annoy(annoyYou) {
- action-client: insertHTMLBefore;
- insertHTMLBefore-kssSelector: #log-end;
- insertHTMLBefore-html: "Keep trying until you get there, from the second button. ";
+ action-client: insertHTMLAsLastChild;
+ insertHTMLAsLastChild-kssSelector: #logger;
+ insertHTMLAsLastChild-html: "Keep trying until you get there, from the second button. ";
}
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/more_selectors.pt
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/more_selectors.pt (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/more_selectors.pt Wed Jan 23 17:36:19 2008
@@ -39,11 +39,6 @@
</div>
<input type="button" id="button-one" value="Do it"/>
<input type="button" id="button-two" value="Do it again"/>
- <h1>Log</h1>
- <p><a id="log-reset">Reset log</a></p>
- <p class="log">You clicked :</p>
- <div id="logger" class="log">
- <p id='log-end'></p>
- </div>
+ <p metal:use-macro="context/@@body_macros/logger">logger</p>
</body>
</html>
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/parameterfunction/forms.kss
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/parameterfunction/forms.kss (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/parameterfunction/forms.kss Wed Jan 23 17:36:19 2008
@@ -1,56 +1,48 @@
#text:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar();
+ action-client: replaceInnerHTML;
+ replaceInnerHTML-kssSelector: "#target";
+ replaceInnerHTML-html: currentFormVar();
}
#text-by-name:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar(text-by-name);
+ action-client: replaceInnerHTML;
+ replaceInnerHTML-kssSelector: "#target";
+ replaceInnerHTML-html: currentFormVar(text-by-name);
}
#text-by-kssname:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar(kssAttr(key1, true));
+ action-client: replaceInnerHTML;
+ replaceInnerHTML-kssSelector: "#target";
+ replaceInnerHTML-html: currentFormVar(kssAttr(key1, true));
}
#textarea:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar();
+ action-client: replaceInnerHTML;
+ replaceInnerHTML-kssSelector: "#target";
+ replaceInnerHTML-html: currentFormVar();
}
#textarea-by-name:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar("textarea-by-name");
+ action-client: replaceInnerHTML;
+ replaceInnerHTML-kssSelector: "#target";
+ replaceInnerHTML-html: currentFormVar("textarea-by-name");
}
#radio1:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar();
+ action-client: replaceInnerHTML;
+ replaceInnerHTML-kssSelector: "#target";
+ replaceInnerHTML-html: currentFormVar();
}
#radio2:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar();
+ action-client: replaceInnerHTML;
+ replaceInnerHTML-kssSelector: "#target";
+ replaceInnerHTML-html: currentFormVar();
}
#radio-by-name:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar(radio-by-name);
+ action-client: replaceInnerHTML;
+ replaceInnerHTML-kssSelector: "#target";
+ replaceInnerHTML-html: currentFormVar(radio-by-name);
}
#fullform-current:click {
@@ -69,10 +61,9 @@
}
#single-select:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar(single-select);
+ action-client: replaceInnerHTML;
+ replaceInnerHTML-kssSelector: "#target";
+ replaceInnerHTML-html: currentFormVar(single-select);
}
#multiple-select:click {
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/protocol.pt
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/protocol.pt (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/protocol.pt Wed Jan 23 17:36:19 2008
@@ -29,6 +29,9 @@
<li><a href="#" id="small-dataset">Small dataset</a></li>
<li><a href="#" id="large-dataset">Large dataset</a></li>
</ol>
+ <div id="dataset-output">
+ The contents of this node will change
+ </div>
<p>Currently kss.core treats non-HTML commands differently from
others. The following examples show why I think this to be a
Copied: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/0_ecmaunit_tests.html (from r50791, kukit/kss.core/trunk/kss/core/plugins/core/demo/selenium_tests/0_ecmaunit_tests.html)
==============================================================================
--- kukit/kss.core/trunk/kss/core/plugins/core/demo/selenium_tests/0_ecmaunit_tests.html (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/0_ecmaunit_tests.html Wed Jan 23 17:36:19 2008
@@ -30,6 +30,11 @@
</tr>
<tr>
<td>assertText</td>
+ <td>//div[@id='kukit.BaseURLTestCase']/div</td>
+ <td>OK!</td>
+</tr>
+<tr>
+ <td>assertText</td>
<td>//div[@id='kukit.RequestManagerTestCase']/div</td>
<td>OK!</td>
</tr>
@@ -50,10 +55,14 @@
</tr>
<tr>
<td>assertText</td>
+ <td>//div[@id='kukit.KssParserValueProvidersCheckTestCase']/div</td>
+ <td>OK!</td>
+</tr>
+<tr>
+ <td>assertText</td>
<td>//div[@id='kukit.KssParserSelectorsTestCase']/div</td>
<td>OK!</td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/error_handling.html
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/error_handling.html (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/error_handling.html Wed Jan 23 17:36:19 2008
@@ -29,6 +29,11 @@
<td>Error handler activated</td>
</tr>
<tr>
+ <td>assertTextNotPresent</td>
+ <td>logger</td>
+ <td>Error handler activated</td>
+</tr>
+<tr>
<td>click</td>
<td>no_error_handler_empty_response</td>
<td></td>
@@ -39,6 +44,11 @@
<td>Error handler activated</td>
</tr>
<tr>
+ <td>assertTextNotPresent</td>
+ <td>logger</td>
+ <td>Error handler activated</td>
+</tr>
+<tr>
<td>click</td>
<td>no_error_handler_error</td>
<td></td>
@@ -49,6 +59,11 @@
<td>Error handler activated</td>
</tr>
<tr>
+ <td>assertTextNotPresent</td>
+ <td>logger</td>
+ <td>Error handler activated</td>
+</tr>
+<tr>
<td>click</td>
<td>no_error_handler_explicit_error</td>
<td></td>
@@ -59,6 +74,11 @@
<td>Error handler activated.</td>
</tr>
<tr>
+ <td>assertTextNotPresent</td>
+ <td>logger</td>
+ <td>Error handler activated.</td>
+</tr>
+<tr>
<td>click</td>
<td>with_error_handler_no_error</td>
<td></td>
@@ -69,6 +89,11 @@
<td>Error handler activated</td>
</tr>
<tr>
+ <td>assertTextNotPresent</td>
+ <td>logger</td>
+ <td>Error handler activated</td>
+</tr>
+<tr>
<td>click</td>
<td>css=#log-reset</td>
<td></td>
@@ -84,6 +109,11 @@
<td>Error handler activated</td>
</tr>
<tr>
+ <td>assertTextNotPresent</td>
+ <td>logger</td>
+ <td>Error handler activated</td>
+</tr>
+<tr>
<td>click</td>
<td>css=#log-reset</td>
<td></td>
@@ -99,6 +129,11 @@
<td>Error handler activated.</td>
</tr>
<tr>
+ <td>assertText</td>
+ <td>logger</td>
+ <td>Error handler activated.</td>
+</tr>
+<tr>
<td>click</td>
<td>css=#log-reset</td>
<td></td>
@@ -113,6 +148,11 @@
<td>logger</td>
<td>Error handler activated.</td>
</tr>
+<tr>
+ <td>assertText</td>
+ <td>logger</td>
+ <td>Error handler activated.</td>
+</tr>
</tbody></table>
</body>
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/html_inserts.html
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/html_inserts.html (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/html_inserts.html Wed Jan 23 17:36:19 2008
@@ -29,6 +29,11 @@
<td>first: KSS for a life.</td>
</tr>
<tr>
+ <td>assertText</td>
+ <td>frame</td>
+ <td>first: KSS for a life.</td>
+</tr>
+<tr>
<td>click</td>
<td>insertAsLastChild</td>
<td></td>
@@ -39,6 +44,11 @@
<td>first: KSS for a life.last:</td>
</tr>
<tr>
+ <td>assertText</td>
+ <td>frame</td>
+ <td>first: KSS for a life.last:</td>
+</tr>
+<tr>
<td>click</td>
<td>insert</td>
<td></td>
@@ -49,6 +59,11 @@
<td>KSS for a life.</td>
</tr>
<tr>
+ <td>assertText</td>
+ <td>frame</td>
+ <td>KSS for a life.</td>
+</tr>
+<tr>
<td>type</td>
<td>text-to-insert</td>
<td>before 1</td>
@@ -64,6 +79,11 @@
<td>KSS for a life. before 1</td>
</tr>
<tr>
+ <td>assertText</td>
+ <td>css=h4+div</td>
+ <td>KSS for a life. before 1</td>
+</tr>
+<tr>
<td>type</td>
<td>text-to-insert</td>
<td>after 1</td>
@@ -78,6 +98,11 @@
<td>css=#frame+div</td>
<td>KSS for a life. after 1</td>
</tr>
+<tr>
+ <td>assertText</td>
+ <td>css=#frame+div</td>
+ <td>KSS for a life. after 1</td>
+</tr>
</tbody></table>
</body>
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/more_selectors.html
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/more_selectors.html (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/plugins/core/demo/selenium_tests/more_selectors.html Wed Jan 23 17:36:19 2008
@@ -25,7 +25,12 @@
</tr>
<tr>
<td>waitForText</td>
- <td>logger</td>
+ <td>logger</td>
+ <td>Keep trying until you get there.</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>logger</td>
<td>Keep trying until you get there.</td>
</tr>
<tr>
@@ -35,7 +40,7 @@
</tr>
<tr>
<td>assertText</td>
- <td>logger</td>
+ <td>logger</td>
<td></td>
</tr>
<tr>
@@ -45,7 +50,12 @@
</tr>
<tr>
<td>waitForText</td>
- <td>logger</td>
+ <td>logger</td>
+ <td>Keep trying until you get there.</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>logger</td>
<td>Keep trying until you get there.</td>
</tr>
<tr>
@@ -59,13 +69,23 @@
<td></td>
</tr>
<tr>
+ <td>assertTextPresent</td>
+ <td>Button button-one clicked.</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>log-reset</td>
<td></td>
</tr>
<tr>
+ <td>waitForText</td>
+ <td>logger</td>
+ <td></td>
+</tr>
+<tr>
<td>assertText</td>
- <td>logger</td>
+ <td>logger</td>
<td></td>
</tr>
<tr>
@@ -75,7 +95,12 @@
</tr>
<tr>
<td>waitForText</td>
- <td>logger</td>
+ <td>logger</td>
+ <td>Keep trying until you get there, from the second button.</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>logger</td>
<td>Keep trying until you get there, from the second button.</td>
</tr>
<tr>
@@ -88,6 +113,11 @@
<td>Button button-two clicked.</td>
<td></td>
</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>Button button-two clicked.</td>
+ <td></td>
+</tr>
</tbody></table>
</body>
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/configure-online.zcml
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/configure-online.zcml (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/configure-online.zcml Wed Jan 23 17:36:19 2008
@@ -12,4 +12,26 @@
permission="zope.Public"
/>
+ <browser:resource
+ file="../kukit/3rd_party/johnnydebris.net/minisax.js/minisax.js"
+ name="minisax.js"
+ />
+
+ <browser:resource
+ file="../kukit/3rd_party/johnnydebris.net/jsbase/string.js"
+ name="jsbase-string.js"
+ />
+
+ <browser:resource
+ file="../kukit/3rd_party/johnnydebris.net/jsbase/array.js"
+ name="jsbase-array.js"
+ />
+
+ <browser:resource
+ file="../kukit/3rd_party/johnnydebris.net/dommer/dommer.js"
+ name="dommer-dommer.js"
+ />
+
+
+
</configure>
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/kukitresponse_test.pt
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/kukitresponse_test.pt (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/kukitresponse_test.pt Wed Jan 23 17:36:19 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<kukit xmlns="http://www.kukit.org/commands/1.0"
+<kukit xmlns="http://www.kukit.org/commands/1.1"
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal">
<commands>
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/test_browserview.py
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/test_browserview.py (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/test_browserview.py Wed Jan 23 17:36:19 2008
@@ -31,7 +31,7 @@
header = response.getHeader('x-ksscommands')
self.assert_('the_&lt;&gt;message' in header) # no < > in the message
self.assert_('\n' not in header) # no /n in the payload: would destroy the page
- self.assertEqual(header, '<?xml version="1.0"?> <kukit xmlns="http://www.kukit.org/commands/1.0"> <commands> \t<command name="error"> \t\t<param name="type">system</param> \t\t<param name="message">TheError: the_&lt;&gt;message </param> \t</command> </commands> </kukit> ')
+ self.assertEqual(header, '<?xml version="1.0"?> <kukit xmlns="http://www.kukit.org/commands/1.1"> <commands> \t<command name="error"> \t\t<param name="type">system</param> \t\t<param name="message">TheError: the_&lt;&gt;message </param> \t</command> </commands> </kukit> ')
def test_suite():
suites = []
Modified: kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/test_kssview_core.py
==============================================================================
--- kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/test_kssview_core.py (original)
+++ kukit/kss.core/branch/ree-1.4-markup-and-syntax-changes/kss/core/tests/test_kssview_core.py Wed Jan 23 17:36:19 2008
@@ -100,7 +100,7 @@
def _wrapped_commands(self, inline):
header = textwrap.dedent(u'''\
<?xml version="1.0" ?>
- <kukit xmlns="http://www.kukit.org/commands/1.0">
+ <kukit xmlns="http://www.kukit.org/commands/1.1">
<commands>
''')
footer = textwrap.dedent('''\
More information about the Kukit-checkins
mailing list