<%= link_to t('annotation_categories.add_annotation'),
'#',
id: 'add-annotation',
class: 'button' %>
+ <%= javascript_tag nonce: true do %>
+ $('#add-annotation').click(function(e) {
+ add_annotation_prompt('<%= path %>');
+ e.preventDefault();
+ })
+ <% end %>
diff --git a/app/views/annotation_categories/_boot.js.erb b/app/views/annotation_categories/_boot.js.erb
index 096457d1ed..39a7733083 100644
--- a/app/views/annotation_categories/_boot.js.erb
+++ b/app/views/annotation_categories/_boot.js.erb
@@ -31,7 +31,7 @@
}
}
- $(document).ready(function() {
+ document.addEventListener("DOMContentLoaded", function() {
bindSortable();
function bindSortable() {
diff --git a/app/views/annotation_categories/index.html.erb b/app/views/annotation_categories/index.html.erb
index 025f4cff41..59dd5a9c3a 100644
--- a/app/views/annotation_categories/index.html.erb
+++ b/app/views/annotation_categories/index.html.erb
@@ -6,12 +6,12 @@
<%= javascript_include_tag 'MathJax_lib/MathJax.js?config=TeX-AMS-MML_HTMLorMML', nonce: true %>
<%= javascript_include_tag 'MathJax/mathjax_helpers', nonce: true %>
<%= javascript_tag nonce: true do %>
- $(function() {
+ document.addEventListener("DOMContentLoaded", function() {
$('#add-annotation-category').click(function(e) {
add_annotation_category('<%= new_course_assignment_annotation_category_path(@current_course, @assignment) %>');
e.preventDefault();
})
- })
+ });
<% end %>
<% end %>
diff --git a/app/views/assignments/_boot.js.erb b/app/views/assignments/_boot.js.erb
index 42bff17297..e4b43b69cf 100644
--- a/app/views/assignments/_boot.js.erb
+++ b/app/views/assignments/_boot.js.erb
@@ -46,7 +46,7 @@
function add_assignment_file() {
var new_id = new Date().getTime();
- var input_id = `assignment_assignment_files_attributes_${new_id}_filename'`;
+ var input_id = `assignment_assignment_files_attributes_${new_id}_filename`;
var assignment_file = `
@@ -139,7 +139,7 @@
}
}
- $(document).ready(function() {
+ document.addEventListener("DOMContentLoaded", function() {
// Handle periods and hiding/showing things
if ($('#assignment_due_date').val()) {
create_grace_periods();
@@ -156,8 +156,8 @@
// Handle required fields
check_required_fields();
$(document).on("change", $('input[required]'), check_required_fields)
- .on("keyup", $('input[required]'), check_required_fields)
- .on("click", $('#assignment_file_add_link'), check_required_fields);
+ .on("keyup", $('input[required]'), check_required_fields)
+ .on("click", $('#assignment_file_add_link'), check_required_fields);
// Initialize flatpickr calendar for different elements in the DOM
flatpickr("#assignment_due_date")
diff --git a/app/views/assignments/_form.html.erb b/app/views/assignments/_form.html.erb
index 49f75c5318..cc3f10ff95 100644
--- a/app/views/assignments/_form.html.erb
+++ b/app/views/assignments/_form.html.erb
@@ -8,25 +8,25 @@
handlers: [:erb] %>
<%= javascript_tag nonce: true do %>
- $(function() {
- $('#grace-period-add').click(function(e) {
- add_period("grace_periods", grace_periods);
- e.preventDefault();
- })
- $('#penalty-decay-period-add').click(function(e) {
- add_period("penalty_decay_periods", penalty_decay_periods);
- e.preventDefault();
- })
- $('#penalty-period-add').click(function(e) {
- add_period("penalty_periods", penalty_periods);
- e.preventDefault();
- })
- $('#required-file-add').click(function(e) {
- add_assignment_file();
- e.preventDefault();
- })
- refresh_event_listeners();
- })
+ document.addEventListener("DOMContentLoaded", function() {
+ $('#grace-period-add').click(function(e) {
+ add_period("grace_periods", grace_periods);
+ e.preventDefault();
+ })
+ $('#penalty-decay-period-add').click(function(e) {
+ add_period("penalty_decay_periods", penalty_decay_periods);
+ e.preventDefault();
+ })
+ $('#penalty-period-add').click(function(e) {
+ add_period("penalty_periods", penalty_periods);
+ e.preventDefault();
+ })
+ $('#required-file-add').click(function(e) {
+ add_assignment_file();
+ e.preventDefault();
+ })
+ refresh_event_listeners();
+ });
<% end %>
<% end %>
diff --git a/app/views/assignments/show.html.erb b/app/views/assignments/show.html.erb
index d44893bca2..d9c7b8e429 100644
--- a/app/views/assignments/show.html.erb
+++ b/app/views/assignments/show.html.erb
@@ -14,7 +14,7 @@
document.getElementById('working').style.display = '';
})
}
- $(document).ready(function() {
+ document.addEventListener("DOMContentLoaded", function() {
invite_modal = new ModalMarkus('#invite_dialog');
$('#invite-student').click(function(e) {
invite();
diff --git a/app/views/courses/role_switch.js.erb b/app/views/courses/role_switch.js.erb
index 3dd28b6004..288196d25f 100644
--- a/app/views/courses/role_switch.js.erb
+++ b/app/views/courses/role_switch.js.erb
@@ -2,8 +2,6 @@ $("#role_switch_dialog").html("<%= escape_javascript(render(partial: 'role_switc
role_switch_modal.open();
$('#effective_user_login').focus();
-$(function() {
- $('#role-switch-modal-cancel').click(function() {
- role_switch_modal.close();
- })
-})
+$('#role-switch-modal-cancel').click(function() {
+ role_switch_modal.close();
+});
diff --git a/app/views/criteria/_boot.js.erb b/app/views/criteria/_boot.js.erb
index f7c594309f..684af47090 100644
--- a/app/views/criteria/_boot.js.erb
+++ b/app/views/criteria/_boot.js.erb
@@ -1,5 +1,5 @@
<%= javascript_tag nonce: true do %>
- $(document).ready(function() {
+ document.addEventListener("DOMContentLoaded", function() {
bindSortable();
var ajaxRequest;
diff --git a/app/views/criteria/_event_listeners.js.erb b/app/views/criteria/_event_listeners.js.erb
index d4fe11ad5f..fde49088f4 100644
--- a/app/views/criteria/_event_listeners.js.erb
+++ b/app/views/criteria/_event_listeners.js.erb
@@ -1,6 +1,4 @@
-$(() => {
- $('#add-criterion-level').click((e) => {
- add_level("rubric_form");
- e.preventDefault();
- })
+$('#add-criterion-level').click((e) => {
+ add_level("rubric_form");
+ e.preventDefault();
})
diff --git a/app/views/criteria/new.js.erb b/app/views/criteria/new.js.erb
index c2e1e40d0d..7738c1a425 100644
--- a/app/views/criteria/new.js.erb
+++ b/app/views/criteria/new.js.erb
@@ -4,17 +4,15 @@ $('#criteria_pane_list').prepend(
document.getElementById('new_criterion_prompt').focus();
-$(document).ready(function() {
- $('input[name=criterion_type]:radio').change(function () {
- const max_mark = document.getElementById('max_mark_prompt');
- if (this.value === 'RubricCriterion') {
- max_mark.defaultValue = <%= RubricCriterion::DEFAULT_MAX_MARK -%>;
- } else if (this.value === 'FlexibleCriterion') {
- max_mark.defaultValue = <%= FlexibleCriterion::DEFAULT_MAX_MARK -%>;
- } else if (this.value === 'CheckboxCriterion') {
- max_mark.defaultValue = <%= CheckboxCriterion::DEFAULT_MAX_MARK -%>;
- }
- });
+$('input[name=criterion_type]:radio').change(function () {
+ const max_mark = document.getElementById('max_mark_prompt');
+ if (this.value === 'RubricCriterion') {
+ max_mark.defaultValue = <%= RubricCriterion::DEFAULT_MAX_MARK -%>;
+ } else if (this.value === 'FlexibleCriterion') {
+ max_mark.defaultValue = <%= FlexibleCriterion::DEFAULT_MAX_MARK -%>;
+ } else if (this.value === 'CheckboxCriterion') {
+ max_mark.defaultValue = <%= CheckboxCriterion::DEFAULT_MAX_MARK -%>;
+ }
});
document.getElementById('new_criterion').addEventListener('ajax:success', event => {
diff --git a/app/views/exam_templates/_assign_errors.js.erb b/app/views/exam_templates/_assign_errors.js.erb
index 38090830fe..7aa7bcbc11 100644
--- a/app/views/exam_templates/_assign_errors.js.erb
+++ b/app/views/exam_templates/_assign_errors.js.erb
@@ -48,7 +48,7 @@ function getErrorPages(value) {
}
}
-$(document).ready(function () {
+document.addEventListener("DOMContentLoaded", function() {
var container = document.getElementById('pdfContainer');
let eventBus = new pdfjsViewer.EventBus();
var pdfViewer = new pdfjsViewer.PDFViewer({
@@ -78,8 +78,8 @@ $(document).ready(function () {
});
<% if @next_error.nil? %>
- getFile('', pdfViewer);
+ getFile('', pdfViewer);
<% else %>
- getFile('<%= "#{@next_error.id}.pdf" -%>', pdfViewer);
+ getFile('<%= "#{@next_error.id}.pdf" -%>', pdfViewer);
<% end %>
});
diff --git a/app/views/exam_templates/_boot.js b/app/views/exam_templates/_boot.js
index 29525c11a8..7da47f9ba4 100644
--- a/app/views/exam_templates/_boot.js
+++ b/app/views/exam_templates/_boot.js
@@ -3,7 +3,7 @@ const SCALE_CHANGE = 100;
let MIN_SIZE = 600;
let jcrop_api;
-$(document).ready(function () {
+document.addEventListener("DOMContentLoaded", function () {
window.modal_create_new = new ModalMarkus("#create_new_template");
$("#generate_exam_modal_submit").click(() => {
$("#generate_exam_dialog").trigger("closeModal");
diff --git a/app/views/exam_templates/index.html.erb b/app/views/exam_templates/index.html.erb
index 004dac6c36..31bc86069b 100644
--- a/app/views/exam_templates/index.html.erb
+++ b/app/views/exam_templates/index.html.erb
@@ -3,12 +3,12 @@
<% content_for :head do %>
<%= javascript_tag nonce: true do %>
<%= render partial: 'boot', formats: [:js] %>
- $(function() {
- $('#add-exam-template').click(function(e) {
- modal_create_new.open();
- e.preventDefault();
- })
- })
+ document.addEventListener("DOMContentLoaded", function() {
+ $('#add-exam-template').click(function(e) {
+ modal_create_new.open();
+ e.preventDefault();
+ })
+ });
<% end %>
<% end %>
diff --git a/app/views/grade_entry_forms/_boot.js.erb b/app/views/grade_entry_forms/_boot.js.erb
index 40e8d302c6..69c27f7d03 100644
--- a/app/views/grade_entry_forms/_boot.js.erb
+++ b/app/views/grade_entry_forms/_boot.js.erb
@@ -43,7 +43,7 @@
})
}
- $(document).ready(function() {
+ document.addEventListener("DOMContentLoaded", function() {
flatpickr(".datepicker", {enableTime: false, dateFormat: I18n.t('date.format_string.flatpickr')})
});
<% end %>
diff --git a/app/views/grade_entry_forms/_form.html.erb b/app/views/grade_entry_forms/_form.html.erb
index 1f510bc608..e383a649ba 100644
--- a/app/views/grade_entry_forms/_form.html.erb
+++ b/app/views/grade_entry_forms/_form.html.erb
@@ -11,13 +11,13 @@
formats: [:js],
handlers: [:erb] %>
<%= javascript_tag nonce: true do %>
- $(function() {
+ document.addEventListener("DOMContentLoaded", function() {
$('#add-new-column').click(function(e) {
add_column();
e.preventDefault();
})
refresh_event_listeners();
- })
+ });
<% end %>
<% end %>
diff --git a/app/views/graders/_ta_grade_distribution_graph.html.erb b/app/views/graders/_ta_grade_distribution_graph.html.erb
index 8203f96bba..5fa83e755a 100644
--- a/app/views/graders/_ta_grade_distribution_graph.html.erb
+++ b/app/views/graders/_ta_grade_distribution_graph.html.erb
@@ -3,8 +3,6 @@
<%= javascript_tag nonce: true do %>
- // Set up graph
- $(document).ready(function () {
var ctx = document.getElementById('<%= "a#{assignment.id}_ta_#{ta_id}" %>').getContext('2d');
// Set up data
@@ -50,5 +48,4 @@
data: data,
options: options
});
- });
<% end %>
diff --git a/app/views/groups/assign_scans.html.erb b/app/views/groups/assign_scans.html.erb
index d7c645d9b7..608ea297ef 100644
--- a/app/views/groups/assign_scans.html.erb
+++ b/app/views/groups/assign_scans.html.erb
@@ -6,83 +6,87 @@
<%= javascript_tag nonce: true do %>
pdfjs.GlobalWorkerOptions.workerSrc = '<%= asset_path('pdf.worker.js') %>';
-
- $(document).ready(function () {
- $("#names").autocomplete({
- source: function (request, response) {
- $.getJSON("get_names",
- {
- assignment_id: <%= @assignment.id %>,
- term: $("#names").val()
- },
- response);
- },
- minLength: 1,
- select: function (event, ui) {
- $("#student_id").val(ui.item.id);
- }
- }).data("ui-autocomplete")._renderItem = function (ul, item) {
- return $("