Update to jQuery 3.

3 files changed, 9 insertions, 9 deletions

diff --git a/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js b/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js
index d87e6304a24..66702ec4ca0 100644
--- a/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js
+++ b/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js
@@ -15,21 +15,21 @@ export default class AbuseReports {
     const $messageCellElement = $(this);
     const reportMessage = $messageCellElement.text();
     if (reportMessage.length > MAX_MESSAGE_LENGTH) {
-      $messageCellElement.data('original-message', reportMessage);
-      $messageCellElement.data('message-truncated', 'true');
+      $messageCellElement.data('originalMessage', reportMessage);
+      $messageCellElement.data('messageTruncated', 'true');
       $messageCellElement.text(truncate(reportMessage, MAX_MESSAGE_LENGTH));
     }
   }
 
   toggleMessageTruncation() {
     const $messageCellElement = $(this);
-    const originalMessage = $messageCellElement.data('original-message');
+    const originalMessage = $messageCellElement.data('originalMessage');
     if (!originalMessage) return;
-    if ($messageCellElement.data('message-truncated') === 'true') {
-      $messageCellElement.data('message-truncated', 'false');
+    if ($messageCellElement.data('messageTruncated') === 'true') {
+      $messageCellElement.data('messageTruncated', 'false');
       $messageCellElement.text(originalMessage);
     } else {
-      $messageCellElement.data('message-truncated', 'true');
+      $messageCellElement.data('messageTruncated', 'true');
       $messageCellElement.text(`${originalMessage.substr(0, (MAX_MESSAGE_LENGTH - 3))}...`);
     }
   }
diff --git a/app/assets/javascripts/pages/admin/admin.js b/app/assets/javascripts/pages/admin/admin.js
index 135c15c346b..45e05f111a7 100644
--- a/app/assets/javascripts/pages/admin/admin.js
+++ b/app/assets/javascripts/pages/admin/admin.js
@@ -16,9 +16,9 @@ export default function adminInit() {
   $('input#user_force_random_password').on('change', function randomPasswordClick() {
     const $elems = $('#user_password, #user_password_confirmation');
     if ($(this).attr('checked')) {
-      $elems.val('').attr('disabled', true);
+      $elems.val('').prop('disabled', true);
     } else {
-      $elems.removeAttr('disabled');
+      $elems.prop('disabled', false);
     }
   });
 
diff --git a/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js b/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js
index 885acfac6d0..b68ce5d32d8 100644
--- a/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js
+++ b/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js
@@ -14,7 +14,7 @@ export default function initBroadcastMessagesForm() {
     $('div.broadcast-message-preview').css('color', previewColor);
   });
 
-  const previewPath = $('textarea#broadcast_message_message').data('preview-path');
+  const previewPath = $('textarea#broadcast_message_message').data('previewPath');
 
   $('textarea#broadcast_message_message').on('input', _.debounce(function onMessageInput() {
     const message = $(this).val();