Commit b56cdf14 authored by Evan Goldenberg's avatar Evan Goldenberg Committed by Richard Mansfield
Browse files

Add jquery support



jQuery can be accessed using $j, while Mochikit
remains tied to $
Signed-off-by: default avatarEvan Goldenberg <evang@catalyst.net.nz>
parent a44ccdca
This diff is collapsed.
This diff is collapsed.
......@@ -206,8 +206,10 @@ EOF;
}
}
}
// Load jquery first, so that it doesn't break Mochikit
if (get_config('developermode') & DEVMODE_UNPACKEDJS) {
$javascript_array[] = $jsroot . 'jquery/jquery-1.3.2.js';
$javascript_array[] = $jsroot . 'MochiKit/MochiKit.js';
$javascript_array[] = $jsroot . 'MochiKit/Position.js';
$javascript_array[] = $jsroot . 'MochiKit/Color.js';
......@@ -216,9 +218,12 @@ EOF;
$javascript_array[] = $jsroot . 'MochiKit/Format.js';
}
else {
$javascript_array[] = $jsroot . 'jquery/jquery-1.3.2.min.js';
$javascript_array[] = $jsroot . 'MochiKit/Packed.js';
}
$javascript_array[] = $jsroot . 'keyboardNavigation.js';
// Make jQuery accessible with $j (Mochikit is $)
$javascript_array[] = $jsroot . 'jquery-shortname.js';
$strings = array();
foreach ($pagestrings as $k => $v) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment