Yuki Takei 8 лет назад
Родитель
Сommit
6abb4c9591
3 измененных файлов с 17 добавлено и 6 удалено
  1. 7 2
      .eslintrc.js
  2. 3 3
      resource/js/components/SearchTypeahead.js
  3. 7 1
      resource/js/components/SeenUserList.js

+ 7 - 2
.eslintrc.js

@@ -51,7 +51,11 @@ module.exports = {
       }
     ],
     "key-spacing": [
-      "error", { "beforeColon": false, "afterColon": true }
+      "error", {
+        "beforeColon": false,
+        "afterColon": true,
+        "mode": "minimum"
+      }
     ],
     "keyword-spacing": [
       "error", {}
@@ -75,7 +79,8 @@ module.exports = {
     "react/no-string-refs": 'off',
     "semi": [
       "error",
-      "always"
+      "always",
+      { "omitLastInOneLineBlock": true }
     ],
     "space-before-blocks": [
       "error",

+ 3 - 3
resource/js/components/SearchTypeahead.js

@@ -98,7 +98,7 @@ export default class SearchTypeahead extends React.Component {
 
     // navigate to page
     if (page != null) {
-        window.location = page.path;
+      window.location = page.path;
     }
   }
 
@@ -139,7 +139,7 @@ export default class SearchTypeahead extends React.Component {
       ? 'Error on searching.'
       : 'No matches found on title...';
     const restoreFormButton = this.getRestoreFormButton();
-    const defaultSelected = (this.props.keywordOnInit != "")
+    const defaultSelected = (this.props.keywordOnInit != '')
       ? [{path: this.props.keywordOnInit}]
       : [];
 
@@ -148,7 +148,7 @@ export default class SearchTypeahead extends React.Component {
         <AsyncTypeahead
           {...this.props}
           ref="typeahead"
-          inputProps={{name: "q", autoComplete: "off"}}
+          inputProps={{name: 'q', autoComplete: 'off'}}
           isLoading={this.state.isLoading}
           labelKey="path"
           minLength={2}

+ 7 - 1
resource/js/components/SeenUserList.js

@@ -1,4 +1,6 @@
 import React from 'react';
+import PropTypes from 'prop-types';
+
 import UserList from './SeenUserList/UserList';
 
 export default class SeenUserList extends React.Component {
@@ -22,7 +24,7 @@ export default class SeenUserList extends React.Component {
 
   getSeenUserIds() {
     // FIXME: Consider another way to bind values.
-    const $seenUserList = $("#seen-user-list");
+    const $seenUserList = $('#seen-user-list');
     if ($seenUserList.length > 0) {
       const seenUsers = $seenUserList.data('seen-users');
       if (seenUsers) {
@@ -44,3 +46,7 @@ export default class SeenUserList extends React.Component {
     );
   }
 }
+
+SeenUserList.propTypes = {
+  crowi: PropTypes.object.isRequired,
+};