alex/yomichan
1
Fork 0
Code Releases Activity

Add support for using optionsContext to select which profile to use

Browse Source
This commit is contained in:
toasted-nutbread 2019-09-10 19:55:14 -04:00
parent 8c4fb28a30
commit dcfe722ba6
12 changed files with 91 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/bg/js/api.js
View File

@ -140,7 +140,10 @@ async function apiCommandExec(command) {
},
toggle: async () => {
const optionsContext = {depth: 0};
const optionsContext = {
depth: 0,
url: window.location.href
};
const options = await apiOptionsGet(optionsContext);
options.general.enable = !options.general.enable;
await apiOptionsSave('popup');

38
ext/bg/js/backend.js
View File

@ -23,7 +23,8 @@ class Backend {
this.anki = new AnkiNull();
this.options = null;
this.optionsContext = {
depth: 0
depth: 0,
url: window.location.href
};
this.isPreparedResolve = null;
@ -173,7 +174,40 @@ class Backend {
if (typeof optionsContext.index === 'number') {
return profiles[optionsContext.index];
}
return this.options.profiles[this.options.profileCurrent];
const profile = this.getProfileFromContext(optionsContext);
return profile !== null ? profile : this.options.profiles[this.options.profileCurrent];
}
getProfileFromContext(optionsContext) {
for (const profile of this.options.profiles) {
const conditionGroups = profile.conditionGroups;
if (conditionGroups.length > 0 && Backend.testConditionGroups(conditionGroups, optionsContext)) {
return profile;
}
}
return null;
}
static testConditionGroups(conditionGroups, data) {
if (conditionGroups.length === 0) { return false; }
for (const conditionGroup of conditionGroups) {
const conditions = conditionGroup.conditions;
if (conditions.length > 0 && Backend.testConditions(conditions, data)) {
return true;
}
}
return false;
}
static testConditions(conditions, data) {
for (const condition of conditions) {
if (!conditionsTestValue(profileConditionsDescriptor, condition.type, condition.operator, condition.value, data)) {
return false;
}
}
return true;
}
setExtensionBadgeBackgroundColor(color) {

5
ext/bg/js/context.js
View File

@ -22,7 +22,10 @@ $(document).ready(utilAsync(() => {
$('#open-options').click(() => apiCommandExec('options'));
$('#open-help').click(() => apiCommandExec('help'));
const optionsContext = {depth: 0};
const optionsContext = {
depth: 0,
url: window.location.href
};
apiOptionsGet(optionsContext).then(options => {
const toggle = $('#enable-search');
toggle.prop('checked', options.general.enable).change();

16
ext/bg/js/profile-conditions.js
View File

@ -32,27 +32,27 @@ const profileConditionsDescriptor = {
operators: {
equal: {
name: '=',
test: (value, optionValue) => (value === optionValue)
test: ({depth}, optionValue) => (depth === optionValue)
},
notEqual: {
name: '\u2260',
test: (value, optionValue) => (value !== optionValue)
test: ({depth}, optionValue) => (depth !== optionValue)
},
lessThan: {
name: '<',
test: (value, optionValue) => (value < optionValue)
test: ({depth}, optionValue) => (depth < optionValue)
},
greaterThan: {
name: '>',
test: (value, optionValue) => (value > optionValue)
test: ({depth}, optionValue) => (depth > optionValue)
},
lessThanOrEqual: {
name: '\u2264',
test: (value, optionValue) => (value <= optionValue)
test: ({depth}, optionValue) => (depth <= optionValue)
},
greaterThanOrEqual: {
name: '\u2265',
test: (value, optionValue) => (value >= optionValue)
test: ({depth}, optionValue) => (depth >= optionValue)
}
}
},
@ -69,7 +69,7 @@ const profileConditionsDescriptor = {
transform: (optionValue) => optionValue.split(/[,;\s]+/).map(v => v.trim().toLowerCase()).filter(v => v.length > 0),
transformReverse: (transformedOptionValue) => transformedOptionValue.join(', '),
validateTransformed: (transformedOptionValue) => (transformedOptionValue.length > 0),
test: (value, transformedOptionValue) => (transformedOptionValue.indexOf(new URL(value).hostname.toLowerCase()) >= 0)
test: ({url}, transformedOptionValue) => (transformedOptionValue.indexOf(new URL(url).hostname.toLowerCase()) >= 0)
},
matchRegExp: {
name: 'Matches RegExp',
@ -78,7 +78,7 @@ const profileConditionsDescriptor = {
transformCache: {},
transform: (optionValue) => new RegExp(optionValue, 'i'),
transformReverse: (transformedOptionValue) => transformedOptionValue.source,
test: (value, transformedOptionValue) => (transformedOptionValue !== null && transformedOptionValue.test(value))
test: ({url}, transformedOptionValue) => (transformedOptionValue !== null && transformedOptionValue.test(url))
}
}
}

5
ext/bg/js/search-frontend.js
View File

@ -18,7 +18,10 @@
async function searchFrontendSetup() {
const optionsContext = {depth: 0};
const optionsContext = {
depth: 0,
url: window.location.href
};
const options = await apiOptionsGet(optionsContext);
if (!options.scanning.enableOnSearchPage) { return; }

3
ext/bg/js/search.js
View File

@ -22,7 +22,8 @@ class DisplaySearch extends Display {
super($('#spinner'), $('#content'));
this.optionsContext = {
depth: 0
depth: 0,
url: window.location.href
};
this.search = $('#search').click(this.onSearch.bind(this));

5
ext/bg/js/settings-profiles.js
View File

@ -94,7 +94,10 @@ async function profileFormWrite(optionsFull) {
$('#profile-condition-groups'),
$('#profile-add-condition-group')
);
profileConditionsContainer.save = () => apiOptionsSave();
profileConditionsContainer.save = () => {
apiOptionsSave();
conditionsClearCaches(profileConditionsDescriptor);
};
}
function profileOptionsPopulateSelect(select, profiles, currentValue, ignoreIndices) {

8
ext/fg/js/float.js
View File

@ -24,7 +24,8 @@ class DisplayFloat extends Display {
this.styleNode = null;
this.optionsContext = {
depth: 0
depth: 0,
url: window.location.href
};
this.dependencies = Object.assign({}, this.dependencies, {docRangeFromPoint, docSentenceExtract});
@ -78,9 +79,10 @@ class DisplayFloat extends Display {
}
},
popupNestedInitialize: ({id, depth, parentFrameId}) => {
popupNestedInitialize: ({id, depth, parentFrameId, url}) => {
this.optionsContext.depth = depth;
popupNestedInitialize(id, depth, parentFrameId);
this.optionsContext.url = url;
popupNestedInitialize(id, depth, parentFrameId, url);
}
};

20
ext/fg/js/frontend.js
View File

@ -27,7 +27,8 @@ class Frontend {
this.ignoreNodes = (Array.isArray(ignoreNodes) && ignoreNodes.length > 0 ? ignoreNodes.join(',') : null);
this.optionsContext = {
depth: popup.depth
depth: popup.depth,
url: popup.url
};
this.primaryTouchIdentifier = null;
@ -42,9 +43,9 @@ class Frontend {
static create() {
const initializationData = window.frontendInitializationData;
const isNested = (initializationData !== null && typeof initializationData === 'object');
const {id, depth, parentFrameId, ignoreNodes} = isNested ? initializationData : {};
const {id, depth, parentFrameId, ignoreNodes, url} = isNested ? initializationData : {};
const popup = isNested ? new PopupProxy(depth + 1, id, parentFrameId) : PopupProxyHost.instance.createPopup(null);
const popup = isNested ? new PopupProxy(depth + 1, id, parentFrameId, url) : PopupProxyHost.instance.createPopup(null);
const frontend = new Frontend(popup, ignoreNodes);
frontend.prepare();
return frontend;
@ -52,7 +53,7 @@ class Frontend {
async prepare() {
try {
this.options = await apiOptionsGet(this.optionsContext);
this.options = await apiOptionsGet(this.getOptionsContext());
window.addEventListener('message', this.onFrameMessage.bind(this));
window.addEventListener('mousedown', this.onMouseDown.bind(this));
@ -262,7 +263,7 @@ class Frontend {
}
async updateOptions() {
this.options = await apiOptionsGet(this.optionsContext);
this.options = await apiOptionsGet(this.getOptionsContext());
if (!this.options.enable) {
this.searchClear();
}
@ -330,7 +331,7 @@ class Frontend {
return;
}
const {definitions, length} = await apiTermsFind(searchText, this.optionsContext);
const {definitions, length} = await apiTermsFind(searchText, this.getOptionsContext());
if (definitions.length === 0) {
return false;
}
@ -363,7 +364,7 @@ class Frontend {
return;
}
const definitions = await apiKanjiFind(searchText, this.optionsContext);
const definitions = await apiKanjiFind(searchText, this.getOptionsContext());
if (definitions.length === 0) {
return false;
}
@ -507,6 +508,11 @@ class Frontend {
}
}
getOptionsContext() {
this.optionsContext.url = this.popup.url;
return this.optionsContext;
}
static isScanningModifierPressed(scanningModifier, mouseEvent) {
switch (scanningModifier) {
case 'alt': return mouseEvent.altKey;

6
ext/fg/js/popup-nested.js
View File

@ -19,13 +19,13 @@
let popupNestedInitialized = false;
async function popupNestedInitialize(id, depth, parentFrameId) {
async function popupNestedInitialize(id, depth, parentFrameId, url) {
if (popupNestedInitialized) {
return;
}
popupNestedInitialized = true;
const optionsContext = {depth};
const optionsContext = {depth, url};
const options = await apiOptionsGet(optionsContext);
const popupNestingMaxDepth = options.scanning.popupNestingMaxDepth;
@ -35,7 +35,7 @@ async function popupNestedInitialize(id, depth, parentFrameId) {
const ignoreNodes = options.scanning.enableOnPopupExpressions ? [] : [ '.expression', '.expression *' ];
window.frontendInitializationData = {id, depth, parentFrameId, ignoreNodes};
window.frontendInitializationData = {id, depth, parentFrameId, ignoreNodes, url};
const scriptSrcs = [
'/fg/js/frontend-api-sender.js',

3
ext/fg/js/popup-proxy.js
View File

@ -18,7 +18,7 @@
class PopupProxy {
constructor(depth, parentId, parentFrameId) {
constructor(depth, parentId, parentFrameId, url) {
this.parentId = parentId;
this.parentFrameId = parentFrameId;
this.id = null;
@ -26,6 +26,7 @@ class PopupProxy {
this.parent = null;
this.child = null;
this.depth = depth;
this.url = url;
this.container = null;

7
ext/fg/js/popup.js
View File

@ -59,7 +59,8 @@ class Popup {
this.invokeApi('popupNestedInitialize', {
id: this.id,
depth: this.depth,
parentFrameId
parentFrameId,
url: this.url
});
this.invokeApi('setOptions', {
general: {
@ -311,4 +312,8 @@ class Popup {
parent.appendChild(this.container);
}
}
get url() {
return window.location.href;
}
}