moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-MDL-60195-master' of git://github.com/abgreeve/moodle

Browse source
This commit is contained in:
Andrew Nicols 2017-10-12 14:34:05 +08:00
commit 6fa6e63129
6 changed files with 482 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/jquery/jquery-3.1.0.min.js vendored
View file

File diff suppressed because one or more lines are too long

771
lib/jquery/jquery-3.1.0.js → lib/jquery/jquery-3.2.1.js vendored
View file

File diff suppressed because it is too large Load diff

4
lib/jquery/jquery-3.2.1.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

2
lib/jquery/plugins.php
View file

@ -36,7 +36,7 @@
*/ */
$plugins = array( $plugins = array(
'jquery' => array('files' => array('jquery-3.1.0.min.js')), 'jquery' => array('files' => array('jquery-3.2.1.min.js')),
'ui' => array('files' => array('ui-1.12.1/jquery-ui.min.js')), 'ui' => array('files' => array('ui-1.12.1/jquery-ui.min.js')),
'ui-css' => array('files' => array('ui-1.12.1/theme/smoothness/jquery-ui.min.css')), 'ui-css' => array('files' => array('ui-1.12.1/theme/smoothness/jquery-ui.min.css')),
); );

2
lib/requirejs/moodle-config.js
View file

@ -6,7 +6,7 @@ var require = {
waitSeconds : 0, waitSeconds : 0,
paths: { paths: {
jquery: '[JSURL]lib/jquery/jquery-3.1.0.min[JSEXT]', jquery: '[JSURL]lib/jquery/jquery-3.2.1.min[JSEXT]',
jqueryui: '[JSURL]lib/jquery/ui-1.12.1/jquery-ui.min[JSEXT]', jqueryui: '[JSURL]lib/jquery/ui-1.12.1/jquery-ui.min[JSEXT]',
jqueryprivate: '[JSURL]lib/requirejs/jquery-private[JSEXT]' jqueryprivate: '[JSURL]lib/requirejs/jquery-private[JSEXT]'
}, },

2
lib/thirdpartylibs.xml
View file

@ -158,7 +158,7 @@
<location>jquery</location> <location>jquery</location>
<name>jQuery</name> <name>jQuery</name>
<license>MIT</license> <license>MIT</license>
<version>3.1.0</version> <version>3.2.1</version>
<licenseversion></licenseversion> <licenseversion></licenseversion>
</library> </library>
<library> <library>