Merge branch 'MDL-50937-master' of git://github.com/damyon/moodle

moodle · Jul 19, 2016 · 11caf2e · 11caf2e
2 parents 2c85472 + d863344
commit 11caf2e
Show file tree

Hide file tree

Showing 12 changed files with 2,713 additions and 4,392 deletions.
diff --git a/lib/jquery/jquery-1.12.1.min.js b/lib/jquery/jquery-1.12.1.min.js
diff --git a/lib/jquery/jquery-1.12.1.js → lib/jquery/jquery-3.1.0.js b/lib/jquery/jquery-1.12.1.js → lib/jquery/jquery-3.1.0.js
diff --git a/lib/jquery/jquery-3.1.0.min.js b/lib/jquery/jquery-3.1.0.min.js
diff --git a/lib/jquery/jquery-migrate-1.4.0.js b/lib/jquery/jquery-migrate-1.4.0.js
diff --git a/lib/jquery/jquery-migrate-1.4.0.min.js b/lib/jquery/jquery-migrate-1.4.0.min.js
diff --git a/lib/jquery/plugins.php b/lib/jquery/plugins.php
@@ -37,8 +37,7 @@
  */
 
 $plugins = array(
-    'jquery'  => array('files' => array('jquery-1.12.1.min.js')),
-    'migrate' => array('files' => array('jquery-migrate-1.4.0.min.js')),
+    'jquery'  => array('files' => array('jquery-3.1.0.min.js')),
     'ui'      => array('files' => array('ui-1.11.4/jquery-ui.min.js')),
     'ui-css'  => array('files' => array('ui-1.11.4/theme/smoothness/jquery-ui.min.css')),
 );
diff --git a/lib/jquery/readme_moodle.txt b/lib/jquery/readme_moodle.txt
@@ -1,6 +1,6 @@
 Description of import of various jQuery libraries into Moodle:
 
-1/ download jQuery JS and Migrate files from http://jquery.com/download/,
+1/ download jQuery JS from http://jquery.com/download/,
    delete old files and edit plugins.php and lib/requirejs/moodle-config.js
 
 2/ download jQuery UI files from http://jqueryui.com/download/all/,

diff --git a/lib/requirejs/moodle-config.js b/lib/requirejs/moodle-config.js
@@ -5,7 +5,7 @@ var require = {
     skipDataMain: true,
 
     paths: {
-        jquery: '[JSURL]lib/jquery/jquery-1.12.1.min[JSEXT]',
+        jquery: '[JSURL]lib/jquery/jquery-3.1.0.min[JSEXT]',
         jqueryui: '[JSURL]lib/jquery/ui-1.11.4/jquery-ui.min[JSEXT]',
         jqueryprivate: '[JSURL]lib/requirejs/jquery-private[JSEXT]'
     },

diff --git a/lib/tests/jquery_test.php b/lib/tests/jquery_test.php
@@ -46,7 +46,7 @@ public function test_plugins_file() {
         $plugins = null;
         require($CFG->libdir . '/jquery/plugins.php');
         $this->assertInternalType('array', $plugins);
-        $this->assertEquals(array('jquery', 'migrate', 'ui', 'ui-css'), array_keys($plugins));
+        $this->assertEquals(array('jquery', 'ui', 'ui-css'), array_keys($plugins));
 
         foreach ($plugins as $type => $files) {
             foreach ($files['files'] as $file) {

diff --git a/lib/tests/other/jquerypage.php b/lib/tests/other/jquerypage.php
@@ -36,7 +36,6 @@
 $PAGE->requires->jquery();
 $PAGE->requires->jquery_plugin('ui');
 $PAGE->requires->jquery_plugin('ui-css');
-$PAGE->requires->jquery_plugin('migrate');
 
 echo $OUTPUT->header();
 

diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
@@ -172,14 +172,7 @@
     <location>jquery</location>
     <name>jQuery</name>
     <license>MIT</license>
-    <version>1.12.1</version>
-    <licenseversion></licenseversion>
-  </library>
-  <library>
-    <location>jquery</location>
-    <name>jQuery Migrate</name>
-    <license>MIT</license>
-    <version>1.4.0</version>
+    <version>3.1.0</version>
     <licenseversion></licenseversion>
   </library>
   <library>

diff --git a/lib/upgrade.txt b/lib/upgrade.txt
@@ -4,6 +4,8 @@ information provided here is intended especially for developers.
 === 3.2 ===
 
 * Node.js versions >=4 are now required to run grunt.
+* JQuery has been updated to 3.1.0. JQuery migrate plugins are no longer shipped - please read
+  https://jquery.com/upgrade-guide/3.0/ and update your javascript.
 * New option 'blanktarget' added to format_text. This option adds target="_blank" to links
 * A new webservice structure `external_files` has been created which provides a standardised view of files in Moodle and
   should be used for all file return descriptions.