Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use components/global.js to get window.MathJax #458

Merged
merged 1 commit into from
Apr 3, 2020
Merged

Use components/global.js to get window.MathJax #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions ts/input/tex/require/RequireConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,16 @@ import {ParseMethod} from '../Types.js';
import TexError from '../TexError.js';
import {TeX} from '../../tex.js';

import {MathJax} from '../../../components/global.js';
import {Package} from '../../../components/package.js';
import {Loader, CONFIG as LOADERCONFIG} from '../../../components/loader.js';
import {mathjax} from '../../../mathjax.js';
import {userOptions, OptionList, expandable} from '../../../util/Options.js';

/**
* Access to global variable
*/
declare const global: any;

/**
* The MathJax configuration block (for looking up user-defined package options)
*/
const MJCONFIG = (global.MathJax ? global.MathJax.config || {} : {});
const MJCONFIG = MathJax.config;

/**
* Add an extension to the configuration, and configure its user options
Expand Down Expand Up @@ -113,7 +109,7 @@ function RegisterDependencies(jax: TeX<any, any, any>, names: string[] = []) {
export function RequireLoad(parser: TexParser, name: string) {
const options = parser.options.require;
const allow = options.allow;
const extension = (name.substr(0,1) === '[' ? '' : options.prefix) + name;
const extension = (name.substr(0, 1) === '[' ? '' : options.prefix) + name;
const allowed = (allow.hasOwnProperty(extension) ? allow[extension] :
allow.hasOwnProperty(name) ? allow[name] : options.defaultAllow);
if (!allowed) {
Expand Down Expand Up @@ -189,7 +185,7 @@ export const options = {
//
prefix: 'tex'
}
}
};

/**
* The command map for the \require macro
Expand Down
34 changes: 19 additions & 15 deletions ts/ui/menu/Menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {mathjax} from '../../mathjax.js';

import {MathItem, STATE} from '../../core/MathItem.js';
import {OutputJax} from '../../core/OutputJax.js';
import {MathJax as MJX} from '../../components/global.js';
import {MathJaxObject as StartupObject} from '../../components/startup.js';
import {MathJaxObject as LoaderObject} from '../../components/loader.js';
import {OptionList, userOptions, defaultOptions, expandable} from '../../util/Options.js';
Expand All @@ -40,15 +41,19 @@ import {MenuMathDocument} from './MenuHandler.js';
* Declare the MathJax global and the navigator object (to check platform for MacOS)
*/
declare namespace window {
const MathJax: StartupObject & LoaderObject;
const navigator: {platform: string}
const navigator: {platform: string};
}

/**
* The global MathJax object
*/
const MathJax = MJX as StartupObject & LoaderObject;

/**
* True when platform is a Mac (so we can enable CMD menu item for zoom trigger)
*/
const isMac = (typeof window !== 'undefined' &&
window.navigator && window.navigator.platform.substr(0,3) === 'Mac');
window.navigator && window.navigator.platform.substr(0, 3) === 'Mac');

/*==========================================================================*/

Expand Down Expand Up @@ -365,7 +370,7 @@ export class Menu {
const jax = this.document.outputJax;
this.jax[jax.name] = jax;
this.settings.renderer = jax.name;
if (window.MathJax._.a11y && window.MathJax._.a11y.explorer) {
if (MathJax._.a11y && MathJax._.a11y.explorer) {
Object.assign(this.settings, this.document.options.a11y);
}
this.settings.scale = jax.options.scale;
Expand Down Expand Up @@ -422,7 +427,7 @@ export class Menu {
this.submenu('Annotation', 'Annotation')
]),
this.rule(),
this.submenu('Settings', 'Math Settings',[
this.submenu('Settings', 'Math Settings', [
this.submenu('Renderer', 'Math Renderer', this.radioGroup('renderer', [['CHTML'], ['SVG']])),
this.rule(),
this.submenu('ZoomTrigger', 'Zoom Trigger', [
Expand Down Expand Up @@ -536,7 +541,6 @@ export class Menu {
* Otherwise, check if any need to be loaded
*/
protected checkLoadableItems() {
const MathJax = window.MathJax;
if (MathJax && MathJax._ && MathJax.loader && MathJax.startup) {
if (this.settings.collapsible && (!MathJax._.a11y || !MathJax._.a11y.complexity)) {
this.loadA11y('complexity');
Expand Down Expand Up @@ -616,13 +620,13 @@ export class Menu {
* @param {[key: string]: any} options The options.
*/
protected setA11y(options: {[key: string]: any}) {
if (window.MathJax._.a11y && window.MathJax._.a11y.explorer) {
window.MathJax._.a11y.explorer_ts.setA11yOptions(this.document, options);
if (MathJax._.a11y && MathJax._.a11y.explorer) {
MathJax._.a11y.explorer_ts.setA11yOptions(this.document, options);
}
}

protected getA11y(options: string): any {
if (window.MathJax._.a11y && window.MathJax._.a11y.explorer) {
if (MathJax._.a11y && MathJax._.a11y.explorer) {
return this.document.options.a11y[options];
}
}
Expand All @@ -649,7 +653,7 @@ export class Menu {
} else {
const name = jax.toLowerCase();
this.loadComponent('output/' + name, () => {
const startup = window.MathJax.startup;
const startup = MathJax.startup;
if (name in startup.constructors) {
startup.useOutput(name, true);
startup.output = startup.getOutputJax();
Expand Down Expand Up @@ -682,7 +686,7 @@ export class Menu {
* @param {boolean} mml True to output hidden Mathml, false to not
*/
protected setAssistiveMml(mml: boolean) {
if (!mml || (window.MathJax._.a11y && window.MathJax._.a11y['assistive-mml'])) {
if (!mml || (MathJax._.a11y && MathJax._.a11y['assistive-mml'])) {
this.rerender();
} else {
this.loadA11y('assistive-mml');
Expand All @@ -694,7 +698,7 @@ export class Menu {
*/
protected setExplorer(explore: boolean) {
this.enableExplorerItems(explore);
if (!explore || (window.MathJax._.a11y && window.MathJax._.a11y.explorer)) {
if (!explore || (MathJax._.a11y && MathJax._.a11y.explorer)) {
this.rerender(this.settings.collapsible ? STATE.RERENDER : STATE.COMPILED);
} else {
this.loadA11y('explorer');
Expand All @@ -705,7 +709,7 @@ export class Menu {
* @param {boolean} collapse True to enable collapsible math, false to not
*/
protected setCollapsible(collapse: boolean) {
if (!collapse || (window.MathJax._.a11y && window.MathJax._.a11y.complexity)) {
if (!collapse || (MathJax._.a11y && MathJax._.a11y.complexity)) {
this.rerender(STATE.COMPILED);
} else {
this.loadA11y('complexity');
Expand Down Expand Up @@ -774,7 +778,7 @@ export class Menu {
*/
protected loadComponent(name: string, callback: () => void) {
if (Menu.loadingPromises.has(name)) return;
const loader = window.MathJax.loader;
const loader = MathJax.loader;
if (!loader) return;
Menu.loading++;
const promise = loader.load(name).then(() => {
Expand Down Expand Up @@ -804,7 +808,7 @@ export class Menu {
public loadA11y(component: string) {
const noEnrich = !STATE.ENRICHED;
this.loadComponent('a11y/' + component, () => {
const startup = window.MathJax.startup;
const startup = MathJax.startup;
//
// Unregister the handler and get a new one (since the component
// will have added a handler extension), then register the new one
Expand Down