[KSS-checkins] r53778 - in kukit/kss.core/branch/ree-service-layer-and-refactoring: . docs kss/core kss/core/browser kss/core/docs kss/core/pluginregistry/browser kss/core/plugins/core kss/core/plugins/core/demo kss/core/plugins/core/demo/binderclasses kss/core/plugins/core/demo/binderclasses/selenium_tests kss/core/plugins/core/demo/binderids kss/core/plugins/core/demo/binderids/selenium_tests kss/core/plugins/core/demo/coreplugin kss/core/plugins/core/demo/coresyntax kss/core/plugins/core/demo/coresyntax/selenium_tests kss/core/plugins/core/demo/parameterfunction kss/core/plugins/core/demo/parameterfunction/selenium_tests kss/core/plugins/core/demo/selenium_tests kss/core/tests
reebalazs at codespeak.net
reebalazs at codespeak.net
Tue Apr 15 11:36:41 CEST 2008
Author: reebalazs
Date: Tue Apr 15 11:36:37 2008
New Revision: 53778
Added:
kukit/kss.core/branch/ree-service-layer-and-refactoring/docs/
- copied from r53709, kukit/kss.core/trunk/docs/
kukit/kss.core/branch/ree-service-layer-and-refactoring/docs/HISTORY.txt
- copied unchanged from r53709, kukit/kss.core/trunk/docs/HISTORY.txt
kukit/kss.core/branch/ree-service-layer-and-refactoring/docs/INSTALL.txt
- copied unchanged from r53709, kukit/kss.core/trunk/docs/INSTALL.txt
kukit/kss.core/branch/ree-service-layer-and-refactoring/docs/LICENSE.GPL
- copied unchanged from r53709, kukit/kss.core/trunk/docs/LICENSE.GPL
kukit/kss.core/branch/ree-service-layer-and-refactoring/docs/LICENSE.txt
- copied unchanged from r53709, kukit/kss.core/trunk/docs/LICENSE.txt
kukit/kss.core/branch/ree-service-layer-and-refactoring/docs/NEWS.txt
- copied unchanged from r53709, kukit/kss.core/trunk/docs/NEWS.txt
kukit/kss.core/branch/ree-service-layer-and-refactoring/docs/TODO.txt
- copied unchanged from r53709, kukit/kss.core/trunk/docs/TODO.txt
kukit/kss.core/branch/ree-service-layer-and-refactoring/docs/tutorial_part2.rst
- copied unchanged from r53709, kukit/kss.core/trunk/docs/tutorial_part2.rst
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderclasses/
- copied from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderclasses/README
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/README
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderclasses/__init__.py
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/__init__.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderclasses/configure.zcml
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/configure.zcml
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderclasses/kss_binder_classes.js
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/kss_binder_classes.js
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderclasses/kss_binder_classes.kss
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/kss_binder_classes.kss
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderclasses/kss_binder_classes.pt
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/kss_binder_classes.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderclasses/selenium_tests/
- copied from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/selenium_tests/
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderclasses/selenium_tests/README.txt
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/selenium_tests/README.txt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderclasses/selenium_tests/binderclasses.html
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/selenium_tests/binderclasses.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderclasses/zopeconfig.py
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderclasses/zopeconfig.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderids/selenium_tests/binderids.html
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/binderids/selenium_tests/binderids.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/config.py
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/config.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/kss_client_action_alias.kss
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/kss_client_action_alias.kss
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/kss_client_action_alias.pt
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/kss_client_action_alias.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/kss_selector_param_multiprop.kss
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/kss_selector_param_multiprop.kss
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/kss_selector_param_multiprop.pt
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/kss_selector_param_multiprop.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/kss_url_param_multiprop.kss
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/kss_url_param_multiprop.kss
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/kss_url_param_multiprop.pt
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/kss_url_param_multiprop.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/selenium_tests/
- copied from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/selenium_tests/
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/selenium_tests/README.txt
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/selenium_tests/README.txt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/selenium_tests/kss_client_action_alias.html
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/selenium_tests/kss_client_action_alias.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/selenium_tests/kss_selector_param.html
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/selenium_tests/kss_selector_param.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/selenium_tests/kss_selector_param_multiprop.html
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/selenium_tests/kss_selector_param_multiprop.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/selenium_tests/kss_url_param_multiprop.html
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/selenium_tests/kss_url_param_multiprop.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/selenium_tests/urlparam.html
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/selenium_tests/urlparam.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/zopeconfig.py
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/coresyntax/zopeconfig.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/config.py
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/parameterfunction/config.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/kss_form_submit_multiprop.kss
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/parameterfunction/kss_form_submit_multiprop.kss
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/kss_form_submit_multiprop.pt
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/parameterfunction/kss_form_submit_multiprop.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/kssid-UNUSED.kss
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/parameterfunction/kssid-UNUSED.kss
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/kssid-UNUSED.pt
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/parameterfunction/kssid-UNUSED.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/selenium_tests/
- copied from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/parameterfunction/selenium_tests/
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/selenium_tests/README.txt
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/parameterfunction/selenium_tests/README.txt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/selenium_tests/kss_form_submit_multiprop.html
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/parameterfunction/selenium_tests/kss_form_submit_multiprop.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/selenium_tests/pf_forms.html
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/parameterfunction/selenium_tests/pf_forms.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/zopeconfig.py
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/parameterfunction/zopeconfig.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/0_ecmaunit_tests.html
- copied, changed from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/selenium_tests/0_ecmaunit_tests.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/protocol.html
- copied unchanged from r53709, kukit/kss.core/trunk/kss/core/plugins/core/demo/selenium_tests/protocol.html
Removed:
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/docs/
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/kssid.kss
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/kssid.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/kss_selector_param.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/pf_forms.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/urlparam.html
Modified:
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/browser/errorresponse.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/commands.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/concatresource.zcml
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/pluginregistry/browser/develui.css
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/pluginregistry/browser/develui.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/commands.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/configure.zcml
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderids/binderids.kss
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderids/binderids.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderids/config.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/config.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/configure.zcml
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.kss
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/configure.zcml
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/demoview.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/error_handling.kss
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/error_handling.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/form_submit.kss
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/more_selectors.js
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/more_selectors.kss
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/more_selectors.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/configure.zcml
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/forms.kss
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/forms.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/protocol.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/error_handling.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/html_inserts.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/more_selectors.html
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/zopeconfig.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/interfaces.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/tests/configure-online.zcml
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/tests/kukitresponse_test.pt
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/tests/test_browserview.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/tests/test_kssview_core.py
kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/version.txt
kukit/kss.core/branch/ree-service-layer-and-refactoring/setup.py
Log:
Rebase on current trunk.
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/browser/errorresponse.pt
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/browser/errorresponse.pt (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/browser/errorresponse.pt Tue Apr 15 11:36:37 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-service-layer-and-refactoring/kss/core/commands.py
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/commands.py (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/commands.py Tue Apr 15 11:36:37 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-service-layer-and-refactoring/kss/core/concatresource.zcml
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/concatresource.zcml (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/concatresource.zcml Tue Apr 15 11:36:37 2008
@@ -32,6 +32,7 @@
kukit/kukit/oper.js
kukit/kukit/tokenizer.js
kukit/kukit/providerreg.js
+ kukit/kukit/values.js
kukit/kukit/resourcedata.js
kukit/kukit/kssparser.js
kukit/kukit/eventreg.js
@@ -47,6 +48,8 @@
kukit/kukit/plugin.js"
name="kukit.js"
compress_level="safe"
+ caching="memory"
+ lmt_check_period="300"
/>
<!-- Development version -->
@@ -59,6 +62,7 @@
kukit/kukit/oper.js
kukit/kukit/tokenizer.js
kukit/kukit/providerreg.js
+ kukit/kukit/values.js
kukit/kukit/resourcedata.js
kukit/kukit/kssparser.js
kukit/kukit/eventreg.js
@@ -75,7 +79,7 @@
name="kukit-devel.js"
compress_level="devel"
caching="memory"
- lmt_check_period="5"
+ lmt_check_period="0"
/>
<!-- Old source version used by RR -->
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/pluginregistry/browser/develui.css
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/pluginregistry/browser/develui.css (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/pluginregistry/browser/develui.css Tue Apr 15 11:36:37 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-service-layer-and-refactoring/kss/core/pluginregistry/browser/develui.pt
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/pluginregistry/browser/develui.pt (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/pluginregistry/browser/develui.pt Tue Apr 15 11:36:37 2008
@@ -106,7 +106,8 @@
<p>
Current KSS log level is<b>
- <span tal:attributes="class python:loglevel.lower()"
+ <span id="loglevel"
+ tal:attributes="class python:loglevel.lower()"
tal:content="loglevel">DEBUG</span></b>.
</p>
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/commands.py
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/commands.py (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/commands.py Tue Apr 15 11:36:37 2008
@@ -117,10 +117,11 @@
command.addParam('varname', varname)
command.addParam('value', value)
- def triggerEvent(self, name, **kw):
+ def continueEvent(self, name, allnodes=False, **kw):
""" see interfaces.py """
- command = self.commands.addCommand('triggerEvent')
+ command = self.commands.addCommand('continueEvent')
command.addParam('name', name)
+ command.addParam('allnodes', allnodes and 'true' or 'false')
for key, value in kw.iteritems():
command.addParam(key, value)
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/configure.zcml
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/configure.zcml (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/configure.zcml Tue Apr 15 11:36:37 2008
@@ -282,10 +282,10 @@
/>
<kss:action
- name="triggerEvent"
+ name="continueEvent"
command_factory="global"
params_mandatory="name"
- params_optional="id namespace"
+ params_optional="allnodes"
/>
<kss:action
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderids/binderids.kss
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderids/binderids.kss (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderids/binderids.kss Tue Apr 15 11:36:37 2008
@@ -4,17 +4,35 @@
*/
.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: #logger2;
+ insertHTMLAsLastChild-html: "manual2";
}
.buttons.bindable_by_parm:click(kssAttr(binderid, false)) {
- action-client: alert;
- alert-message: kssAttr(binderid);
+ action-client: insertHTMLAsLastChild;
+ insertHTMLAsLastChild-kssSelector: #logger2;
+ insertHTMLAsLastChild-html: kssAttr(binderid);
}
+
+
+
+/* Log control
+*/
+
+#log-reset a:click, #log-reset:click {
+ action-client: clearChildNodes;
+ clearChildNodes-kssSelector: #logger;
+}
+
+#log-reset2 a:click, #log-reset2:click {
+ action-client: clearChildNodes;
+ clearChildNodes-kssSelector: #logger2;
+}
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderids/binderids.pt
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderids/binderids.pt (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderids/binderids.pt Tue Apr 15 11:36:37 2008
@@ -12,8 +12,12 @@
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>
+
+ <p>Two loggers are used, because the order in which the events trigger
+ is undefined and browser dependant.
</p>
<hr/>
@@ -28,6 +32,16 @@
value="button3">
<hr/>
+
+ <br />
+
+ <p metal:use-macro="context/@@body_macros/logger">logger</p>
+
+ <div class="log">
+ <h3>Log 2</h3>
+ <p id="log-reset2"><a class="clickable">Reset</a></p>
+ <div id="logger2"></div>
+ </div>
<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-service-layer-and-refactoring/kss/core/plugins/core/demo/binderids/config.py
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderids/config.py (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/binderids/config.py Tue Apr 15 11:36:37 2008
@@ -1,22 +1,28 @@
-
from kss.base.plugin import Plugin
-from kss.demo.resource import (
- KSSDemo,
- KSSSeleniumTestDirectory,
- )
-
-class CoreDemos(Plugin):
-
- zope_demos = (
- # List your demos here.
- # (Second parameter can be a subcategory within the demo if needed.)
- KSSDemo('', 'Core syntax', 'binderids.html', 'Binder ids'),
-
- )
-
- # directories are relative from the location of this .py file
- zope_selenium_testsuites = (
- # if you only have one test directory, you
- # need not change anything here.
- KSSSeleniumTestDirectory('selenium_tests'),
- )
+
+def core_demos():
+ try:
+ from kss.demo.resource import (
+ KSSDemo,
+ KSSSeleniumTestDirectory,
+ )
+ except ImportError: # no demo package installed
+ return Plugin()
+
+
+ class CoreDemos(Plugin):
+
+ zope_demos = (
+ # List your demos here.
+ # (Second parameter can be a subcategory within the demo if needed.)
+ KSSDemo('', 'Core syntax', 'binderids.html', 'Binder ids'),
+ )
+
+ # directories are relative from the location of this .py file
+ zope_selenium_testsuites = (
+ # if you only have one test directory, you
+ # need not change anything here.
+ KSSSeleniumTestDirectory('selenium_tests'),
+ )
+ return CoreDemos()
+
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/config.py
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/config.py (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/config.py Tue Apr 15 11:36:37 2008
@@ -1,39 +1,42 @@
-
from kss.base.plugin import Plugin
-from kss.demo.resource import (
- KSSDemo,
- KSSSeleniumTestDirectory,
- )
-class CoreDemos(Plugin):
+def core_demos():
+ try:
+ from kss.demo.resource import (
+ KSSDemo,
+ KSSSeleniumTestDirectory,
+ )
+ except ImportError: # no demo package installed
+ return Plugin()
+
+
+ class CoreDemos(Plugin):
- zope_demos = (
- KSSDemo('', '', "basic_commands.html", "Change tag content"),
- KSSDemo('', '', "two_selects.html", "Two selects"),
- KSSDemo('', '', "autoupdate.html", "Auto update"),
- KSSDemo('', '', "inline_edit.html", "Inline edit"),
- KSSDemo('', '', "cancel_submit.html", "Cancel Submit Click"),
- KSSDemo('', '', "tree.html", "Tree"),
- KSSDemo('', '', "more_selectors.html", "More complex selectors"),
- KSSDemo('', '', "two_select_revisited.html", "Master-slave selects revisited"),
- KSSDemo('', '', "form_submit.html", "Form submit"),
- KSSDemo('', '', "error_handling.html", "Error handling"),
- KSSDemo('', '', "preventdefault.html", "Preventdefault (a.k.a. Safari workarounds)"),
- KSSDemo('', '', "html_inserts.html", "HTML insertions (Change tag content returns)"),
- KSSDemo('', '', "client-server-protocol", "Client server protocol"),
- KSSDemo('', 'Parameter functions', 'pf_forms.html', 'Forms'),
- KSSDemo('', 'Selectors', 'selectors.html', 'Parent node selector'),
- KSSDemo('', 'Core syntax', "kss_selector_param.html", "Kss selector parameters"),
- KSSDemo('', 'Core syntax', "kss_url_param.html", "Kss url parameters"),
- KSSDemo('', 'Core events', "kss_evt_preventbubbling.html", "Prevent bubbling KSS event parameter"),
- KSSDemo('', 'Core events', "kss_keyevents.html", "Key events"),
- KSSDemo('', 'Commands/Actions', "ca_focus.html", "Focus"),
- KSSDemo('', 'Commands/Actions', "actions.html", "Toggle case action"),
- # XXX this should go to the other plugin wuth all its stuff
- KSSDemo('Effects', '', "effects.html", "Effects"),
- )
+ zope_demos = (
+ KSSDemo('', '', "basic_commands.html", "Change tag content"),
+ KSSDemo('', '', "two_selects.html", "Two selects"),
+ KSSDemo('', '', "autoupdate.html", "Auto update"),
+ KSSDemo('', '', "inline_edit.html", "Inline edit"),
+ KSSDemo('', '', "cancel_submit.html", "Cancel Submit Click"),
+ KSSDemo('', '', "tree.html", "Tree"),
+ KSSDemo('', '', "more_selectors.html", "More complex selectors"),
+ KSSDemo('', '', "two_select_revisited.html", "Master-slave selects revisited"),
+ KSSDemo('', '', "form_submit.html", "Form submit"),
+ KSSDemo('', '', "error_handling.html", "Error handling"),
+ KSSDemo('', '', "preventdefault.html", "Preventdefault (a.k.a. Safari workarounds)"),
+ KSSDemo('', '', "html_inserts.html", "HTML insertions (Change tag content returns)"),
+ KSSDemo('', '', "client-server-protocol", "Client server protocol"),
+ KSSDemo('', 'Selectors', 'selectors.html', 'Parent node selector'),
+ KSSDemo('', 'Core events', "kss_evt_preventbubbling.html", "Prevent bubbling KSS event parameter"),
+ KSSDemo('', 'Core events', "kss_keyevents.html", "Key events"),
+ KSSDemo('', 'Commands/Actions', "ca_focus.html", "Focus"),
+ KSSDemo('', 'Commands/Actions', "actions.html", "Toggle case action"),
+ # XXX this should go to the other plugin wuth all its stuff
+ KSSDemo('Effects', '', "effects.html", "Effects"),
+ )
- # directories are relative from the location of this .py file
- zope_selenium_testsuites = (
- KSSSeleniumTestDirectory('selenium_tests'),
- )
+ # directories are relative from the location of this .py file
+ zope_selenium_testsuites = (
+ KSSSeleniumTestDirectory('selenium_tests'),
+ )
+ return CoreDemos()
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/configure.zcml
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/configure.zcml (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/configure.zcml Tue Apr 15 11:36:37 2008
@@ -15,6 +15,7 @@
<include package=".coresyntax" />
<include package=".coreplugin" />
<include package=".binderids" />
+ <include package=".binderclasses" />
<!--
Set up the demos in the root of this package
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.kss
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.kss (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.kss Tue Apr 15 11:36:37 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-service-layer-and-refactoring/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.pt
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.pt (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coreplugin/kss_evt_preventbubbling.pt Tue Apr 15 11:36:37 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-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/configure.zcml
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/configure.zcml (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/coresyntax/configure.zcml Tue Apr 15 11:36:37 2008
@@ -1,8 +1,19 @@
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
i18n_domain="kss"
>
+ <!-- Set up the demo utility -->
+ <configure zcml:condition="have kss_demo_version_1_2">
+ <utility
+ name="coresyntax"
+ factory=".zopeconfig.KSSCoreSyntaxDemos"
+ provides="kss.demo.interfaces.IKSSDemoResource"
+ permission="zope.Public"
+ />
+ </configure>
+
<!-- selector parameter -->
<browser:page
@@ -17,6 +28,21 @@
name="kss_selector_param.kss"
/>
+ <!-- selector parameter with multi property-->
+
+ <browser:page
+ for="kss.demo.interfaces.ISimpleContent"
+ template="kss_selector_param_multiprop.pt"
+ name="kss_selector_param_multiprop.html"
+ permission="zope.View"
+ />
+
+ <browser:resource
+ file="kss_selector_param_multiprop.kss"
+ name="kss_selector_param_multiprop.kss"
+ />
+
+
<!-- url parameter -->
<browser:page
@@ -55,5 +81,33 @@
name="kss_url_param.kss"
/>
+ <!-- url parameter with multi property -->
+
+ <browser:page
+ for="kss.demo.interfaces.ISimpleContent"
+ template="kss_url_param_multiprop.pt"
+ name="kss_url_param_multiprop.html"
+ permission="zope.View"
+ />
+
+ <browser:resource
+ file="kss_url_param_multiprop.kss"
+ name="kss_url_param_multiprop.kss"
+ />
+
+
+ <!-- client action aliases -->
+ <browser:page
+ for="kss.demo.interfaces.ISimpleContent"
+ template="kss_client_action_alias.pt"
+ name="kss_client_action_alias.html"
+ permission="zope.View"
+ />
+
+ <browser:resource
+ file="kss_client_action_alias.kss"
+ name="kss_client_action_alias.kss"
+ />
+
</configure>
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/demoview.py
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/demoview.py (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/demoview.py Tue Apr 15 11:36:37 2008
@@ -136,9 +136,9 @@
self.getCommandSet('core').replaceHTML('select#%s' % slaveid, ' '.join(result))
return self.render()
- def formSubmitSave(self, data):
+ def formSubmitSave(self):
result = ['<p>Async saved:</p><table><th>Name:</th><th>Value:</th>']
- for key, value in data.items():
+ for key, value in self.request.form.items():
result.append('<tr><td>%s</td><td>%s</td></tr>' % (key, value))
result.append('</table>')
# We need to make unicode. But on Z2 we receive utf-8, on Z3 unicode
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/error_handling.kss
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/error_handling.kss (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/error_handling.kss Tue Apr 15 11:36:37 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-service-layer-and-refactoring/kss/core/plugins/core/demo/error_handling.pt
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/error_handling.pt (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/error_handling.pt Tue Apr 15 11:36:37 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-service-layer-and-refactoring/kss/core/plugins/core/demo/form_submit.kss
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/form_submit.kss (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/form_submit.kss Tue Apr 15 11:36:37 2008
@@ -1,5 +1,5 @@
input#submit:click {
evt-click-preventdefault: true;
action-server: formSave;
- formSave-data: currentForm();
+ formSave-kssSubmitForm: currentForm();
}
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/more_selectors.js
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/more_selectors.js (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/more_selectors.js Tue Apr 15 11:36:37 2008
@@ -3,9 +3,8 @@
kukit.more_selectors = {};
kukit.more_selectors.AnnoyClickerEvent = function() {
-};
-kukit.more_selectors.AnnoyClickerEvent.prototype.__bind_click__ = function(oper) {
+this.__bind_click__ = function(oper) {
// validate and set parameters
oper.evaluateParameters([], {'count': '3'}, 'annoyClicker event binding');
oper.evalInt('count', 'annoyClicker event binding');
@@ -19,18 +18,19 @@
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__('annoyclicker-doit', oper.node, {});
+ this.continueEvent('annoyclicker-doit', oper.node, {});
} else {
- this.__continueEvent__('annoyclicker-annoy', oper.node, {});
+ this.continueEvent('annoyclicker-annoy', oper.node, {});
}
};
+};
kukit.eventsGlobalRegistry.registerForAllEvents('annoyclicker', 'click', kukit.more_selectors.AnnoyClickerEvent, '__bind_click__', '__default_click__', 'Each');
kukit.eventsGlobalRegistry.registerForAllEvents('annoyclicker', 'annoy', kukit.more_selectors.AnnoyClickerEvent, null, null, 'Each');
kukit.eventsGlobalRegistry.registerForAllEvents('annoyclicker', 'doit', kukit.more_selectors.AnnoyClickerEvent, null, null, 'Each');
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/more_selectors.kss
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/more_selectors.kss (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/more_selectors.kss Tue Apr 15 11:36:37 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-service-layer-and-refactoring/kss/core/plugins/core/demo/more_selectors.pt
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/more_selectors.pt (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/more_selectors.pt Tue Apr 15 11:36:37 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 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-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/configure.zcml
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/configure.zcml (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/configure.zcml Tue Apr 15 11:36:37 2008
@@ -1,8 +1,20 @@
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
i18n_domain="kss"
>
+ <!-- Set up the demo utility -->
+ <configure zcml:condition="have kss_demo_version_1_2">
+ <utility
+ name="coreproviders"
+ factory=".zopeconfig.ValueProviderDemos"
+ provides="kss.demo.interfaces.IKSSDemoResource"
+ permission="zope.Public"
+ />
+ </configure>
+
+
<!-- forms -->
<browser:page
for="kss.demo.interfaces.ISimpleContent"
@@ -40,5 +52,19 @@
permission="zope.View"
/>
+
+ <!-- Form submit, with multiple properties -->
+ <browser:page
+ for="kss.demo.interfaces.ISimpleContent"
+ template="kss_form_submit_multiprop.pt"
+ name="kss_form_submit_multiprop.html"
+ permission="zope.View"
+ />
+
+ <browser:resource
+ file="kss_form_submit_multiprop.kss"
+ name="kss_form_submit_multiprop.kss"
+ />
+
</configure>
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/forms.kss
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/forms.kss (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/forms.kss Tue Apr 15 11:36:37 2008
@@ -1,69 +1,60 @@
#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-simple:click {
- action-server: submitFullForm;
- submitFullForm-form: currentForm();
-}
-
-#fullform-simplenamed:click {
- action-server: submitFullForm;
- submitFullForm-form: form(full1);
+#fullform-current:click {
+ action-server: submitFullFormIntoRequest;
+ submitFullFormIntoRequest-kssSubmitForm: currentForm();
}
-#fullform-current:click {
+#fullform-disabled:click {
+ action-client: setAttribute;
+ setAttribute-kssSelector: "#value1";
+ setAttribute-name: disabled;
+ setAttribute-value: true;
action-server: submitFullFormIntoRequest;
submitFullFormIntoRequest-kssSubmitForm: currentForm();
}
@@ -79,10 +70,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-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/forms.pt
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/forms.pt (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/forms.pt Tue Apr 15 11:36:37 2008
@@ -143,24 +143,14 @@
<code>form(full1)</code> with simple field names, named form
</h3>
<div class="help">
- Click the button.
+ Removed after deprecation.
+ </div>
+ <h3>
+ <code>currentForm()</code> with simple field names
+ </h3>
+ <div class="help">
+ Removed after deprecation.
</div>
- <a class="button click cursorPointer" id="fullform-simplenamed">Click me !</a>
- <form name="full1">
- <fieldset>
- <h3>
- <code>currentForm()</code> with simple field names
- </h3>
- <div class="help">
- Click the button.
- </div>
- <a class="button click cursorPointer" id="fullform-simple">Click me !</a>
- <input class="click cursorPointer"
- type="text" name="value1" value="first value" />
- <input class="click cursorPointer"
- type="text" name="value2" value="second value"/>
- </fieldset>
- </form>
<h3>
<code>xxx-kssSubmitForm: form(full2)</code> with complex field names, named form
</h3>
@@ -169,7 +159,7 @@
</div>
<a class="button click cursorPointer" id="fullform-named">Click me !</a>
<h3>
- <code>xxx-kssSubmitForm: 'field2'</code> with complex field names, named form, given as string
+ <code>xxx-kssSubmitForm: 'full2'</code> with complex field names, named form, given as string
</h3>
<div class="help">
Click the button.
@@ -183,19 +173,16 @@
Click the button.
</div>
<a class="button click cursorPointer" id="fullform-current" href="#">Click me !</a>
+ <a class="button click cursorPointer" id="fullform-disabled" href="#">Click me !</a>
<fieldset>
value1:
- <input class="click cursorPointer"
- type="text" name="value1" value="value1" />
+ <input id="value1" type="text" name="value1" value="value1" />
value2:
- <input class="click cursorPointer"
- type="text" name="value2" value="value2"/>
+ <input type="text" name="value2" value="value2"/>
<br>
listval:
- <input class="click cursorPointer"
- type="text" name="listval:list" value="listval1"/>
- <input class="click cursorPointer"
- type="text" name="listval:list" value="listval2"/>
+ <input type="text" name="listval:list" value="listval1"/>
+ <input type="text" name="listval:list" value="listval2"/>
<br>
listval with multiselect:
<select name="multiple-select:list" multiple="multiple">
@@ -204,20 +191,14 @@
<option selected="selected">Value 3</option>
</select>
recordval:
- <input class="click cursorPointer"
- type="text" name="recordval.a:record" value="recordval_a"/>
- <input class="click cursorPointer"
- type="text" name="recordval.b:record" value="recordval_b"/>
+ <input type="text" name="recordval.a:record" value="recordval_a"/>
+ <input type="text" name="recordval.b:record" value="recordval_b"/>
<br>
recordsval:
- <input class="click cursorPointer"
- type="text" name="recordsval.a:records" value="recordval_a_1"/>
- <input class="click cursorPointer"
- type="text" name="recordsval.b:records" value="recordval_b_1"/>
- <input class="click cursorPointer"
- type="text" name="recordsval.a:records" value="recordval_a_2"/>
- <input class="click cursorPointer"
- type="text" name="recordsval.b:records" value="recordval_b_2"/>
+ <input type="text" name="recordsval.a:records" value="recordval_a_1"/>
+ <input type="text" name="recordsval.b:records" value="recordval_b_1"/>
+ <input type="text" name="recordsval.a:records" value="recordval_a_2"/>
+ <input type="text" name="recordsval.b:records" value="recordval_b_2"/>
</fieldset>
</form>
Deleted: /kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/kssid.kss
==============================================================================
--- /kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/kssid.kss Tue Apr 15 11:36:37 2008
+++ (empty file)
@@ -1,91 +0,0 @@
-#text:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar();
-}
-
-#text-by-name:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar(text-by-name);
-}
-
-#text-by-kssname:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar(kssAttr(key1, true));
-}
-#textarea:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar();
-}
-
-#textarea-by-name:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar("textarea-by-name");
-}
-
-#radio1:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar();
-}
-
-#radio2:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar();
-}
-
-#radio-by-name:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar(radio-by-name);
-}
-
-#fullform-simple:click {
- action-server: submitFullForm;
- submitFullForm-form: currentForm();
-}
-
-#fullform-simplenamed:click {
- action-server: submitFullForm;
- submitFullForm-form: form(full1);
-}
-
-#fullform-current:click {
- action-server: submitFullFormIntoRequest;
- submitFullFormIntoRequest-kssSubmitForm: currentForm();
-}
-
-#fullform-named:click {
- action-server: submitFullFormIntoRequest;
- submitFullFormIntoRequest-kssSubmitForm: form(full2);
-}
-
-#fullform-namedbystring:click {
- action-server: submitFullFormIntoRequest;
- submitFullFormIntoRequest-kssSubmitForm: 'full2';
-}
-
-#single-select:click {
- action-client: executeCommand;
- executeCommand-name: replaceInnerHTML;
- executeCommand-selector: "#target";
- executeCommand-html: currentFormVar(single-select);
-}
-
-#multiple-select:click {
- action-server: submitMultiSelect;
- submitMultiSelect-items: currentFormVar(multiple-select);
-}
Deleted: /kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/kssid.pt
==============================================================================
--- /kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/parameterfunction/kssid.pt Tue Apr 15 11:36:37 2008
+++ (empty file)
@@ -1,224 +0,0 @@
-<html>
- <head>
- <link rel="kinetic-stylesheet" type="text/css"
- tal:attributes="href
- string:${context/@@absolute_url}/++resource++forms.kss"/>
- <metal:header use-macro="context/@@header_macros/header_resources" />
- </head>
- <body>
- <div id="global-links">
- <ul>
- <li><a href=".">All demos</a></li>
- <li><a href="javascript:void(createLoggingPane(true))">Show logging
- pane</a></li>
- <li><a href="./++resource++forms.kss">View KSS resource</a></li>
- </ul>
- </div>
- <h2>Forms</h2>
- <p>We test the parameter functions related to forms : those functions
- extract values from fields to use them in the kinetic stylesheet.</p>
- <p>The inner HTML of the <code>div</code> below will be replaced with the
- value of the form element.</p>
- <div id="target">Target</div>
- <form name="main">
- <h3>
- <code>currentFormVar()</code> with text field.
- </h3>
- <div class="help">
- Click the text field.
- </div>
- <fieldset>
- <input class="click cursorPointer"
- id="text"
- type="text" name="text" value="text" />
- </fieldset>
- <h3>
- <code>currentFormVar(name)</code> with text field.
- </h3>
- <div class="help">
- Click the button.
- </div>
- <fieldset>
- <div>
- <a class="button click cursorPointer" id="text-by-name">Click me !</a>
- <input type="text" name="text-by-name" value="text-by-name" />
- </div>
- </fieldset>
- <h3>
- <code>currentFormVar(kssAttr('name'))</code> with text field.
- </h3>
- <div class="help">
- Click the button.
- </div>
- <fieldset>
- <div class="kssattr-key1-text-by-kssname">
- <a class="button click cursorPointer " id="text-by-kssname">Click me !</a>
- <input type="text" name="text-by-kssname" value="text-by-kssname" />
- </div>
- </fieldset>
-
- <h3>
- <code>currentFormVar()</code> with textarea field.
- </h3>
- <div class="help">
- Click the textarea field.
- </div>
- <fieldset>
- <textarea class="click cursorPointer"
- id="textarea"
- name="textarea">textarea</textarea>
- </fieldset>
- <h3>
- <code>currentFormVar(name)</code> with textarea field.
- </h3>
- <div class="help">
- Click the button.
- </div>
- <fieldset>
- <div>
- <a class="button click cursorPointer" id="textarea-by-name">Click me !</a>
- <textarea name="textarea-by-name">textarea-by-name</textarea>
- </div>
- </fieldset>
- <h3>
- <code>currentFormVar()</code> with radio field.
- </h3>
- <div class="help">
- Click one of the radio buttons.
- </div>
- <fieldset>radio-1
- <input class="click cursorPointer"
- id="radio1"
- type="radio" name="radio" value="radio-1" />
- radio-2
- <input class="click cursorPointer"
- id="radio2"
- type="radio" name="radio" value="radio-2" />
- </fieldset>
- <h3>
- <code>currentFormVar(name)</code> with radio field.
- </h3>
- <div class="help">
- Click the button.
- </div>
- <fieldset>
- <a class="button click cursorPointer" id="radio-by-name">Click me !</a>
- radio-1
- <input class="click cursorPointer"
- type="radio" name="radio-by-name" value="radio-1" />
- radio-2
- <input class="click cursorPointer"
- type="radio" name="radio-by-name" value="radio-2"
- checked="checked" />
- </fieldset>
-
- <h3>
- <code>currentFormVar(name)</code> with select field.
- </h3>
- <div class="help">
- Click the button.
- </div>
- <fieldset>
- <a class="button click cursorPointer" id="single-select">Click me !</a>
- <select name="single-select">
- <option>Value 1</option>
- <option>Value 2</option>
- <option>Value 3</option>
- </select>
- </fieldset>
-
- <h3>
- <code>currentFormVar(name)</code> with multiple select field.
- </h3>
- <div class="help">
- Click the button.
- </div>
- <fieldset>
- <a class="button click cursorPointer" id="multiple-select">Click me !</a>
- <select name="multiple-select" multiple="multiple">
- <option>Value 1</option>
- <option>Value 2</option>
- <option>Value 3</option>
- </select>
- </fieldset>
-
- </form>
- <h3>
- <code>form(full1)</code> with simple field names, named form
- </h3>
- <div class="help">
- Click the button.
- </div>
- <a class="button click cursorPointer" id="fullform-simplenamed">Click me !</a>
- <form name="full1">
- <fieldset>
- <h3>
- <code>currentForm()</code> with simple field names
- </h3>
- <div class="help">
- Click the button.
- </div>
- <a class="button click cursorPointer" id="fullform-simple">Click me !</a>
- <input class="click cursorPointer"
- type="text" name="value1" value="first value" />
- <input class="click cursorPointer"
- type="text" name="value2" value="second value"/>
- </fieldset>
- </form>
- <h3>
- <code>xxx-kssSubmitForm: form(full2)</code> with complex field names, named form
- </h3>
- <div class="help">
- Click the button.
- </div>
- <a class="button click cursorPointer" id="fullform-named">Click me !</a>
- <h3>
- <code>xxx-kssSubmitForm: 'field2'</code> with complex field names, named form, given as string
- </h3>
- <div class="help">
- Click the button.
- </div>
- <a class="button click cursorPointer" id="fullform-namedbystring">Click me !</a>
- <form name="full2">
- <h3>
- <code>xxx-kssSubmitForm: currentForm()</code> with complex field names
- </h3>
- <div class="help">
- Click the button.
- </div>
- <a class="button click cursorPointer" id="fullform-current">Click me !</a>
- <fieldset>
- value1:
- <input class="click cursorPointer"
- type="text" name="value1" value="value1" />
- value2:
- <input class="click cursorPointer"
- type="text" name="value2" value="value2"/>
- <br>
- listval:
- <input class="click cursorPointer"
- type="text" name="listval:list" value="listval1"/>
- <input class="click cursorPointer"
- type="text" name="listval:list" value="listval2"/>
- <br>
- recordval:
- <input class="click cursorPointer"
- type="text" name="recordval.a:record" value="recordval_a"/>
- <input class="click cursorPointer"
- type="text" name="recordval.b:record" value="recordval_b"/>
- <br>
- recordsval:
- <input class="click cursorPointer"
- type="text" name="recordsval.a:records" value="recordval_a_1"/>
- <input class="click cursorPointer"
- type="text" name="recordsval.b:records" value="recordval_b_1"/>
- <input class="click cursorPointer"
- type="text" name="recordsval.a:records" value="recordval_a_2"/>
- <input class="click cursorPointer"
- type="text" name="recordsval.b:records" value="recordval_b_2"/>
- </fieldset>
- </form>
-
-
- </body>
-</html>
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/protocol.pt
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/protocol.pt (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/protocol.pt Tue Apr 15 11:36:37 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-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/0_ecmaunit_tests.html (from r53709, 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-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/0_ecmaunit_tests.html Tue Apr 15 11:36:37 2008
@@ -63,6 +63,26 @@
<td>//div[@id='kukit.KssParserSelectorsTestCase']/div</td>
<td>OK!</td>
</tr>
+<tr>
+ <td>assertText</td>
+ <td>//div[@id='kukit.InterfacesTestCase']/div</td>
+ <td>OK!</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>//div[@id='kukit.ServiceInterfacesTestCase']/div</td>
+ <td>OK!</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>//div[@id='kukit.PluginInterfacesTestCase']/div</td>
+ <td>OK!</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>//div[@id='kukit.ErrorsTestCase']/div</td>
+ <td>OK!</td>
+</tr>
</tbody></table>
</body>
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/error_handling.html
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/error_handling.html (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/error_handling.html Tue Apr 15 11:36:37 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-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/html_inserts.html
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/html_inserts.html (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/html_inserts.html Tue Apr 15 11:36:37 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>
Deleted: /kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/kss_selector_param.html
==============================================================================
--- /kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/kss_selector_param.html Tue Apr 15 11:36:37 2008
+++ (empty file)
@@ -1,109 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>kss_selector_param</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">kss_selector_param</td></tr>
-</thead><tbody>
-<tr>
- <td>open</td>
- <td>/demo/kss_selector_param.html</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>button_1</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForValue</td>
- <td>button_2</td>
- <td>RESET ME</td>
-</tr>
-<tr>
- <td>assertValue</td>
- <td>button_2</td>
- <td>RESET ME</td>
-</tr>
-<tr>
- <td>click</td>
- <td>button_2</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForValue</td>
- <td>button_2</td>
- <td>Watch me</td>
-</tr>
-<tr>
- <td>assertValue</td>
- <td>button_2</td>
- <td>Watch me</td>
-</tr>
-<tr>
- <td>click</td>
- <td>button_3</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForValue</td>
- <td>button_4</td>
- <td>RESET ME</td>
-</tr>
-<tr>
- <td>assertValue</td>
- <td>button_4</td>
- <td>RESET ME</td>
-</tr>
-<tr>
- <td>click</td>
- <td>button_4</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForValue</td>
- <td>button_4</td>
- <td>Watch me</td>
-</tr>
-<tr>
- <td>assertValue</td>
- <td>button_4</td>
- <td>Watch me</td>
-</tr>
-<tr>
- <td>click</td>
- <td>button_5</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForValue</td>
- <td>button_6</td>
- <td>RESET ME</td>
-</tr>
-<tr>
- <td>assertValue</td>
- <td>button_6</td>
- <td>RESET ME</td>
-</tr>
-<tr>
- <td>click</td>
- <td>button_6</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForValue</td>
- <td>button_6</td>
- <td>Watch me</td>
-</tr>
-<tr>
- <td>assertValue</td>
- <td>button_6</td>
- <td>Watch me</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/more_selectors.html
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/more_selectors.html (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/more_selectors.html Tue Apr 15 11:36:37 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>
Deleted: /kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/pf_forms.html
==============================================================================
--- /kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/pf_forms.html Tue Apr 15 11:36:37 2008
+++ (empty file)
@@ -1,134 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>pf_forms</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">pf_forms</td></tr>
-</thead><tbody>
-<tr>
- <td>open</td>
- <td>/demo/pf_forms.html</td>
- <td></td>
-</tr>
-<tr>
- <td>assertElementPresent</td>
- <td>target</td>
- <td></td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>target</td>
- <td>Target</td>
-</tr>
-<tr>
- <td>click</td>
- <td>text</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForText</td>
- <td>target</td>
- <td>text</td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>target</td>
- <td>text</td>
-</tr>
-<tr>
- <td>click</td>
- <td>text-by-name</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForText</td>
- <td>target</td>
- <td>text-by-name</td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>target</td>
- <td>text-by-name</td>
-</tr>
-<tr>
- <td>click</td>
- <td>textarea</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForText</td>
- <td>target</td>
- <td>textarea</td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>target</td>
- <td>textarea</td>
-</tr>
-<tr>
- <td>click</td>
- <td>textarea-by-name</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForText</td>
- <td>target</td>
- <td>textarea-by-name</td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>target</td>
- <td>textarea-by-name</td>
-</tr>
-<tr>
- <td>click</td>
- <td>radio1</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForText</td>
- <td>target</td>
- <td>radio-1</td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>target</td>
- <td>radio-1</td>
-</tr>
-<tr>
- <td>click</td>
- <td>radio-by-name</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForText</td>
- <td>target</td>
- <td>radio-2</td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>target</td>
- <td>radio-2</td>
-</tr>
-<tr>
- <td>click</td>
- <td>fullform-current</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForText</td>
- <td>target</td>
- <td>[('listval', ['listval1', 'listval2']), ('multiple-select', ['Value 1', 'Value 3']), ('recordsval', [{'a': 'recordval_a_1', 'b': 'recordval_b_1'}, {'a': 'recordval_a_2', 'b': 'recordval_b_2'}]), ('recordval', {'a': 'recordval_a', 'b': 'recordval_b'}), ('value1', 'value1'), ('value2', 'value2')]</td>
-</tr>
-<tr>
- <td>verifyTextPresent</td>
- <td>[('listval', ['listval1', 'listval2']), ('multiple-select', ['Value 1', 'Value 3']), ('recordsval', [{'a': 'recordval_a_1', 'b': 'recordval_b_1'}, {'a': 'recordval_a_2', 'b': 'recordval_b_2'}]), ('recordval', {'a': 'recordval_a', 'b': 'recordval_b'}), ('value1', 'value1'), ('value2', 'value2')]</td>
- <td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
Deleted: /kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/urlparam.html
==============================================================================
--- /kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/selenium_tests/urlparam.html Tue Apr 15 11:36:37 2008
+++ (empty file)
@@ -1,69 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>urlparam</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">urlparam</td></tr>
-</thead><tbody>
-<tr>
- <td>open</td>
- <td>/demo/kss_url_param.html</td>
- <td></td>
-</tr>
-<tr>
- <td>assertElementPresent</td>
- <td>target</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>button_1</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForTextPresent</td>
- <td>Method 1 called</td>
- <td></td>
-</tr>
-<tr>
- <td>assertTextPresent</td>
- <td>Method 1 called</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>button_2</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForTextPresent</td>
- <td>Method 2 called</td>
- <td></td>
-</tr>
-<tr>
- <td>assertTextPresent</td>
- <td>Method 2 called</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>button_3</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForTextPresent</td>
- <td>Method 3 called</td>
- <td></td>
-</tr>
-<tr>
- <td>assertTextPresent</td>
- <td>Method 3 called</td>
- <td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/zopeconfig.py
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/zopeconfig.py (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/demo/zopeconfig.py Tue Apr 15 11:36:37 2008
@@ -18,6 +18,7 @@
implements(IResource)
demos = (
+ KSSDemo('', '', "loglevel.html", "Log Level"),
KSSDemo('', '', "basic_commands.html", "Change tag content"),
KSSDemo('', '', "two_selects.html", "Two selects"),
KSSDemo('', '', "autoupdate.html", "Auto update"),
@@ -33,10 +34,7 @@
KSSDemo('', '', "html_inserts.html", "HTML insertions (Change tag content returns)"),
KSSDemo('', '', "client-server-protocol", "Client server protocol"),
## KSSDemo('', '', "draganddrop.html", "Scriptaculous drag and drop"),
- KSSDemo('', 'Parameter functions', 'pf_forms.html', 'Forms'),
KSSDemo('', 'Selectors', 'selectors.html', 'Parent node selector'),
- KSSDemo('', 'Core syntax', "kss_selector_param.html", "Kss selector parameters"),
- KSSDemo('', 'Core syntax', "kss_url_param.html", "Kss url parameters"),
KSSDemo('', 'Core events', "kss_evt_preventbubbling.html", "Prevent bubbling KSS event parameter"),
KSSDemo('', 'Core events', "kss_keyevents.html", "Key events"),
KSSDemo('', 'Commands/Actions', "ca_focus.html", "Focus"),
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/interfaces.py
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/interfaces.py (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/plugins/core/interfaces.py Tue Apr 15 11:36:37 2008
@@ -76,7 +76,7 @@
def setStateVar(varname, value):
"""Set a client side kukit variable"""
- def triggerEvent(name, **kw):
+ def continueEvent(name, allnodes=False, **kw):
"""Trigger an event on the client """
# TODO: explain a bit better what this does
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/tests/configure-online.zcml
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/tests/configure-online.zcml (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/tests/configure-online.zcml Tue Apr 15 11:36:37 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-service-layer-and-refactoring/kss/core/tests/kukitresponse_test.pt
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/tests/kukitresponse_test.pt (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/tests/kukitresponse_test.pt Tue Apr 15 11:36:37 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-service-layer-and-refactoring/kss/core/tests/test_browserview.py
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/tests/test_browserview.py (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/tests/test_browserview.py Tue Apr 15 11:36:37 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-service-layer-and-refactoring/kss/core/tests/test_kssview_core.py
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/tests/test_kssview_core.py (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/tests/test_kssview_core.py Tue Apr 15 11:36:37 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('''\
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/version.txt
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/version.txt (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/kss/core/version.txt Tue Apr 15 11:36:37 2008
@@ -1 +1 @@
-1.4dev unreleased
+1.5dev unreleased
Modified: kukit/kss.core/branch/ree-service-layer-and-refactoring/setup.py
==============================================================================
--- kukit/kss.core/branch/ree-service-layer-and-refactoring/setup.py (original)
+++ kukit/kss.core/branch/ree-service-layer-and-refactoring/setup.py Tue Apr 15 11:36:37 2008
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import sys, os
-version = '1.4'
+version = '1.5'
setup(name='kss.core',
version=version,
More information about the Kukit-checkins
mailing list