[KSS-checkins] r46905 - kukit/kss.base/trunk/kss/base

[jvloothuis at codespeak.net]

Author: jvloothuis
Date: Wed Sep 26 17:26:22 2007
New Revision: 46905

Modified:
   kukit/kss.base/trunk/kss/base/javascript.py
   kukit/kss.base/trunk/kss/base/plugin.py
Log:
Added priority system to make sure the core js is always the first when concatinating

Modified: kukit/kss.base/trunk/kss/base/javascript.py
==============================================================================
--- kukit/kss.base/trunk/kss/base/javascript.py	(original)
+++ kukit/kss.base/trunk/kss/base/javascript.py	Wed Sep 26 17:26:22 2007
@@ -6,7 +6,9 @@
 def concatinated(include_extras=False):
     '''Concatinate the Javascript files for all activate plugins'''
     scripts = []
-    for id, plugin in activated_plugins():
+    
+    for id, plugin in sorted(activated_plugins(), 
+                             key=lambda item: item[1].priority):
         if include_extras:
             javascripts = plugin.javascripts + plugin.extra_javascripts
         else:

Modified: kukit/kss.base/trunk/kss/base/plugin.py
==============================================================================
--- kukit/kss.base/trunk/kss/base/plugin.py	(original)
+++ kukit/kss.base/trunk/kss/base/plugin.py	Wed Sep 26 17:26:22 2007
@@ -6,6 +6,8 @@
 from kss.base import selectors as kss_selectors
 
 class Plugin(object):
+    priority = 100
+
     def register_commandsets(self, registry):
         for name, commandset in self.commandsets.iteritems():
             registry.register(name, commandset)
@@ -75,6 +77,8 @@
 class KSSCore(Plugin):
     '''The KSS core plugin has all the standard functionality'''
 
+    priority = -1000
+
     javascripts = [os.path.join(kukit_dir, 'kukit', js) for js in core_js]
     
     extra_javascripts = javascripts_from(os.path.join(kukit_dir, '3rd_party'))