Fixing jquery issues

jazzband · Apr 26, 2010 · 605cbec · 605cbec
1 parent cc25aab
commit 605cbec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/editor/settings.py b/editor/settings.py
@@ -4,6 +4,6 @@
 DJANGO10_COMPAT = django.VERSION[0] < 1 or (django.VERSION[0] == 1 and django.VERSION[1] < 1)
 
 MEDIA_PATH = getattr(settings, 'EDITOR_MEDIA_PATH', '/media/editor/')
-
+STATIC_MEDIA_PATH = getattr(settings, 'STATIC_URL', settings.MEDIA_URL)
 # Link to google APIs instead of using local copy of JS libraries
 MEDIA_HOTLINKING = getattr(settings, 'EDITOR_MEDIA_HOTLINKING', False)
diff --git a/editor/templates/admin/editor/editor.html b/editor/templates/admin/editor/editor.html
@@ -8,9 +8,9 @@
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"></script>
 <link type="text/css" href="http://jqueryui.com/latest/themes/base/ui.all.css" rel="stylesheet" />
 {% else %}
-<script type="text/javascript" src="{{ EDITOR_MEDIA_PATH }}jquery-1.3.2.min.js"></script>
-<script type="text/javascript" src="{{ EDITOR_MEDIA_PATH }}ui/jqueryui-custom-1.7.2.min.js"></script>
-<link rel="stylesheet" type="text/css" href="{{ EDITOR_MEDIA_PATH }}ui/jqueryui-custom-1.7.2.css" />
+<script type="text/javascript" src="{{ STATIC_URL }}admin/js/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/jquery-ui-1.8rc3.custom.min.js"></script>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/smoothness/jquery-ui-1.8rc3.custom.css" />
 {% endif %}
 
 <script type="text/javascript" src="{{ EDITOR_MEDIA_PATH }}jquery.alerts.js"></script>

diff --git a/editor/tree_editor.py b/editor/tree_editor.py
@@ -112,14 +112,14 @@ class Media:
         css = {}
         js = []
         if settings.MEDIA_HOTLINKING:
-            js.extend(( "http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js", ))
+            js.extend(( "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js", ))
         else:
-            js.extend(( settings.MEDIA_PATH + "jquery-1.3.2.min.js", ))
+            js.extend(( settings.STATIC_URL + "jquery-1.4.2.min.js", ))
 
-        js.extend(( settings.MEDIA_PATH + "ie_compat.js",
-                    settings.MEDIA_PATH + "jquery.cookie.js" ,
-                    settings.MEDIA_PATH + "toolbox.js",
-                    settings.MEDIA_PATH + "page_toolbox.js",
+        js.extend(( settings.STATIC_URL + "ie_compat.js",
+                    settings.STATIC_URL + "jquery.cookie.js" ,
+                    settings.STATIC_URL + "toolbox.js",
+                    settings.STATIC_URL + "page_toolbox.js",
                     ))
 
     def __init__(self, *args, **kwargs):