From 22a2593bf2a3691519667e7d8cdc417a17203b5b Mon Sep 17 00:00:00 2001 From: Aviral Dasgupta Date: Tue, 5 Jul 2016 01:32:40 +0530 Subject: [PATCH 1/2] fix: unbreak old MessageComposerInput/TabComplete --- src/components/views/rooms/MessageComposer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js index 4dc28e73c5..f9371385d4 100644 --- a/src/components/views/rooms/MessageComposer.js +++ b/src/components/views/rooms/MessageComposer.js @@ -207,6 +207,7 @@ export default class MessageComposer extends React.Component { onUpArrow={this.onUpArrow} onDownArrow={this.onDownArrow} onTab={this.onTab} + tabComplete={this.props.tabComplete} // used for old messagecomposerinput/tabcomplete onContentChanged={this.onInputContentChanged} />, uploadButton, hangupButton, From ed305bd547b3bd9d2ffb04a44d12f2d0f3a55c29 Mon Sep 17 00:00:00 2001 From: Aviral Dasgupta Date: Tue, 5 Jul 2016 01:37:01 +0530 Subject: [PATCH 2/2] fix: https for DDG, provide range for UserProvider --- src/autocomplete/DuckDuckGoProvider.js | 2 +- src/autocomplete/UserProvider.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/autocomplete/DuckDuckGoProvider.js b/src/autocomplete/DuckDuckGoProvider.js index cfd3cb2ff6..1746ce0aaa 100644 --- a/src/autocomplete/DuckDuckGoProvider.js +++ b/src/autocomplete/DuckDuckGoProvider.js @@ -16,7 +16,7 @@ export default class DuckDuckGoProvider extends AutocompleteProvider { } static getQueryUri(query: String) { - return `http://api.duckduckgo.com/?q=${encodeURIComponent(query)}` + return `https://api.duckduckgo.com/?q=${encodeURIComponent(query)}` + `&format=json&no_redirect=1&no_html=1&t=${encodeURIComponent(REFERRER)}`; } diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js index 3e65a65676..a583592bae 100644 --- a/src/autocomplete/UserProvider.js +++ b/src/autocomplete/UserProvider.js @@ -32,6 +32,7 @@ export default class UserProvider extends AutocompleteProvider { title={user.displayName || user.userId} description={user.userId} /> ), + range }; }).slice(0, 4); }