Merge branch 'MDL-78244-master' of https://github.com/meirzamoodle/moodle

This commit is contained in:
Ilya Tregubov
2023-09-08 22:14:33 +08:00
committed by Jun Pataleta
8 changed files with 826 additions and 1075 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.6.4.min.js')),
'jquery' => array('files' => array('jquery-3.7.1.min.js')),
'ui' => array('files' => array('ui-1.13.2/jquery-ui.min.js')),
'ui-css' => array('files' => array('ui-1.13.2/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.6.4[JSMIN][JSEXT]',
jquery: '[JSURL]lib/jquery/jquery-3.7.1[JSMIN][JSEXT]',
jqueryui: '[JSURL]lib/jquery/ui-1.13.2/jquery-ui[JSMIN][JSEXT]',
jqueryprivate: '[JSURL]lib/requirejs/jquery-private[JSEXT]'
},
+1 -1
View File
@@ -212,7 +212,7 @@
<location>jquery</location>
<name>jQuery</name>
<description>jQuery is a fast, small, and feature-rich JavaScript library widely used on moodle.</description>
<version>3.6.4</version>
<version>3.7.1</version>
<license>MIT</license>
<repository>https://github.com/jquery/jquery</repository>
<copyrights>
@@ -622,8 +622,8 @@ class moodle_content_writer implements content_writer {
$targetpath = ['js', 'general.js'];
$this->copy_data($jspath, $targetpath);
$jquery = ['lib', 'jquery', 'jquery-3.6.4.min.js'];
$jquerydestination = ['js', 'jquery-3.6.4.min.js'];
$jquery = ['lib', 'jquery', 'jquery-3.7.1.min.js'];
$jquerydestination = ['js', 'jquery-3.7.1.min.js'];
$this->copy_data($jquery, $jquerydestination);
$requirecurrentpath = ['lib', 'requirejs', 'require.min.js'];
+2 -2
View File
@@ -65,7 +65,7 @@
<div data-main-content class="jumbotron bg-light border">
<h2 class="display-8">{{#str}}viewdata, core_privacy{{/str}}</h2>
</div>
<script src="js/jquery-3.6.4.min.js"></script>
<script src="js/jquery-3.7.1.min.js"></script>
<script src="js/data_index.js"></script>
<script src="js/general.js"></script>
<script src="js/require.min.js"></script>
@@ -74,7 +74,7 @@
"baseUrl": "./",
"paths": {
"app": "./",
"jquery": "./js/jquery-3.6.4.min",
"jquery": "./js/jquery-3.7.1.min",
"core/tree": "./js/tree.min"
}
});