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

This commit is contained in:
Andrew Nicols
2017-10-12 14:34:05 +08:00
6 changed files with 482 additions and 303 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -36,7 +36,7 @@
*/
$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-css' => array('files' => array('ui-1.12.1/theme/smoothness/jquery-ui.min.css')),
);
+1 -1
View File
@@ -6,7 +6,7 @@ var require = {
waitSeconds : 0,
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]',
jqueryprivate: '[JSURL]lib/requirejs/jquery-private[JSEXT]'
},
+1 -1
View File
@@ -158,7 +158,7 @@
<location>jquery</location>
<name>jQuery</name>
<license>MIT</license>
<version>3.1.0</version>
<version>3.2.1</version>
<licenseversion></licenseversion>
</library>
<library>