[KSS-checkins] r46903 - in kukit/kss.plugin.scriptaculous/trunk: . kss/plugin kss/plugin/scriptaculous kss/plugin/scriptaculous/3rd_party kss/plugin/scriptaculous/javascript kss/plugin/scriptaculous/scriptaculous kss/scriptaculous

[jvloothuis at codespeak.net]

Author: jvloothuis
Date: Wed Sep 26 17:24:43 2007
New Revision: 46903

Added:
   kukit/kss.plugin.scriptaculous/trunk/kss/plugin/
   kukit/kss.plugin.scriptaculous/trunk/kss/plugin/__init__.py   (props changed)
      - copied unchanged from r46877, kukit/kss.plugin.scriptaculous/trunk/kss/__init__.py
   kukit/kss.plugin.scriptaculous/trunk/kss/plugin/scriptaculous/   (props changed)
      - copied from r46877, kukit/kss.plugin.scriptaculous/trunk/kss/scriptaculous/
   kukit/kss.plugin.scriptaculous/trunk/kss/plugin/scriptaculous/3rd_party/   (props changed)
      - copied from r46877, kukit/kss.plugin.scriptaculous/trunk/kss/scriptaculous/scriptaculous/3rd_party/
   kukit/kss.plugin.scriptaculous/trunk/kss/plugin/scriptaculous/javascript/
   kukit/kss.plugin.scriptaculous/trunk/kss/plugin/scriptaculous/javascript/plugin.js   (props changed)
      - copied unchanged from r46877, kukit/kss.plugin.scriptaculous/trunk/kss/scriptaculous/scriptaculous/plugin.js
Removed:
   kukit/kss.plugin.scriptaculous/trunk/kss/plugin/scriptaculous/scriptaculous/
   kukit/kss.plugin.scriptaculous/trunk/kss/scriptaculous/
Modified:
   kukit/kss.plugin.scriptaculous/trunk/kss/plugin/scriptaculous/__init__.py
   kukit/kss.plugin.scriptaculous/trunk/kss/plugin/scriptaculous/commands.py
   kukit/kss.plugin.scriptaculous/trunk/setup.py
Log:
Made the plugin work with kss.base

Modified: kukit/kss.plugin.scriptaculous/trunk/kss/plugin/scriptaculous/__init__.py
==============================================================================
--- kukit/kss.plugin.scriptaculous/trunk/kss/scriptaculous/__init__.py	(original)
+++ kukit/kss.plugin.scriptaculous/trunk/kss/plugin/scriptaculous/__init__.py	Wed Sep 26 17:24:43 2007
@@ -6,10 +6,3 @@
     __path__ = extend_path(__path__, __name__)
 
 
-import os
-from kss.pylons.middleware import StaticJavascriptPlugin
-
-javascript_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                               'scriptaculous')
-
-javascript_app = StaticJavascriptPlugin(javascript_path)

Modified: kukit/kss.plugin.scriptaculous/trunk/kss/plugin/scriptaculous/commands.py
==============================================================================
--- kukit/kss.plugin.scriptaculous/trunk/kss/scriptaculous/commands.py	(original)
+++ kukit/kss.plugin.scriptaculous/trunk/kss/plugin/scriptaculous/commands.py	Wed Sep 26 17:24:43 2007
@@ -1,4 +1,4 @@
-from kss.commands import KSSCommandSet
+from kss.base.commands import KSSCommandSet
 
 class KSSScriptaculousCommands(KSSCommandSet):
     def effect(self, selector, type, queue=None, scope=None, delay=None):
@@ -25,4 +25,4 @@
             raise ValueError('Queue must be `front` or `end`')
         
         self.commands.add('effect', selector, type=type, 
-                          queue=queue, scope=scope, delay=delay)
+                          queue=queue, scope=scope, delay=delay and str(delay))

Modified: kukit/kss.plugin.scriptaculous/trunk/setup.py
==============================================================================
--- kukit/kss.plugin.scriptaculous/trunk/setup.py	(original)
+++ kukit/kss.plugin.scriptaculous/trunk/setup.py	Wed Sep 26 17:24:43 2007
@@ -2,7 +2,7 @@
 
 version = '0.1'
 
-setup(name='kss.scriptaculous',
+setup(name='kss.plugin.scriptaculous',
       version=version,
       description="KSS (Kinetic Style Sheets) scriptaculous support",
       long_description="""\
@@ -23,15 +23,11 @@
       zip_safe=False,
       install_requires=[
           'setuptools',
-          'kss.pluginregistry>=dev',
-          'kss.commands>=dev',
+          'kss.base>=dev',
       ],
       entry_points={
-        'kss.javascript': [
-            'scriptaculous=kss.scriptaculous:javascript_app',
-            ],
-        'kss.commandset': [
-            'scriptaculous=kss.scriptaculous.commands:KSSScriptaculousCommands'
+        'kss.plugin': [
+            'scriptaculous-effects=kss.plugin.scriptaculous.config:Scriptaculous'
             ],
         },
       test_suite='kss.scriptaculous.tests.test_suite',