Commit e4581533 authored by Francois Marier's avatar Francois Marier Committed by Gerrit Code Review
Browse files

Merge changes I6521e8c1,I6dec636c,I65d5b63f

* changes:
  jquery: New upstream version 1.7.1 (bug #923192)
  jquery: don't hardcode the version number in lib/web.php
  jquery: remove minified copy from core
parents 89e175f8 b78ca869
jQuery in Mahara
=================
Website: http://jquery.com/
Version: 1.7.1
Changes:
* None
This diff is collapsed.
...@@ -214,8 +214,7 @@ EOF; ...@@ -214,8 +214,7 @@ EOF;
} }
// Load jquery first, so that it doesn't break Mochikit // Load jquery first, so that it doesn't break Mochikit
if (($key = array_search('jquery', $check)) !== false) { if (($key = array_search('jquery', $check)) !== false) {
$jquery = (get_config('developermode') & DEVMODE_UNPACKEDJS) ? 'jquery-1.5.2.js' : 'jquery-1.5.2.min.js'; array_unshift($javascript_array, $jsroot . 'jquery/jquery.js');
array_unshift($javascript_array, $jsroot . 'jquery/' . $jquery);
// Make jQuery accessible with $j (Mochikit has $) // Make jQuery accessible with $j (Mochikit has $)
$headers[] = '<script type="text/javascript">$j=jQuery;</script>'; $headers[] = '<script type="text/javascript">$j=jQuery;</script>';
unset($check[$key]); unset($check[$key]);
......
Supports Markdown
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