alex/yomichan
1
Fork 0
Code Releases Activity

Move searchTerms/searchKanji to front of object definitions (#873)

Browse Source
This commit is contained in:
toasted-nutbread 2020-09-27 11:53:07 -04:00 committed by GitHub
parent 3b6e3193ae
commit 6b6ee76550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ext/bg/data/options-schema.json
View File

@ -352,12 +352,12 @@
}, },
"options": { "options": {
"showAdvanced": false, "showAdvanced": false,
"searchTerms": true,
"searchKanji": true,
"scanOnTouchMove": true, "scanOnTouchMove": true,
"scanOnPenHover": true, "scanOnPenHover": true,
"scanOnPenPress": true, "scanOnPenPress": true,
"scanOnPenRelease": false, "scanOnPenRelease": false,
"searchTerms": true,
"searchKanji": true,
"preventTouchScrolling": false "preventTouchScrolling": false
} }
}, },
@ -371,12 +371,12 @@
}, },
"options": { "options": {
"showAdvanced": false, "showAdvanced": false,
"searchTerms": true,
"searchKanji": true,
"scanOnTouchMove": true, "scanOnTouchMove": true,
"scanOnPenHover": true, "scanOnPenHover": true,
"scanOnPenPress": true, "scanOnPenPress": true,
"scanOnPenRelease": false, "scanOnPenRelease": false,
"searchTerms": true,
"searchKanji": true,
"preventTouchScrolling": true "preventTouchScrolling": true
} }
} }
@ -423,12 +423,12 @@
"type": "object", "type": "object",
"required": [ "required": [
"showAdvanced", "showAdvanced",
"searchTerms",
"searchKanji",
"scanOnTouchMove", "scanOnTouchMove",
"scanOnPenHover", "scanOnPenHover",
"scanOnPenPress", "scanOnPenPress",
"scanOnPenRelease", "scanOnPenRelease",
"searchTerms",
"searchKanji",
"preventTouchScrolling" "preventTouchScrolling"
], ],
"properties": { "properties": {
@ -436,6 +436,14 @@
"type": "boolean", "type": "boolean",
"default": false "default": false
}, },
"searchTerms": {
"type": "boolean",
"default": true
},
"searchKanji": {
"type": "boolean",
"default": true
},
"scanOnTouchMove": { "scanOnTouchMove": {
"type": "boolean", "type": "boolean",
"default": true "default": true
@ -452,14 +460,6 @@
"type": "boolean", "type": "boolean",
"default": false "default": false
}, },
"searchTerms": {
"type": "boolean",
"default": true
},
"searchKanji": {
"type": "boolean",
"default": true
},
"preventTouchScrolling": { "preventTouchScrolling": {
"type": "boolean", "type": "boolean",
"default": true "default": true

4
ext/bg/js/options.js
View File

@ -522,12 +522,12 @@ class OptionsUtil {
} }
const createInputDefaultOptions = () => ({ const createInputDefaultOptions = () => ({
showAdvanced: false, showAdvanced: false,
searchTerms: true,
searchKanji: true,
scanOnTouchMove: true, scanOnTouchMove: true,
scanOnPenHover: true, scanOnPenHover: true,
scanOnPenPress: true, scanOnPenPress: true,
scanOnPenRelease: false, scanOnPenRelease: false,
searchTerms: true,
searchKanji: true,
preventTouchScrolling: true preventTouchScrolling: true
}); });
for (const {options: profileOptions} of options.profiles) { for (const {options: profileOptions} of options.profiles) {

4
ext/bg/js/settings/scan-inputs-controller.js
View File

@ -99,12 +99,12 @@ class ScanInputsController {
types: {mouse: true, touch: false, pen: false}, types: {mouse: true, touch: false, pen: false},
options: { options: {
showAdvanced: false, showAdvanced: false,
searchTerms: true,
searchKanji: true,
scanOnTouchMove: true, scanOnTouchMove: true,
scanOnPenHover: true, scanOnPenHover: true,
scanOnPenPress: true, scanOnPenPress: true,
scanOnPenRelease: false, scanOnPenRelease: false,
searchTerms: true,
searchKanji: true,
preventTouchScrolling: true preventTouchScrolling: true
} }
}] }]

20
ext/mixed/js/text-scanner.js
View File

@ -120,12 +120,28 @@ class TextScanner extends EventDispatcher {
include, include,
exclude, exclude,
types, types,
options: {scanOnTouchMove, scanOnPenHover, scanOnPenPress, scanOnPenRelease, searchTerms, searchKanji, preventTouchScrolling} options: {
searchTerms,
searchKanji,
scanOnTouchMove,
scanOnPenHover,
scanOnPenPress,
scanOnPenRelease,
preventTouchScrolling
}
}) => ({ }) => ({
include: this._getInputArray(include), include: this._getInputArray(include),
exclude: this._getInputArray(exclude), exclude: this._getInputArray(exclude),
types: this._getInputTypeSet(types), types: this._getInputTypeSet(types),
options: {scanOnTouchMove, scanOnPenHover, scanOnPenPress, scanOnPenRelease, searchTerms, searchKanji, preventTouchScrolling} options: {
searchTerms,
searchKanji,
scanOnTouchMove,
scanOnPenHover,
scanOnPenPress,
scanOnPenRelease,
preventTouchScrolling
}
})); }));
} }
if (typeof deepContentScan === 'boolean') { if (typeof deepContentScan === 'boolean') {

12
test/test-options-util.js
View File

@ -333,12 +333,12 @@ function createProfileOptionsUpdatedTestData1() {
}, },
options: { options: {
showAdvanced: false, showAdvanced: false,
searchTerms: true,
searchKanji: true,
scanOnTouchMove: true, scanOnTouchMove: true,
scanOnPenHover: true, scanOnPenHover: true,
scanOnPenPress: true, scanOnPenPress: true,
scanOnPenRelease: false, scanOnPenRelease: false,
searchTerms: true,
searchKanji: true,
preventTouchScrolling: true preventTouchScrolling: true
} }
}, },
@ -352,12 +352,12 @@ function createProfileOptionsUpdatedTestData1() {
}, },
options: { options: {
showAdvanced: false, showAdvanced: false,
searchTerms: true,
searchKanji: true,
scanOnTouchMove: true, scanOnTouchMove: true,
scanOnPenHover: true, scanOnPenHover: true,
scanOnPenPress: true, scanOnPenPress: true,
scanOnPenRelease: false, scanOnPenRelease: false,
searchTerms: true,
searchKanji: true,
preventTouchScrolling: true preventTouchScrolling: true
} }
}, },
@ -371,12 +371,12 @@ function createProfileOptionsUpdatedTestData1() {
}, },
options: { options: {
showAdvanced: false, showAdvanced: false,
searchTerms: true,
searchKanji: true,
scanOnTouchMove: true, scanOnTouchMove: true,
scanOnPenHover: true, scanOnPenHover: true,
scanOnPenPress: true, scanOnPenPress: true,
scanOnPenRelease: false, scanOnPenRelease: false,
searchTerms: true,
searchKanji: true,
preventTouchScrolling: true preventTouchScrolling: true
} }
} }