Skip to content
This repository was archived by the owner on Jun 6, 2021. It is now read-only.

Commit bfd41fd

Browse files
tomawtomaw
authored
Merge pull request #17 from kiwiirc/master
Resync with upstream
2 parents c86fcc4 + 6e8d996 commit bfd41fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+889
-94
lines changed

‎src/components/utils/IrcInput.vue

+27-14
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,38 @@ export default Vue.component('irc-input', {
6161
},
6262
onPaste(event) {
6363
event.preventDefault();
64+
if (typeof event.clipboardData !== 'undefined') {
65+
let ignoreThisPaste = false;
66+
let clpData = event.clipboardData;
67+
clpData.types.forEach((type) => {
68+
let ignoreTypes = ['Files', 'image'];
69+
ignoreTypes.forEach((ig) => {
70+
if (type.indexOf(ig) > -1) {
71+
ignoreThisPaste = true;
72+
}
73+
});
74+
});
6475
65-
let clpData = (event.clipboardData || window.clipboardData);
66-
let ignoreThisPaste = false;
76+
if (ignoreThisPaste) {
77+
return;
78+
}
6779
68-
clpData.types.forEach((type) => {
69-
let ignoreTypes = ['Files', 'image'];
70-
ignoreTypes.forEach((ig) => {
71-
if (type.indexOf(ig) > -1) {
72-
ignoreThisPaste = true;
73-
}
74-
});
75-
});
80+
document.execCommand('insertText', false, clpData.getData('text/plain'));
81+
} else {
82+
// IE11
83+
let clpText = window.clipboardData.getData('Text');
84+
if (!clpText) {
85+
return;
86+
}
7687
77-
if (ignoreThisPaste) {
78-
return;
88+
let selection = window.getSelection();
89+
let range = selection.getRangeAt(0);
90+
if (range) {
91+
range.deleteContents();
92+
range.insertNode(document.createTextNode(clpText));
93+
}
7994
}
8095
81-
document.execCommand('insertText', false, clpData.getData('text/plain'));
82-
8396
setTimeout(() => {
8497
this.updateValueProps();
8598
}, 0);

‎src/res/globalStyle.css

-26
Original file line numberDiff line numberDiff line change
@@ -97,32 +97,6 @@ select {
9797
border: 2px solid;
9898
}
9999

100-
.u-form input[type='checkbox']::after,
101-
.u-form input[type='radio']::after {
102-
position: absolute;
103-
content: '';
104-
left: 1px;
105-
top: 1px;
106-
width: 14px;
107-
height: 14px;
108-
z-index: 10;
109-
transition: all 0.3s;
110-
opacity: 0;
111-
}
112-
113-
.u-form input[type='checkbox']:checked::after,
114-
.u-form input[type='radio']:checked::after {
115-
position: absolute;
116-
content: '';
117-
left: 1px;
118-
top: 1px;
119-
width: 14px;
120-
height: 14px;
121-
z-index: 10;
122-
transition: all 0.3s;
123-
opacity: 1;
124-
}
125-
126100
.u-form input[type="radio"] {
127101
float: right;
128102
}

‎src/res/locales/app.af-ZA.po

+21-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ msgstr ""
1010
"Last-Translator: Darren Whitlen (kiwiirc)\n"
1111
"Language-Team: Afrikaans\n"
1212
"Language: af_ZA\n"
13-
"PO-Revision-Date: 2019-05-19 11:01\n"
13+
"PO-Revision-Date: 2019-06-27 14:11\n"
1414

1515
#: Start
1616
msgid "start_button"
@@ -228,6 +228,10 @@ msgstr ""
228228
msgid "settings_use_monospace"
229229
msgstr "Gebruik eweredige spasiëring skrif"
230230

231+
#: Use Kiwi as my default IRC client
232+
msgid "settings_default_handler"
233+
msgstr ""
234+
231235
#: Traditional IRC layout
232236
msgid "settings_layout_compact"
233237
msgstr "Tradisionele IRC uitleg"
@@ -908,6 +912,22 @@ msgstr ""
908912
msgid "personal_add"
909913
msgstr ""
910914

915+
#: You are trying to connect to {{network}}
916+
msgid "personal_connect_to"
917+
msgstr ""
918+
919+
#: Network has been added to your existing Kiwi window.
920+
msgid "personal_added_to_existing"
921+
msgstr ""
922+
923+
#: Add network to existing Kiwi window
924+
msgid "personal_add_existing_tab"
925+
msgstr ""
926+
927+
#: Temporarily connect to this network
928+
msgid "personal_connect_temporary"
929+
msgstr ""
930+
911931
#: Saved networks
912932
msgid "personal_saved"
913933
msgstr ""

‎src/res/locales/app.ar-SA.po

+21-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ msgstr ""
1010
"Last-Translator: Darren Whitlen (kiwiirc)\n"
1111
"Language-Team: Arabic\n"
1212
"Language: ar_SA\n"
13-
"PO-Revision-Date: 2019-05-19 11:01\n"
13+
"PO-Revision-Date: 2019-06-27 14:12\n"
1414

1515
#: Start
1616
msgid "start_button"
@@ -228,6 +228,10 @@ msgstr ""
228228
msgid "settings_use_monospace"
229229
msgstr "اعدادات المساحه"
230230

231+
#: Use Kiwi as my default IRC client
232+
msgid "settings_default_handler"
233+
msgstr ""
234+
231235
#: Traditional IRC layout
232236
msgid "settings_layout_compact"
233237
msgstr "صورة الاسم"
@@ -908,6 +912,22 @@ msgstr "سيكونو هنا عندما تعود."
908912
msgid "personal_add"
909913
msgstr "إضافة شبكة"
910914

915+
#: You are trying to connect to {{network}}
916+
msgid "personal_connect_to"
917+
msgstr ""
918+
919+
#: Network has been added to your existing Kiwi window.
920+
msgid "personal_added_to_existing"
921+
msgstr ""
922+
923+
#: Add network to existing Kiwi window
924+
msgid "personal_add_existing_tab"
925+
msgstr ""
926+
927+
#: Temporarily connect to this network
928+
msgid "personal_connect_temporary"
929+
msgstr ""
930+
911931
#: Saved networks
912932
msgid "personal_saved"
913933
msgstr "الشبكات المحفوظة"

‎src/res/locales/app.bg-BG.po

+21-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ msgstr ""
1010
"Last-Translator: Darren Whitlen (kiwiirc)\n"
1111
"Language-Team: Bulgarian\n"
1212
"Language: bg_BG\n"
13-
"PO-Revision-Date: 2019-05-19 11:31\n"
13+
"PO-Revision-Date: 2019-06-27 16:01\n"
1414

1515
#: Start
1616
msgid "start_button"
@@ -228,6 +228,10 @@ msgstr "Разпределение на съобщенията"
228228
msgid "settings_use_monospace"
229229
msgstr "Използвайте Monospace"
230230

231+
#: Use Kiwi as my default IRC client
232+
msgid "settings_default_handler"
233+
msgstr "Използвайте Kiwi като IRC клиент по подразбиране"
234+
231235
#: Traditional IRC layout
232236
msgid "settings_layout_compact"
233237
msgstr "Традиционно IRC оформление"
@@ -908,6 +912,22 @@ msgstr "Те ще бъдат тук, когато се върнете."
908912
msgid "personal_add"
909913
msgstr "Добави IRC мрежа"
910914

915+
#: You are trying to connect to {{network}}
916+
msgid "personal_connect_to"
917+
msgstr "Опитвате се да се свържете с {{network}}"
918+
919+
#: Network has been added to your existing Kiwi window.
920+
msgid "personal_added_to_existing"
921+
msgstr "Мрежата е добавена към съществуващия ви прозорец."
922+
923+
#: Add network to existing Kiwi window
924+
msgid "personal_add_existing_tab"
925+
msgstr "Добавете мрежа към съществуващия прозорец на Kiwi"
926+
927+
#: Temporarily connect to this network
928+
msgid "personal_connect_temporary"
929+
msgstr "Временно се свържете с тази мрежа"
930+
911931
#: Saved networks
912932
msgid "personal_saved"
913933
msgstr "Запази IRC мрежа"

‎src/res/locales/app.bs-BA.po

+21-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ msgstr ""
1010
"Last-Translator: Darren Whitlen (kiwiirc)\n"
1111
"Language-Team: Bosnian\n"
1212
"Language: bs_BA\n"
13-
"PO-Revision-Date: 2019-05-19 22:51\n"
13+
"PO-Revision-Date: 2019-06-28 12:52\n"
1414

1515
#: Start
1616
msgid "start_button"
@@ -228,6 +228,10 @@ msgstr "Izgled poruke"
228228
msgid "settings_use_monospace"
229229
msgstr "Koristi monospace"
230230

231+
#: Use Kiwi as my default IRC client
232+
msgid "settings_default_handler"
233+
msgstr "Koristi Kiwi kao moj zadani IRC klijent"
234+
231235
#: Traditional IRC layout
232236
msgid "settings_layout_compact"
233237
msgstr "Izvorni IRC izgled"
@@ -908,6 +912,22 @@ msgstr "Ostaje ovdje kada se vratite."
908912
msgid "personal_add"
909913
msgstr "Dodaj mrežu"
910914

915+
#: You are trying to connect to {{network}}
916+
msgid "personal_connect_to"
917+
msgstr "Pokušavate se ponovno konektovati na {{network}}"
918+
919+
#: Network has been added to your existing Kiwi window.
920+
msgid "personal_added_to_existing"
921+
msgstr "Mreža je dodana na vaš postojeći Kiwi prozor."
922+
923+
#: Add network to existing Kiwi window
924+
msgid "personal_add_existing_tab"
925+
msgstr "Dodaj mrežu na postojeći Kiwi prozor"
926+
927+
#: Temporarily connect to this network
928+
msgid "personal_connect_temporary"
929+
msgstr "Odmah se poveži na ovu mrežu"
930+
911931
#: Saved networks
912932
msgid "personal_saved"
913933
msgstr "Sačuvane mreže"

‎src/res/locales/app.ca-ES.po

+21-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ msgstr ""
1010
"Last-Translator: Darren Whitlen (kiwiirc)\n"
1111
"Language-Team: Catalan\n"
1212
"Language: ca_ES\n"
13-
"PO-Revision-Date: 2019-05-19 12:00\n"
13+
"PO-Revision-Date: 2019-06-28 19:10\n"
1414

1515
#: Start
1616
msgid "start_button"
@@ -228,6 +228,10 @@ msgstr "Disseny dels missatges"
228228
msgid "settings_use_monospace"
229229
msgstr "Fer servir la font Monospace"
230230

231+
#: Use Kiwi as my default IRC client
232+
msgid "settings_default_handler"
233+
msgstr "Usar el Kiwi com el meu cliente IRC predeterminat"
234+
231235
#: Traditional IRC layout
232236
msgid "settings_layout_compact"
233237
msgstr "Disseny IRC tradicional"
@@ -908,6 +912,22 @@ msgstr "Estaran aquí quan tornis."
908912
msgid "personal_add"
909913
msgstr "Afegeix una xarxa"
910914

915+
#: You are trying to connect to {{network}}
916+
msgid "personal_connect_to"
917+
msgstr "Estàs intentant connectar-te a {{network}}"
918+
919+
#: Network has been added to your existing Kiwi window.
920+
msgid "personal_added_to_existing"
921+
msgstr "La xarxa s'ha afegit a la teva finestra existent del Kiwi."
922+
923+
#: Add network to existing Kiwi window
924+
msgid "personal_add_existing_tab"
925+
msgstr "Afegir la xarxa a la finestra existent del Kiwi"
926+
927+
#: Temporarily connect to this network
928+
msgid "personal_connect_temporary"
929+
msgstr "Connectar-se temporalment a aquesta xarxa"
930+
911931
#: Saved networks
912932
msgid "personal_saved"
913933
msgstr "Xarxes guardades"

‎src/res/locales/app.cs-CZ.po

+21-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ msgstr ""
1010
"Last-Translator: Darren Whitlen (kiwiirc)\n"
1111
"Language-Team: Czech\n"
1212
"Language: cs_CZ\n"
13-
"PO-Revision-Date: 2019-05-19 11:02\n"
13+
"PO-Revision-Date: 2019-06-27 14:12\n"
1414

1515
#: Start
1616
msgid "start_button"
@@ -228,6 +228,10 @@ msgstr ""
228228
msgid "settings_use_monospace"
229229
msgstr ""
230230

231+
#: Use Kiwi as my default IRC client
232+
msgid "settings_default_handler"
233+
msgstr ""
234+
231235
#: Traditional IRC layout
232236
msgid "settings_layout_compact"
233237
msgstr ""
@@ -908,6 +912,22 @@ msgstr ""
908912
msgid "personal_add"
909913
msgstr ""
910914

915+
#: You are trying to connect to {{network}}
916+
msgid "personal_connect_to"
917+
msgstr ""
918+
919+
#: Network has been added to your existing Kiwi window.
920+
msgid "personal_added_to_existing"
921+
msgstr ""
922+
923+
#: Add network to existing Kiwi window
924+
msgid "personal_add_existing_tab"
925+
msgstr ""
926+
927+
#: Temporarily connect to this network
928+
msgid "personal_connect_temporary"
929+
msgstr ""
930+
911931
#: Saved networks
912932
msgid "personal_saved"
913933
msgstr ""

‎src/res/locales/app.da-DK.po

+21-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ msgstr ""
1010
"Last-Translator: Darren Whitlen (kiwiirc)\n"
1111
"Language-Team: Danish\n"
1212
"Language: da_DK\n"
13-
"PO-Revision-Date: 2019-05-19 11:02\n"
13+
"PO-Revision-Date: 2019-06-27 14:12\n"
1414

1515
#: Start
1616
msgid "start_button"
@@ -228,6 +228,10 @@ msgstr ""
228228
msgid "settings_use_monospace"
229229
msgstr ""
230230

231+
#: Use Kiwi as my default IRC client
232+
msgid "settings_default_handler"
233+
msgstr ""
234+
231235
#: Traditional IRC layout
232236
msgid "settings_layout_compact"
233237
msgstr ""
@@ -908,6 +912,22 @@ msgstr ""
908912
msgid "personal_add"
909913
msgstr ""
910914

915+
#: You are trying to connect to {{network}}
916+
msgid "personal_connect_to"
917+
msgstr ""
918+
919+
#: Network has been added to your existing Kiwi window.
920+
msgid "personal_added_to_existing"
921+
msgstr ""
922+
923+
#: Add network to existing Kiwi window
924+
msgid "personal_add_existing_tab"
925+
msgstr ""
926+
927+
#: Temporarily connect to this network
928+
msgid "personal_connect_temporary"
929+
msgstr ""
930+
911931
#: Saved networks
912932
msgid "personal_saved"
913933
msgstr ""

0 commit comments

Comments
 (0)