Yuki Takei 7 лет назад
Родитель
Сommit
41fb0ca010

+ 1 - 3
lib/crowi/dev.js

@@ -27,9 +27,7 @@ class CrowiDev {
 
 
   initPromiseRejectionWarningHandler() {
   initPromiseRejectionWarningHandler() {
     // https://qiita.com/syuilo/items/0800d7e44e93203c7285
     // https://qiita.com/syuilo/items/0800d7e44e93203c7285
-    /* eslint-disable no-console */
-    process.on('unhandledRejection', console.dir);
-    /* eslint-enable */
+    process.on('unhandledRejection', console.dir);  // eslint-disable-line no-console
   }
   }
 
 
   initSwig() {
   initSwig() {

+ 1 - 2
lib/models/revision.js

@@ -1,7 +1,6 @@
 module.exports = function(crowi) {
 module.exports = function(crowi) {
-  /* eslint-disable no-unused-vars */
+  // eslint-disable-next-line no-unused-vars
   const logger = require('@alias/logger')('growi:models:revision');
   const logger = require('@alias/logger')('growi:models:revision');
-  /* eslint-enable */
 
 
   const mongoose = require('mongoose')
   const mongoose = require('mongoose')
     , ObjectId = mongoose.Schema.Types.ObjectId
     , ObjectId = mongoose.Schema.Types.ObjectId

+ 1 - 3
resource/js/components/SearchPage/SearchResult.js

@@ -121,9 +121,7 @@ export default class SearchResult extends React.Component {
           isDeleted = false;
           isDeleted = false;
         }
         }
       }).catch(err => {
       }).catch(err => {
-        /* eslint-disable no-console */
-        console.log(err.message);
-        /* eslint-enable */
+        console.error(err.message);   // eslint-disable-line no-console
         isDeleted = false;
         isDeleted = false;
         this.setState({errorMessageForDeleting: err.message});
         this.setState({errorMessageForDeleting: err.message});
       });
       });

+ 9 - 9
resource/js/legacy/crowi-admin.js

@@ -30,9 +30,9 @@ $(function() {
   $('#createdUserModal').modal('show');
   $('#createdUserModal').modal('show');
 
 
   $('#admin-password-reset-modal').on('show.bs.modal', function(button) {
   $('#admin-password-reset-modal').on('show.bs.modal', function(button) {
-    var data = $(button.relatedTarget);
-    var userId = data.data('user-id');
-    var email = data.data('user-email');
+    const data = $(button.relatedTarget);
+    const userId = data.data('user-id');
+    const email = data.data('user-email');
 
 
     $('#admin-password-reset-user').text(email);
     $('#admin-password-reset-user').text(email);
     $('#admin-users-reset-password input[name=user_id]').val(userId);
     $('#admin-users-reset-password input[name=user_id]').val(userId);
@@ -59,9 +59,9 @@ $(function() {
   });
   });
 
 
   $('#admin-delete-user-group-modal').on('show.bs.modal', function(button) {
   $('#admin-delete-user-group-modal').on('show.bs.modal', function(button) {
-    var data = $(button.relatedTarget);
-    var userGroupId = data.data('user-group-id');
-    var userGroupName = data.data('user-group-name');
+    const data = $(button.relatedTarget);
+    const userGroupId = data.data('user-group-id');
+    const userGroupName = data.data('user-group-name');
 
 
     $('#admin-delete-user-group-name').text(userGroupName);
     $('#admin-delete-user-group-name').text(userGroupName);
     $('#admin-user-groups-delete input[name=user_group_id]').val(userGroupId);
     $('#admin-user-groups-delete input[name=user_group_id]').val(userGroupId);
@@ -76,8 +76,8 @@ $(function() {
 
 
 
 
   $('#pictureUploadForm input[name=userGroupPicture]').on('change', function() {
   $('#pictureUploadForm input[name=userGroupPicture]').on('change', function() {
-    var $form = $('#pictureUploadForm');
-    var fd = new FormData($form[0]);
+    const $form = $('#pictureUploadForm');
+    const fd = new FormData($form[0]);
     if ($(this).val() == '') {
     if ($(this).val() == '') {
       return false;
       return false;
     }
     }
@@ -115,7 +115,7 @@ $(function() {
   elems.forEach(function(elem) {
   elems.forEach(function(elem) {
     const color = elem.dataset.color;
     const color = elem.dataset.color;
     const size = elem.dataset.size;
     const size = elem.dataset.size;
-    new Switchery(elem, { color, size });
+    new Switchery(elem, { color, size });   // eslint-disable-line no-undef
   });
   });
 });
 });