From 2d6262c1145c5937afa14d66b5203c84393df679 Mon Sep 17 00:00:00 2001
From: Pierre Spring <pierre.spring@caillou.ch>
Date: Fri, 17 Sep 2010 15:13:37 +0200
Subject: loading jQuery and putting it into noConflict mode

---
 lib/exe/js.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib/exe')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 3756c43b9..c916bf85d 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -34,8 +34,16 @@ function js_out(){
     // The generated script depends on some dynamic options
     $cache = getCacheName('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js');
 
+    // load jQuery, minified if compression is eanbled.
+    $jquery_file_path = DOKU_INC.'lib/scripts/jquery/jquery';
+    if($conf['compress']) {
+        $jquery_file_path .= '.min';
+    }
+    $jquery_file_path .= '.js';
+
     // array of core files
     $files = array(
+                $jquery_file_path,
                 DOKU_INC.'lib/scripts/helpers.js',
                 DOKU_INC.'lib/scripts/events.js',
                 DOKU_INC.'lib/scripts/delay.js',
-- 
cgit v1.2.3