Skip to content

Commit

Permalink
Merge pull request #12757 from rtibbles/eslint_rules
Browse files Browse the repository at this point in the history
Remove custom eslint rules that are redundant with eslint-plugin-vue rules.
  • Loading branch information
rtibbles authored Oct 28, 2024
2 parents 0d3e311 + 2df81b1 commit 3b49acb
Show file tree
Hide file tree
Showing 21 changed files with 29 additions and 1,088 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,13 @@
},
props: {
// Facility filter only needed on SyncFacilityModalGroup
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
filterByFacilityId: {
type: String,
default: null,
},
// Channel filter only needed on ManageContentPage/SelectNetworkDeviceModal
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
filterByChannelId: {
type: String,
default: null,
Expand All @@ -247,19 +247,19 @@
default: false,
},
// When looking for devices for which a learner can sign up
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
filterByFacilityCanSignUp: {
type: Boolean,
default: null,
},
// In the setup wizard, to exclude importiing facilities that are "On My Own"
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
filterByOnMyOwnFacility: {
type: Boolean,
default: null,
},
// In the setup wizard, to exclude devices that do not have a facility
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
filterByHasFacilities: {
type: Boolean,
default: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@
}
return {};
},
/* eslint-disable kolibri/vue-no-unused-properties */
/* eslint-disable vue/no-unused-properties */
/**
* @public
* Note: the default duration historically for HTML5 Apps has been 5 min
*/
defaultDuration() {
return 300;
},
/* eslint-enable kolibri/vue-no-unused-properties */
/* eslint-enable vue/no-unused-properties */
entry() {
return (this.options && this.options.entry) || 'index.htm';
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -302,13 +302,13 @@
},
props: {
// `sections` is used in `setup`
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
sections: {
type: Array,
required: true,
},
// `selectedExercises` is used in `setup`
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
selectedExercises: {
type: Object,
required: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
increaseFontSizeDisabled() {
return this.fontSize === `${FONT_SIZE_MAX}px`;
},
/* eslint-disable kolibri/vue-no-unused-properties */
/* eslint-disable vue/no-unused-properties */
/**
* @public
*/
Expand All @@ -369,7 +369,7 @@
const seconds = (numberOfWords * 60) / WORDS_PER_MINUTE;
return seconds;
},
/* eslint-enable kolibri/vue-no-unused-properties */
/* eslint-enable vue/no-unused-properties */
locationsAreReady() {
return this.locations && this.locations.length > 0;
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
};
},
props: {
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
classToDelete: {
type: Object,
required: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@
}
return {};
},
/* eslint-disable kolibri/vue-no-unused-properties */
/* eslint-disable vue/no-unused-properties */
/**
* @public
* Note: the default duration historically for HTML5 Apps has been 5 min
*/
defaultDuration() {
return 300;
},
/* eslint-enable kolibri/vue-no-unused-properties */
/* eslint-enable vue/no-unused-properties */
entry() {
return (this.options && this.options.entry) || 'index.html';
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
}
},
props: {
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
deviceId: {
type: String,
default: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
};
},
props: {
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
contentNode: {
type: Object,
required: true,
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/ProgressBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
return { contentNodeProgressMap, contentNodeProgressMetaDataMap };
},
props: {
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
contentNode: {
type: Object,
required: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
default: null,
},
// Our linting doesn't detect usage in the setup function yet.
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
id: {
type: String,
required: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
default: null,
},
// Our linting doesn't detect usage in the setup function yet.
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
id: {
type: String,
required: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
},
props: {
// `quizzes` prop is used in `setup`
// eslint-disable-next-line kolibri/vue-no-unused-properties
// eslint-disable-next-line vue/no-unused-properties
quizzes: {
type: Array,
required: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
transcriptVisible() {
return this.transcript && !this.loading && this.captionTracks.length > 0;
},
/* eslint-disable kolibri/vue-no-unused-properties */
/* eslint-disable vue/no-unused-properties */
/**
* @public
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,14 @@
fullscreenText() {
return this.isInFullscreen ? this.$tr('exitFullscreen') : this.$tr('enterFullscreen');
},
/* eslint-disable kolibri/vue-no-unused-properties */
/* eslint-disable vue/no-unused-properties */
/**
* @public
*/
defaultDuration() {
return this.totalPages * 30;
},
/* eslint-enable kolibri/vue-no-unused-properties */
/* eslint-enable vue/no-unused-properties */
debouncedShowVisiblePages() {
// So as not to share debounced functions between instances of the same component
// and also to allow access to the cancel method of the debounced function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
isMobile() {
return this.windowBreakpoint < 3;
},
/* eslint-disable kolibri/vue-no-unused-properties */
/* eslint-disable vue/no-unused-properties */
availableHints() {
/* eslint-enable */
return this.totalHints - this.hintsVisible;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,15 @@
contentHeight: function () {
return window.innerHeight * 0.7 + 'px';
},
/* eslint-disable kolibri/vue-no-unused-properties */
/* eslint-disable vue/no-unused-properties */
/**
* @public
* Note: the default duration historically for slidshows has been 5 min
*/
defaultDuration() {
return 300;
},
/* eslint-enable kolibri/vue-no-unused-properties */
/* eslint-enable vue/no-unused-properties */
},
watch: {
defaultFile(newFile) {
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 3b49acb

Please sign in to comment.