diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index b3438adf8f..f9cf0f5921 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -523,7 +523,7 @@ switch ($action) {
 
         $form->addHtml("
             <script>
-                $(document).on('ready', function () {
+                $(function () {
                     $('#announcement_preview').on('click', function() {  
                         var users = [];
                         $('#users_to option').each(function() {
@@ -566,7 +566,7 @@ switch ($action) {
                 $form->addHtml(
                     "
                     <script>
-                        $(document).on('ready', function () {
+                        $(function () {
                             $('#choose_recipients').click();
                         });
                     </script>
diff --git a/main/inc/lib/javascript/annotation/js/annotation.js b/main/inc/lib/javascript/annotation/js/annotation.js
index 9d2a1ed9a4..af259cc29f 100644
--- a/main/inc/lib/javascript/annotation/js/annotation.js
+++ b/main/inc/lib/javascript/annotation/js/annotation.js
@@ -324,7 +324,7 @@
     };
 
     window.AnnotationQuestion = function (userSettings) {
-        $(document).on('ready', function () {
+        $(function () {
             var settings = $.extend(
                 {
                     questionId: 0,
diff --git a/main/template/default/admin/teacher_time_report.tpl b/main/template/default/admin/teacher_time_report.tpl
index 2bbaa2abec..daf3385201 100644
--- a/main/template/default/admin/teacher_time_report.tpl
+++ b/main/template/default/admin/teacher_time_report.tpl
@@ -1,5 +1,5 @@
 <script>
-$(document).on('ready', function () {
+$(function () {
     $('#course').on('change', function () {
         $('#session').prop('selectedIndex', 0);
         $('#teacher').prop('selectedIndex', 0);
diff --git a/main/template/default/blog/blog.tpl b/main/template/default/blog/blog.tpl
index 67bdb65d6f..9a685e5476 100644
--- a/main/template/default/blog/blog.tpl
+++ b/main/template/default/blog/blog.tpl
@@ -101,7 +101,7 @@
     </div>
 </div>
 <script>
-    $(document).on('ready', function () {
+    $(function () {
         $('.btn-read-more').on('click', function (e) {
             e.preventDefault();
 
diff --git a/main/template/default/blog/post.tpl b/main/template/default/blog/post.tpl
index c96c2c52cf..37ca67ef54 100644
--- a/main/template/default/blog/post.tpl
+++ b/main/template/default/blog/post.tpl
@@ -156,7 +156,7 @@
 </div>
 
 <script>
-    $(document).on('ready', function () {
+    $(function () {
         $('.btn-reply-to').on('click', function (e) {
             e.preventDefault();
 
diff --git a/main/template/default/chat/chat.tpl b/main/template/default/chat/chat.tpl
index 1d9cfe171a..b43b2bbe9b 100644
--- a/main/template/default/chat/chat.tpl
+++ b/main/template/default/chat/chat.tpl
@@ -65,7 +65,7 @@
     <source src="{{ _p.web_main }}chat/sound/notification.mp3" type="audio/mpeg"></source>
 </audio>
 <script>
-$(document).on('ready', function () {
+$(function () {
     var ChChat = {
         _ajaxUrl: '{{ _p.web_ajax }}course_chat.ajax.php?{{ _p.web_cid_query }}',
         _historySize: -1,
diff --git a/main/template/default/chat/video.tpl b/main/template/default/chat/video.tpl
index 964012294e..8dbee99ea5 100644
--- a/main/template/default/chat/video.tpl
+++ b/main/template/default/chat/video.tpl
@@ -152,7 +152,7 @@
         }
     };
 
-    $(document).on('ready', function () {
+    $(function () {
         VideoChat.init();
     });
 })();
diff --git a/main/template/default/exercise/submit.js.tpl b/main/template/default/exercise/submit.js.tpl
index bce9313da3..4001fb6f37 100644
--- a/main/template/default/exercise/submit.js.tpl
+++ b/main/template/default/exercise/submit.js.tpl
@@ -222,7 +222,7 @@ jsPlumb.ready(function () {
     }
 });
 
-$(document).on('ready', function () {
+$(function () {
     DraggableAnswer.init(
         $(".exercise-draggable-answer"),
         $(".droppable")
diff --git a/plugin/advanced_subscription/views/open_session.tpl b/plugin/advanced_subscription/views/open_session.tpl
index c4473b0037..842e007550 100644
--- a/plugin/advanced_subscription/views/open_session.tpl
+++ b/plugin/advanced_subscription/views/open_session.tpl
@@ -1,7 +1,7 @@
 <link href="{{ _p.web_plugin }}advanced_subscription/views/css/style.css" rel="stylesheet" type="text/css">
 
 <script>
-    $(document).on('ready', function () {
+    $(function () {
         $('#asp-close-window').on('click', function (e) {
             e.preventDefault();
 
diff --git a/plugin/bbb/resources/utils.js b/plugin/bbb/resources/utils.js
index 7c5e3fc683..42ae3c1ab7 100644
--- a/plugin/bbb/resources/utils.js
+++ b/plugin/bbb/resources/utils.js
@@ -1,4 +1,4 @@
-$(document).on('ready', function () {
+$(function () {
     $('.check-meeting-video').on('click', function (e) {
         e.preventDefault();
 
diff --git a/plugin/buycourses/view/sales_report.tpl b/plugin/buycourses/view/sales_report.tpl
index 47ab3df320..319d269937 100644
--- a/plugin/buycourses/view/sales_report.tpl
+++ b/plugin/buycourses/view/sales_report.tpl
@@ -81,7 +81,7 @@
 </div>
 
 <script>
-    $(document).on('ready', function () {
+    $(function () {
         $('[name="filter_type"]').on('change', function () {
             var self = $(this);
 
diff --git a/plugin/buycourses/view/service_panel.tpl b/plugin/buycourses/view/service_panel.tpl
index 4488d97d6d..d3524b7855 100644
--- a/plugin/buycourses/view/service_panel.tpl
+++ b/plugin/buycourses/view/service_panel.tpl
@@ -56,7 +56,7 @@
     </table>
 </div>
 <script>
-    $(document).on('ready', function () {
+    $(function () {
         $("td a").click(function () {
             var id = $(this).attr('tag');
             var action = $(this).attr('id');
diff --git a/plugin/buycourses/view/service_sales_report.tpl b/plugin/buycourses/view/service_sales_report.tpl
index d8ac47e91c..8833968cbb 100644
--- a/plugin/buycourses/view/service_sales_report.tpl
+++ b/plugin/buycourses/view/service_sales_report.tpl
@@ -73,7 +73,7 @@
 </div>
 
 <script>
-    $(document).on('ready', function () {
+    $(function () {
         $("td a").click(function () {
             var id = $(this).attr('tag');
             var action = $(this).attr('id');
diff --git a/plugin/grading_electronic/view/grading.html.twig b/plugin/grading_electronic/view/grading.html.twig
index fd75a4e4f0..c2cb99134a 100644
--- a/plugin/grading_electronic/view/grading.html.twig
+++ b/plugin/grading_electronic/view/grading.html.twig
@@ -23,7 +23,7 @@
         </div>
     </div>
     <script>
-        $(document).on('ready', function () {
+        $(function () {
             $('form[name="frm_grading_electronic"]').on('submit', function (e) {
                 e.preventDefault();
 
diff --git a/plugin/tour/views/script.tpl b/plugin/tour/views/script.tpl
index 8d428105bd..8256873c02 100644
--- a/plugin/tour/views/script.tpl
+++ b/plugin/tour/views/script.tpl
@@ -57,7 +57,7 @@
             };
         })();
 
-        $(document).on('ready', function() {
+        $(function () {
             var pages = {{ tour.pages }};
 
             $.each(pages, function(index, page) {