Browse Source

Added aria-controls attribute for accessibility in dropdown search, fixed editor strikethrough typo (#1302)

Filip A. Zofakis 5 years ago
parent
commit
8569ef23db

+ 0 - 1
frontend/src/components/editor/actions/code.js

@@ -1,6 +1,5 @@
 import React from "react"
 import Action from "./action"
-import isUrl from "misago/utils/is-url"
 
 export default function(props) {
   return (

+ 3 - 3
frontend/src/components/editor/actions/striketrough.js → frontend/src/components/editor/actions/strikethrough.js

@@ -4,8 +4,8 @@ import Action from "./action"
 export default function(props) {
   return (
     <Action
-      execAction={makeStriketrough}
-      title={gettext("Striketrough selection")}
+      execAction={makeStrikethrough}
+      title={gettext("Strikethrough selection")}
       {...props}
     >
       <span className="material-icon">format_strikethrough</span>
@@ -13,7 +13,7 @@ export default function(props) {
   )
 }
 
-export function makeStriketrough(selection, replace) {
+export function makeStrikethrough(selection, replace) {
   if (selection.length) {
     replace("~~" + selection + "~~")
   }

+ 2 - 2
frontend/src/components/editor/index.js

@@ -5,7 +5,7 @@ import Hr from "./actions/hr"
 import Image from "./actions/image"
 import Link from "./actions/link"
 import Spoiler from "./actions/Spoiler"
-import Striketrough from "./actions/striketrough"
+import Strikethrough from "./actions/strikethrough"
 import Strong from "./actions/strong"
 import Quote from "./actions/quote"
 import AttachmentsEditor from "./attachments"
@@ -111,7 +111,7 @@ export default class extends React.Component {
               disabled={this.props.loading || this.state.isPreviewLoading}
               replaceSelection={this.replaceSelection}
             />
-            <Striketrough
+            <Strikethrough
               className="btn-default btn-sm pull-left"
               disabled={this.props.loading || this.state.isPreviewLoading}
               replaceSelection={this.replaceSelection}

+ 1 - 0
frontend/src/components/navbar-search/dropdown/input.js

@@ -5,6 +5,7 @@ export default function({ value, onChange }) {
     <input
       aria-haspopup="true"
       aria-expanded="false"
+      aria-controls="dropdown-menu dropdown-search-results"
       autoComplete="off"
       className="form-control"
       value={value}

+ 1 - 1
misago/locale/en/LC_MESSAGES/djangojs.po

@@ -332,7 +332,7 @@ msgid "Insert quote"
 msgstr ""
 
 #: static/misago/js/misago.js:3
-msgid "Striketrough selection"
+msgid "Strikethrough selection"
 msgstr ""
 
 #: static/misago/js/misago.js:3

+ 1 - 1
misago/locale/es/LC_MESSAGES/djangojs.po

@@ -340,7 +340,7 @@ msgid "Insert quote"
 msgstr "Añadir cita"
 
 #: static/misago/js/misago.js:3
-msgid "Striketrough selection"
+msgid "Strikethrough selection"
 msgstr "Tachar selección"
 
 #: static/misago/js/misago.js:3

+ 1 - 1
misago/locale/fr/LC_MESSAGES/djangojs.po

@@ -350,7 +350,7 @@ msgid "Insert quote"
 msgstr "Insérer une citation"
 
 #: static/misago/js/misago.js:3
-msgid "Striketrough selection"
+msgid "Strikethrough selection"
 msgstr "Rayer"
 
 #: static/misago/js/misago.js:3

+ 1 - 1
misago/locale/ru/LC_MESSAGES/djangojs.po

@@ -346,7 +346,7 @@ msgid "Insert quote"
 msgstr "Вставить цитату"
 
 #: static/misago/js/misago.js:3
-msgid "Striketrough selection"
+msgid "Strikethrough selection"
 msgstr "Зачеркнуть выделенное"
 
 #: static/misago/js/misago.js:3

+ 1 - 1
misago/locale/tr/LC_MESSAGES/djangojs.po

@@ -348,7 +348,7 @@ msgid "Insert quote"
 msgstr "Alıntı yap"
 
 #: static/misago/js/misago.js:3
-msgid "Striketrough selection"
+msgid "Strikethrough selection"
 msgstr "Üstü çizili seçim"
 
 #: static/misago/js/misago.js:3

+ 1 - 1
misago/locale/zh_Hans/LC_MESSAGES/djangojs.po

@@ -337,7 +337,7 @@ msgid "Insert quote"
 msgstr "插入引用"
 
 #: static/misago/js/misago.js:3
-msgid "Striketrough selection"
+msgid "Strikethrough selection"
 msgstr "删除线"
 
 #: static/misago/js/misago.js:3

+ 2 - 2
misago/markup/md/strikethrough.py

@@ -1,12 +1,12 @@
 import markdown
 from markdown.inlinepatterns import SimpleTagPattern
 
-STRIKETROUGH_RE = r"(~{2})(.+?)\2"
+STRIKETHROUGH_RE = r"(~{2})(.+?)\2"
 
 
 class StrikethroughExtension(markdown.Extension):
     def extendMarkdown(self, md):
         md.registerExtension(self)
         md.inlinePatterns.add(
-            "misago_strikethrough", SimpleTagPattern(STRIKETROUGH_RE, "del"), "_end"
+            "misago_strikethrough", SimpleTagPattern(STRIKETHROUGH_RE, "del"), "_end"
         )

+ 2 - 2
misago/markup/parser.py

@@ -97,8 +97,8 @@ def md_factory(allow_links=True, allow_images=True, allow_blocks=True):
     md.inlinePatterns.add("bb_u", underline, "<emphasis2")
 
     # Add ~~deleted~~
-    striketrough_md = StrikethroughExtension()
-    striketrough_md.extendMarkdown(md)
+    strikethrough_md = StrikethroughExtension()
+    strikethrough_md.extendMarkdown(md)
 
     if allow_links:
         # Add [url]