Skip to content

Commit 467466b

Browse files
christianmemijechristianmemije
committed
core-textbox to k-textbox
1 parent afdff2d commit 467466b

File tree

20 files changed

+209
-286
lines changed

20 files changed

+209
-286
lines changed

‎kolibri/core/assets/src/core-app/apiSpec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import coreBase from '../views/core-base';
3434
import coreModal from '../views/core-modal';
3535
import sideNav from '../views/side-nav';
3636
import kButton from '../views/k-button';
37-
import textbox from '../views/textbox';
37+
import kTextbox from '../views/k-textbox';
3838
import dropdownMenu from '../views/dropdown-menu';
3939
import kNavbar from '../views/k-navbar';
4040
import kNavbarButton from '../views/k-navbar/button';
@@ -91,7 +91,7 @@ export default {
9191
coreModal,
9292
sideNav,
9393
kButton,
94-
textbox,
94+
kTextbox,
9595
dropdownMenu,
9696
kNavbar,
9797
kNavbarButton,

‎kolibri/core/assets/src/views/textbox/index.vue‎ renamed to ‎kolibri/core/assets/src/views/k-textbox/index.vue‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@
2626

2727
<script>
2828
29-
/**
30-
* A simple textbox that emits an event when its text is updated.
31-
*/
32-
3329
import uiTextbox from 'keen-ui/src/UiTextbox';
3430
31+
/**
32+
* Handles user input.
33+
*/
3534
export default {
36-
name: 'KolibriTextBox',
35+
name: 'k-textbox',
3736
props: {
3837
disabled: { type: Boolean },
3938
autofocus: { type: Boolean },
@@ -63,7 +62,9 @@
6362
},
6463
methods: {
6564
updateText(text) {
66-
// v-model is just a :value + @input
65+
/**
66+
* v-model is just a :value + @input
67+
*/
6768
this.$emit('input', this.currentText);
6869
},
6970
reset() {

‎kolibri/plugins/coach/assets/src/views/create-exam-page/index.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<h1>{{ $tr('createNewExam', { channelName: currentChannel.name }) }}</h1>
55
<div class="pure-g">
66
<div :class="windowSize.breakpoint > 3 ? 'pure-u-1-2' : 'pure-u-1-1'">
7-
<textbox
7+
<k-textbox
88
:label="$tr('title')"
99
:ariaLabel="$tr('title')"
1010
:placeholder="$tr('enterTitle')"
@@ -17,7 +17,7 @@
1717
/>
1818
</div>
1919
<div :class="windowSize.breakpoint > 3 ? 'pure-u-1-2' : 'pure-u-1-1'">
20-
<textbox
20+
<k-textbox
2121
:label="$tr('numQuestions')"
2222
:ariaLabel="$tr('numQuestions')"
2323
:placeholder="$tr('enterNum')"
@@ -32,7 +32,7 @@
3232
</div>
3333

3434
<h2>{{ $tr('chooseExercises') }}</h2>
35-
<!--<textbox-->
35+
<!--<k-textbox-->
3636
<!--:ariaLabel="$tr('searchContent')"-->
3737
<!--:placeholder="$tr('searchContent')"-->
3838
<!--v-model.trim="searchInput"-->
@@ -138,7 +138,7 @@
138138
import uiProgressLinear from 'keen-ui/src/UiProgressLinear';
139139
import kButton from 'kolibri.coreVue.components.kButton';
140140
import kCheckbox from 'kolibri.coreVue.components.kCheckbox';
141-
import textbox from 'kolibri.coreVue.components.textbox';
141+
import kTextbox from 'kolibri.coreVue.components.kTextbox';
142142
import topicRow from './topic-row';
143143
import exerciseRow from './exercise-row';
144144
import previewNewExamModal from './preview-new-exam-modal';
@@ -188,7 +188,7 @@
188188
uiSnackbarContainer,
189189
uiProgressLinear,
190190
kButton,
191-
textbox,
191+
kTextbox,
192192
topicRow,
193193
exerciseRow,
194194
previewNewExamModal,

‎kolibri/plugins/coach/assets/src/views/exams-page/rename-exam-modal.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<core-modal :title="$tr('renameExam')" @cancel="close">
44
<form @submit.prevent="callRenameExam">
5-
<core-textbox
5+
<k-textbox
66
:label="$tr('examName')"
77
:aria-label="$tr('examName')"
88
:autofocus="true"
@@ -25,7 +25,7 @@
2525
import * as examActions from '../../state/actions/exam';
2626
import coreModal from 'kolibri.coreVue.components.coreModal';
2727
import kButton from 'kolibri.coreVue.components.kButton';
28-
import coreTextbox from 'kolibri.coreVue.components.textbox';
28+
import kTextbox from 'kolibri.coreVue.components.kTextbox';
2929
export default {
3030
name: 'renameExamModal',
3131
$trs: {
@@ -38,7 +38,7 @@
3838
components: {
3939
coreModal,
4040
kButton,
41-
coreTextbox,
41+
kTextbox,
4242
},
4343
props: {
4444
examId: {

‎kolibri/plugins/coach/assets/src/views/groups-page/create-group-modal.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@cancel="close">
55
<div>
66
<form @submit.prevent="callCreateGroup">
7-
<textbox type="text"
7+
<k-textbox type="text"
88
:label="$tr('learnerGroupName')"
99
:aria-label="$tr('learnerGroupName')"
1010
:autofocus="true"
@@ -30,7 +30,7 @@
3030
3131
import * as groupActions from '../../state/actions/group';
3232
import coreModal from 'kolibri.coreVue.components.coreModal';
33-
import textbox from 'kolibri.coreVue.components.textbox';
33+
import kTextbox from 'kolibri.coreVue.components.kTextbox';
3434
import kButton from 'kolibri.coreVue.components.kButton';
3535
export default {
3636
name: 'createGroupModal',
@@ -49,7 +49,7 @@
4949
},
5050
components: {
5151
coreModal,
52-
textbox,
52+
kTextbox,
5353
kButton,
5454
},
5555
props: {

‎kolibri/plugins/coach/assets/src/views/groups-page/delete-group-modal.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
2020
import * as groupActions from '../../state/actions/group';
2121
import coreModal from 'kolibri.coreVue.components.coreModal';
22-
import textbox from 'kolibri.coreVue.components.textbox';
22+
import kTextbox from 'kolibri.coreVue.components.kTextbox';
2323
import kButton from 'kolibri.coreVue.components.kButton';
2424
export default {
2525
name: 'deleteGroupModal',
@@ -33,7 +33,7 @@
3333
},
3434
components: {
3535
coreModal,
36-
textbox,
36+
kTextbox,
3737
kButton,
3838
},
3939
props: {

‎kolibri/plugins/coach/assets/src/views/groups-page/rename-group-modal.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@cancel="close">
55
<div>
66
<form @submit.prevent="callRenameGroup">
7-
<textbox type="text"
7+
<k-textbox type="text"
88
:label="$tr('learnerGroupName')"
99
:aria-label="$tr('learnerGroupName')"
1010
:autofocus="true"
@@ -30,7 +30,7 @@
3030
3131
import * as groupActions from '../../state/actions/group';
3232
import coreModal from 'kolibri.coreVue.components.coreModal';
33-
import textbox from 'kolibri.coreVue.components.textbox';
33+
import kTextbox from 'kolibri.coreVue.components.kTextbox';
3434
import kButton from 'kolibri.coreVue.components.kButton';
3535
export default {
3636
name: 'renameGroupModal',
@@ -49,7 +49,7 @@
4949
},
5050
components: {
5151
coreModal,
52-
textbox,
52+
kTextbox,
5353
kButton,
5454
},
5555
props: {

‎kolibri/plugins/management/assets/src/views/class-edit-page/class-rename-modal.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
>
77
<div>
88
<form @submit.prevent="updateName">
9-
<core-textbox
9+
<k-textbox
1010
:label="$tr('classname')"
1111
:aria-label="$tr('classname')"
1212
v-model.trim="name"
@@ -43,7 +43,7 @@
4343
import * as actions from '../../state/actions';
4444
import kButton from 'kolibri.coreVue.components.kButton';
4545
import coreModal from 'kolibri.coreVue.components.coreModal';
46-
import coreTextbox from 'kolibri.coreVue.components.textbox';
46+
import kTextbox from 'kolibri.coreVue.components.kTextbox';
4747
export default {
4848
name: 'classnameEditModal',
4949
$trs: {
@@ -56,7 +56,7 @@
5656
components: {
5757
kButton,
5858
coreModal,
59-
coreTextbox,
59+
kTextbox,
6060
},
6161
props: {
6262
classname: {

‎kolibri/plugins/management/assets/src/views/class-enroll-page/index.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
:aria-label="$tr('search')"
5050
icon="search"
5151
/>
52-
<textbox
52+
<k-textbox
5353
:aria-label="$tr('searchForUser')"
5454
v-model.trim="filterInput"
5555
type="search"
@@ -155,7 +155,7 @@
155155
import kCheckbox from 'kolibri.coreVue.components.kCheckbox';
156156
import uiIconButton from 'keen-ui/src/UiIconButton';
157157
import uiIcon from 'keen-ui/src/UiIcon';
158-
import textbox from 'kolibri.coreVue.components.textbox';
158+
import kTextbox from 'kolibri.coreVue.components.kTextbox';
159159
import userCreateModal from '../user-page/user-create-modal';
160160
import confirmEnrollmentModal from './confirm-enrollment-modal';
161161
import uiSwitch from 'keen-ui/src/UiSwitch';
@@ -191,7 +191,7 @@
191191
kCheckbox,
192192
uiIconButton,
193193
uiIcon,
194-
textbox,
194+
kTextbox,
195195
userCreateModal,
196196
confirmEnrollmentModal,
197197
uiSwitch,

‎kolibri/plugins/management/assets/src/views/manage-class-page/class-create-modal.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
>
77
<div>
88
<form @submit.prevent="createNewClass">
9-
<core-textbox
9+
<k-textbox
1010
:label="$tr('classname')"
1111
:aria-label="$tr('classname')"
1212
v-model.trim="name"
@@ -43,7 +43,7 @@
4343
import * as actions from '../../state/actions';
4444
import kButton from 'kolibri.coreVue.components.kButton';
4545
import coreModal from 'kolibri.coreVue.components.coreModal';
46-
import coreTextbox from 'kolibri.coreVue.components.textbox';
46+
import kTextbox from 'kolibri.coreVue.components.kTextbox';
4747
export default {
4848
name: 'classCreateModal',
4949
$trs: {
@@ -56,7 +56,7 @@
5656
components: {
5757
kButton,
5858
coreModal,
59-
coreTextbox,
59+
kTextbox,
6060
},
6161
props: {
6262
classes: {

0 commit comments

Comments
 (0)