diff options
| author | Hakaba Hitoyo <tsukadayoshio@gmail.com> | 2018-11-29 11:05:17 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-11-29 11:05:17 +0900 |
| commit | afdb23ff572dcb40073419827746a9015163bb1e (patch) | |
| tree | cc1604701eaa6daed5eeddf324f7897d0347b641 /src | |
| parent | 10.58.2 (diff) | |
| download | misskey-afdb23ff572dcb40073419827746a9015163bb1e.tar.gz misskey-afdb23ff572dcb40073419827746a9015163bb1e.tar.bz2 misskey-afdb23ff572dcb40073419827746a9015163bb1e.zip | |
Feature / Configurable web search engine (#3406)
* configurable web search engine
* add webSearchEngine config in mobile ui
* add webSearchEngine config in desktop ui
* add webSearchEngine config
* add messages for web search engine config
* correct locale
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/common/views/components/google.vue | 5 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/settings.vue | 10 | ||||
| -rw-r--r-- | src/client/app/mobile/views/pages/settings.vue | 10 | ||||
| -rw-r--r-- | src/client/app/store.ts | 1 |
4 files changed, 25 insertions, 1 deletions
diff --git a/src/client/app/common/views/components/google.vue b/src/client/app/common/views/components/google.vue index 1d852cf25a..dab2e6824a 100644 --- a/src/client/app/common/views/components/google.vue +++ b/src/client/app/common/views/components/google.vue @@ -22,7 +22,10 @@ export default Vue.extend({ }, methods: { search() { - window.open(`https://www.google.com/?#q=${this.query}`, '_blank'); + const engine = this.$store.state.settings.webSearchEngine || + 'https://www.google.com/?#q={{query}}'; + const url = engine.replace('{{query}}', this.query) + window.open(url, '_blank'); } } }); diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index 62106768b5..a474a50159 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -91,6 +91,11 @@ </ui-select> </section> </section> + + <section> + <header>{{ $t('web-search-engine') }}</header> + <ui-input v-model="webSearchEngine">{{ $t('web-search-engine') }}<span slot="desc">{{ $t('web-search-engine-desc') }}</span></ui-input> + </section> </ui-card> <ui-card class="web" v-show="page == 'web'"> @@ -455,6 +460,11 @@ export default Vue.extend({ set(value) { this.$store.dispatch('settings/set', { key: 'defaultNoteVisibility', value }); } }, + webSearchEngine: { + get() { return this.$store.state.settings.webSearchEngine; }, + set(value) { this.$store.dispatch('settings/set', { key: 'webSearchEngine', value }); } + }, + showReplyTarget: { get() { return this.$store.state.settings.showReplyTarget; }, set(value) { this.$store.dispatch('settings/set', { key: 'showReplyTarget', value }); } diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue index 0f54933925..8b6d0e79d2 100644 --- a/src/client/app/mobile/views/pages/settings.vue +++ b/src/client/app/mobile/views/pages/settings.vue @@ -86,6 +86,11 @@ </ui-select> </section> </section> + + <section> + <header>{{ $t('web-search-engine') }}</header> + <ui-input v-model="webSearchEngine">{{ $t('web-search-engine') }}<span slot="desc">{{ $t('web-search-engine-desc') }}</span></ui-input> + </section> </ui-card> <x-drive-settings/> @@ -365,6 +370,11 @@ export default Vue.extend({ get() { return this.$store.state.settings.defaultNoteVisibility; }, set(value) { this.$store.dispatch('settings/set', { key: 'defaultNoteVisibility', value }); } }, + + webSearchEngine: { + get() { return this.$store.state.settings.webSearchEngine; }, + set(value) { this.$store.dispatch('settings/set', { key: 'webSearchEngine', value }); } + }, }, mounted() { diff --git a/src/client/app/store.ts b/src/client/app/store.ts index a498b0138f..159ed994cf 100644 --- a/src/client/app/store.ts +++ b/src/client/app/store.ts @@ -35,6 +35,7 @@ const defaultSettings = { iLikeSushi: false, rememberNoteVisibility: false, defaultNoteVisibility: 'public', + webSearchEngine: 'https://www.google.com/?#q={{query}}', mutedWords: [], games: { reversi: { |