[KSS-checkins] r51209 - in kukit/kss.zope/trunk: . kss/zope kss/zope/plugins/core
jvloothuis at codespeak.net
jvloothuis at codespeak.net
Sat Feb 2 14:00:55 CET 2008
Author: jvloothuis
Date: Sat Feb 2 14:00:54 2008
New Revision: 51209
Added:
kukit/kss.zope/trunk/kss/zope/EXTERNALS.txt
Modified:
kukit/kss.zope/trunk/kss/zope/ (props changed)
kukit/kss.zope/trunk/kss/zope/baseconfigure.py
kukit/kss.zope/trunk/kss/zope/configure.zcml
kukit/kss.zope/trunk/kss/zope/plugins/core/config.py
kukit/kss.zope/trunk/setup.py
Log:
Changes made to make kss.zope work on Zope 2 again after the Zope
3/Grok changes.
Ecmaunit tests work now. This means all Selenium tests pass!
Added: kukit/kss.zope/trunk/kss/zope/EXTERNALS.txt
==============================================================================
--- (empty file)
+++ kukit/kss.zope/trunk/kss/zope/EXTERNALS.txt Sat Feb 2 14:00:54 2008
@@ -0,0 +1 @@
+kukit_3rd_party https://codespeak.net/svn/kukit/kukit.js/trunk/3rd_party
\ No newline at end of file
Modified: kukit/kss.zope/trunk/kss/zope/baseconfigure.py
==============================================================================
--- kukit/kss.zope/trunk/kss/zope/baseconfigure.py (original)
+++ kukit/kss.zope/trunk/kss/zope/baseconfigure.py Sat Feb 2 14:00:54 2008
@@ -4,8 +4,11 @@
from zope.app.publisher.browser.fileresource import FileResource
-def third_party_js_resource(name, request):
- path = file_below_module(kss.base, 'kukit/3rd_party/%s' % name)
+def third_party_js_resource(path, request, name=None):
+ if name is None:
+ name = path
+
+ path = file_below_module(kss.base, 'kukit/3rd_party/%s' % path)
return FileResource(File(path, name), request)
def sarissa_resource(request):
@@ -14,4 +17,18 @@
def base2_resource(request):
return third_party_js_resource('base2-dom-fp.js', request)
-
+def minisax_resource(request):
+ return third_party_js_resource(
+ 'johnnydebris.net/minisax.js/minisax.js', request, 'minisax.js')
+
+def string_resource(request):
+ return third_party_js_resource(
+ 'johnnydebris.net/jsbase/string.js', request, 'string.js')
+
+def array_resource(request):
+ return third_party_js_resource(
+ 'johnnydebris.net/jsbase/array.js', request, 'array.js')
+
+def dommer_resource(request):
+ return third_party_js_resource(
+ 'johnnydebris.net/dommer/dommer.js', request, 'dommer.js')
Modified: kukit/kss.zope/trunk/kss/zope/configure.zcml
==============================================================================
--- kukit/kss.zope/trunk/kss/zope/configure.zcml (original)
+++ kukit/kss.zope/trunk/kss/zope/configure.zcml Sat Feb 2 14:00:54 2008
@@ -38,17 +38,78 @@
/>
+
+
+
+
+
+
+
+ <browser:resource
+ file="kukit_3rd_party/sarissa.js"
+ name="sarissa.js"
+ />
+
+ <browser:resource
+ file="kukit_3rd_party/base2-dom-fp.js"
+ name="base2-dom-fp.js"
+ />
+
+ <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"
+ />
+
+
<!-- setup the resources from kss.base -->
- <browser:resource
- name="sarissa.js"
- factory=".baseconfigure.sarissa_resource"
- permission="zope.Public"
- />
+ <!-- <browser:resource -->
+ <!-- name="sarissa.js" -->
+ <!-- factory=".baseconfigure.sarissa_resource" -->
+ <!-- permission="zope.Public" -->
+ <!-- /> -->
- <browser:resource
- name="base2-dom-fp.js"
- factory=".baseconfigure.base2_resource"
- permission="zope.Public"
- />
+ <!-- <browser:resource -->
+ <!-- name="base2-dom-fp.js" -->
+ <!-- factory=".baseconfigure.base2_resource" -->
+ <!-- permission="zope.Public" -->
+ <!-- /> -->
+
+ <!-- <browser:resource -->
+ <!-- name="minisax.js" -->
+ <!-- factory=".baseconfigure.minisax_resource" -->
+ <!-- permission="zope.Public" -->
+ <!-- /> -->
+ <!-- <browser:resource -->
+ <!-- name="string.js" -->
+ <!-- factory=".baseconfigure.string_resource" -->
+ <!-- permission="zope.Public" -->
+ <!-- /> -->
+ <!-- <browser:resource -->
+ <!-- name="array.js" -->
+ <!-- factory=".baseconfigure.array_resource" -->
+ <!-- permission="zope.Public" -->
+ <!-- /> -->
+
+ <!-- <browser:resource -->
+ <!-- name="dommer.js" -->
+ <!-- factory=".baseconfigure.dommer_resource" -->
+ <!-- permission="zope.Public" -->
+ <!-- /> -->
+
</configure>
Modified: kukit/kss.zope/trunk/kss/zope/plugins/core/config.py
==============================================================================
--- kukit/kss.zope/trunk/kss/zope/plugins/core/config.py (original)
+++ kukit/kss.zope/trunk/kss/zope/plugins/core/config.py Sat Feb 2 14:00:54 2008
@@ -1,5 +1,9 @@
from kss.base.plugin import Plugin
+from kss.demo.resource import (
+ KSSDemo,
+ KSSSeleniumTestDirectory,
+ )
try:
from kss.demo.resource import (
KSSDemo,
@@ -11,9 +15,6 @@
class KSSCore(Plugin):
'''The KSS core plugin has all the standard functionality'''
- # XXX what is priority?
- priority = -1000
-
javascripts = []
extra_javascripts = []
commandsets = {}
@@ -21,30 +22,30 @@
# Zope specific stuff
- if demos:
- zope_demos = (
- KSSDemo('', '', "demos/basic_commands.html", "Change tag content"),
- KSSDemo('', '', "demos/two_selects.html", "Two selects"),
- KSSDemo('', '', "demos/autoupdate.html", "Auto update"),
- KSSDemo('', '', "demos/inline_edit.html", "Inline edit"),
- KSSDemo('', '', "demos/cancel_submit.html", "Cancel Submit Click"),
- KSSDemo('', '', "demos/tree.html", "Tree"),
- KSSDemo('', '', "demos/more_selectors.html", "More complex selectors"),
- KSSDemo('', '', "demos/two_select_revisited.html", "Master-slave selects revisited"),
- KSSDemo('', '', "demos/form_submit.html", "Form submit"),
- KSSDemo('', '', "demos/effects.html", "Effects"),
- KSSDemo('', '', "demos/error_handling.html", "Error handling"),
- KSSDemo('', '', "demos/preventdefault.html", "Preventdefault (a.k.a. Safari workarounds)"),
- KSSDemo('', '', "demos/html_inserts.html", "HTML insertions (Change tag content returns)"),
- KSSDemo('', 'Parameter functions', 'demos/pf_forms.html', 'Forms'),
- KSSDemo('', 'Selectors', 'demos/selectors.html', 'Parent node selector'),
- KSSDemo('', 'Core syntax', "demos/kss_selector_param.html", "Kss selector parameters"),
- KSSDemo('', 'Core syntax', "demos/kss_url_param.html", "Kss url parameters"),
- KSSDemo('', 'Core events', "demos/kss_evt_preventbubbling.html", "Prevent bubbling KSS event parameter"),
- KSSDemo('', 'Core events', "demos/kss_keyevents.html", "Key events"),
- KSSDemo('', 'Commands/Actions', "demos/ca_focus.html", "Focus"),
- KSSDemo('', 'Commands/Actions', "demos/actions.html", "Toggle case action"),
- )
+# if demos:
+ zope_demos = (
+ KSSDemo('', '', "demos/basic_commands.html", "Change tag content"),
+ KSSDemo('', '', "demos/two_selects.html", "Two selects"),
+ KSSDemo('', '', "demos/autoupdate.html", "Auto update"),
+ KSSDemo('', '', "demos/inline_edit.html", "Inline edit"),
+ KSSDemo('', '', "demos/cancel_submit.html", "Cancel Submit Click"),
+ KSSDemo('', '', "demos/tree.html", "Tree"),
+ KSSDemo('', '', "demos/more_selectors.html", "More complex selectors"),
+ KSSDemo('', '', "demos/two_select_revisited.html", "Master-slave selects revisited"),
+ KSSDemo('', '', "demos/form_submit.html", "Form submit"),
+ KSSDemo('', '', "demos/effects.html", "Effects"),
+ KSSDemo('', '', "demos/error_handling.html", "Error handling"),
+ KSSDemo('', '', "demos/preventdefault.html", "Preventdefault (a.k.a. Safari workarounds)"),
+ KSSDemo('', '', "demos/html_inserts.html", "HTML insertions (Change tag content returns)"),
+ KSSDemo('', 'Parameter functions', 'demos/pf_forms.html', 'Forms'),
+ KSSDemo('', 'Selectors', 'demos/selectors.html', 'Parent node selector'),
+ KSSDemo('', 'Core syntax', "demos/kss_selector_param.html", "Kss selector parameters"),
+ KSSDemo('', 'Core syntax', "demos/kss_url_param.html", "Kss url parameters"),
+ KSSDemo('', 'Core events', "demos/kss_evt_preventbubbling.html", "Prevent bubbling KSS event parameter"),
+ KSSDemo('', 'Core events', "demos/kss_keyevents.html", "Key events"),
+ KSSDemo('', 'Commands/Actions', "demos/ca_focus.html", "Focus"),
+ KSSDemo('', 'Commands/Actions', "demos/actions.html", "Toggle case action"),
+ )
# directories are relative from the location of this .py file
selenium_tests = (
Modified: kukit/kss.zope/trunk/setup.py
==============================================================================
--- kukit/kss.zope/trunk/setup.py (original)
+++ kukit/kss.zope/trunk/setup.py Sat Feb 2 14:00:54 2008
@@ -31,8 +31,8 @@
],
entry_points={
'kss.plugin': [
- 'core-demos-1=kss.zope.plugins.core.demo.config:CoreDemos',
- 'core-demos-binderids=kss.zope.plugins.core.demo.binderids.config:CoreDemos',
+ 'core-demos-1=kss.zope.plugins.core.demo.config:core_demos',
+ 'core-demos-binderids=kss.zope.plugins.core.demo.binderids.config:core_demos',
],
},
)
More information about the Kukit-checkins
mailing list