Merge branch 'MDL-61852-master' of git://github.com/bmbrands/moodle

.eslintignore

@@ -4,7 +4,6 @@
 node_modules/
 vendor/
 admin/tool/usertours/amd/src/tour.js
-admin/tool/usertours/amd/src/popper.js
 auth/cas/CAS/
 enrol/lti/ims-blti/
 filter/algebra/AlgParser.pm
@@ -58,6 +57,7 @@ lib/ltiprovider/
 lib/amd/src/truncate.js
 lib/fonts/
 lib/validateurlsyntax.php
+lib/amd/src/popper.js
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/

.stylelintignore

@@ -5,7 +5,6 @@ theme/more/style/custom.css
 node_modules/
 vendor/
 admin/tool/usertours/amd/src/tour.js
-admin/tool/usertours/amd/src/popper.js
 auth/cas/CAS/
 enrol/lti/ims-blti/
 filter/algebra/AlgParser.pm
@@ -59,6 +58,7 @@ lib/ltiprovider/
 lib/amd/src/truncate.js
 lib/fonts/
 lib/validateurlsyntax.php
+lib/amd/src/popper.js
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/

admin/tool/usertours/amd/readme_moodle.txt

@@ -5,13 +5,6 @@ Flexitour Instructions
 1. Clone https://github.com/andrewnicols/flexitour into an unrelated directory
 2. Copy /build/tour.js to amd/src/tour.js
 3. Open the amd/src/tour.js file and find the AMD module define.
-4. Change the "popper" inclusion to "./popper"
+4. Change the "popper" inclusion to "core/popper"
 5. Update thirdpartylibs.xml
 6. Run `grunt amd`
-
-Popper.js Instructions
-----------------------
-1. Clone https://github.com/FezVrasta/popper.js into an unrelated directory
-2. Copy /build/popper.js to amd/src/popper.js
-3. Update thirdpartylibs.xml
-4. Run `grunt amd`

admin/tool/usertours/amd/src/tour.js

@@ -2,7 +2,7 @@
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module unless amdModuleId is set
-    define(["jquery","./popper"], function (a0,b1) {
+    define(["jquery","core/popper"], function (a0,b1) {
       return (root['Tour'] = factory(a0,b1));
     });
   } else if (typeof module === 'object' && module.exports) {

admin/tool/usertours/thirdpartylibs.xml

@@ -7,11 +7,4 @@
     <version>0.12.2</version>
     <licenseversion>3</licenseversion>
   </library>
-  <library>
-    <location>amd/src/popper.js</location>
-    <name>Popper.js</name>
-    <license>MIT</license>
-    <version>v1.0.8</version>
-    <licenseversion></licenseversion>
-  </library>
 </libraries>

admin/tool/usertours/upgrade.txt

@@ -0,0 +1,4 @@
+This files describes API changes in the tool_usertours code.
+
+=== 3.5 ===
+* Third party library Popper.js was moved from this plugin into core (core/popper)

lib/thirdpartylibs.xml

@@ -303,4 +303,11 @@
     <license>GPL</license>
     <licenseversion>2.0+</licenseversion>
   </library>
+  <library>
+    <location>amd/src/popper.js</location>
+    <name>Popper.js</name>
+    <license>MIT</license>
+    <version>v1.12.6</version>
+    <licenseversion></licenseversion>
+  </library>
 </libraries>