Mercurial > public > sg101

changeset 11:cc8eb028def1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update jquery-ui and theme version that is hosted on google. In preparation for having jquery on every page (?), make it so that the autocomplete plug is using the 'global' jquery, and not the one that came with it. It seems to work okay with jquery 1.3.2.
author Brian Neal <bgneal@gmail.com>
date Tue, 14 Apr 2009 02:35:35 +0000
parents f43f8a956f1d
children f408971657b9
files gpp/core/widgets.py gpp/settings.py
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gpp/core/widgets.py	Sun Apr 12 20:47:15 2009 +0000
+++ b/gpp/core/widgets.py	Tue Apr 14 02:35:35 2009 +0000
@@ -13,7 +13,8 @@
         css = {
             'all': settings.GPP_THIRD_PARTY_CSS['jquery-autocomplete'],
         }
-        js = settings.GPP_THIRD_PARTY_JS['jquery-autocomplete']
+        js = settings.GPP_THIRD_PARTY_JS['jquery'] + \
+             settings.GPP_THIRD_PARTY_JS['jquery-autocomplete']
 
     def render(self, name, value, attrs=None):
         url = reverse('messages-ajax_users')
--- a/gpp/settings.py	Sun Apr 12 20:47:15 2009 +0000
+++ b/gpp/settings.py	Tue Apr 14 02:35:35 2009 +0000
@@ -149,7 +149,6 @@
         'http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js',
     ),
     'jquery-autocomplete': (
-        'js/jquery-autocomplete/lib/jquery.js',
         'js/jquery-autocomplete/lib/jquery.bgiframe.min.js',
         'js/jquery-autocomplete/lib/jquery.ajaxQueue.js',
         'js/jquery-autocomplete/jquery.autocomplete.js',
@@ -158,7 +157,7 @@
         'js/jquery.jeditable.mini.js',
     ),
     'jquery-ui': (
-        'http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.0/jquery-ui.js',
+        'http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.1/jquery-ui.min.js',
     ),
     'markitup': (
         'js/markitup/jquery.markitup.pack.js',
@@ -171,7 +170,7 @@
 }
 GPP_THIRD_PARTY_CSS = {
     'jquery-ui': (
-        'http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.0/themes/redmond/jquery-ui.css',
+        'http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.1/themes/redmond/jquery-ui.css',
     ),
     'jquery-autocomplete': (
         'js/jquery-autocomplete/jquery.autocomplete.css',