From 4a5401a58e2c91ad8b7aab85aaff18c991317382 Mon Sep 17 00:00:00 2001
From: cwm <chriswmartin@protonmail.com>
Date: Fri, 8 Dec 2017 20:50:39 -0600
Subject: merge tootsuite prs #5895 and #5889 into glitch flavour

---
 app/javascript/flavours/glitch/components/autosuggest_textarea.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/javascript/flavours/glitch/components')

diff --git a/app/javascript/flavours/glitch/components/autosuggest_textarea.js b/app/javascript/flavours/glitch/components/autosuggest_textarea.js
index 551528e5a..d067b252f 100644
--- a/app/javascript/flavours/glitch/components/autosuggest_textarea.js
+++ b/app/javascript/flavours/glitch/components/autosuggest_textarea.js
@@ -209,6 +209,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
             onBlur={this.onBlur}
             onPaste={this.onPaste}
             style={style}
+	    aria-autocomplete='list'
           />
         </label>
 
-- 
cgit 


From 02d71c6a11339f3a6bd28b2ce14251a62185dd43 Mon Sep 17 00:00:00 2001
From: cwm <chriswmartin@protonmail.com>
Date: Fri, 8 Dec 2017 21:09:53 -0600
Subject: fix a missing semicolon and mixed tabs/spaces that travis was
 complaining about

---
 app/javascript/flavours/glitch/actions/timelines.js               | 2 +-
 app/javascript/flavours/glitch/components/autosuggest_textarea.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/javascript/flavours/glitch/components')

diff --git a/app/javascript/flavours/glitch/actions/timelines.js b/app/javascript/flavours/glitch/actions/timelines.js
index 1665c2c48..9a5b2e6da 100644
--- a/app/javascript/flavours/glitch/actions/timelines.js
+++ b/app/javascript/flavours/glitch/actions/timelines.js
@@ -119,7 +119,7 @@ export const refreshDirectTimeline       = () => refreshTimeline('direct', '/api
 export const refreshAccountTimeline      = accountId => refreshTimeline(`account:${accountId}`, `/api/v1/accounts/${accountId}/statuses`);
 export const refreshAccountMediaTimeline = accountId => refreshTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { only_media: true });
 export const refreshHashtagTimeline      = hashtag => refreshTimeline(`hashtag:${hashtag}`, `/api/v1/timelines/tag/${hashtag}`);
-export const refreshListTimeline         = id => refreshTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`)
+export const refreshListTimeline         = id => refreshTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`);
 
 export function refreshTimelineFail(timeline, error, skipLoading) {
   return {
diff --git a/app/javascript/flavours/glitch/components/autosuggest_textarea.js b/app/javascript/flavours/glitch/components/autosuggest_textarea.js
index d067b252f..a29b2c9c5 100644
--- a/app/javascript/flavours/glitch/components/autosuggest_textarea.js
+++ b/app/javascript/flavours/glitch/components/autosuggest_textarea.js
@@ -209,7 +209,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
             onBlur={this.onBlur}
             onPaste={this.onPaste}
             style={style}
-	    aria-autocomplete='list'
+            aria-autocomplete='list'
           />
         </label>
 
-- 
cgit