You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2021/06/30 13:19:00 UTC
[myfaces-tobago] 02/02: build(theme): rebuild after fixing input
field height
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit fd3421791e4da82357006c1214b28686034398f7
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Wed Jun 30 15:08:56 2021 +0200
build(theme): rebuild after fixing input field height
---
.../tobago-example-demo/src/main/webapp/js/demo.js | 2057 ++++++++++----------
.../src/main/webapp/js/demo.js.map | 2 +-
.../src/main/css/tobago.css | 1 +
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.css | 1 +
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.css | 1 +
.../src/main/css/tobago.css.map | 2 +-
.../tobago-theme-speyside/src/main/css/tobago.css | 1 +
.../src/main/css/tobago.css.map | 2 +-
.../tobago-theme-standard/src/main/css/tobago.css | 1 +
.../src/main/css/tobago.css.map | 2 +-
12 files changed, 1072 insertions(+), 1002 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/js/demo.js b/tobago-example/tobago-example-demo/src/main/webapp/js/demo.js
index 5fcdf03..75d2d4f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/js/demo.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/js/demo.js
@@ -104,8 +104,8 @@
? window // if in browser
: (
(typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope)
- ? self // if in worker
- : {} // if in node js
+ ? self // if in worker
+ : {} // if in node js
);
/**
@@ -116,1125 +116,1151 @@
* @namespace
* @public
*/
- var Prism = (function (_self){
+ var Prism = (function (_self) {
- // Private helper vars
- var lang = /\blang(?:uage)?-([\w-]+)\b/i;
- var uniqueId = 0;
+ // Private helper vars
+ var lang = /\blang(?:uage)?-([\w-]+)\b/i;
+ var uniqueId = 0;
+ // The grammar object for plaintext
+ var plainTextGrammar = {};
- var _ = {
- /**
- * By default, Prism will attempt to highlight all code elements (by calling {@link Prism.highlightAll}) on the
- * current page after the page finished loading. This might be a problem if e.g. you wanted to asynchronously load
- * additional languages or plugins yourself.
- *
- * By setting this value to `true`, Prism will not automatically highlight all code elements on the page.
- *
- * You obviously have to change this value before the automatic highlighting started. To do this, you can add an
- * empty Prism object into the global scope before loading the Prism script like this:
- *
- * ```js
- * window.Prism = window.Prism || {};
- * Prism.manual = true;
- * // add a new <script> to load Prism's script
- * ```
- *
- * @default false
- * @type {boolean}
- * @memberof Prism
- * @public
- */
- manual: _self.Prism && _self.Prism.manual,
- disableWorkerMessageHandler: _self.Prism && _self.Prism.disableWorkerMessageHandler,
-
- /**
- * A namespace for utility methods.
- *
- * All function in this namespace that are not explicitly marked as _public_ are for __internal use only__ and may
- * change or disappear at any time.
- *
- * @namespace
- * @memberof Prism
- */
- util: {
- encode: function encode(tokens) {
- if (tokens instanceof Token) {
- return new Token(tokens.type, encode(tokens.content), tokens.alias);
- } else if (Array.isArray(tokens)) {
- return tokens.map(encode);
- } else {
- return tokens.replace(/&/g, '&').replace(/</g, '<').replace(/\u00a0/g, ' ');
- }
- },
+ var _ = {
/**
- * Returns the name of the type of the given value.
+ * By default, Prism will attempt to highlight all code elements (by calling {@link Prism.highlightAll}) on the
+ * current page after the page finished loading. This might be a problem if e.g. you wanted to asynchronously load
+ * additional languages or plugins yourself.
*
- * @param {any} o
- * @returns {string}
- * @example
- * type(null) === 'Null'
- * type(undefined) === 'Undefined'
- * type(123) === 'Number'
- * type('foo') === 'String'
- * type(true) === 'Boolean'
- * type([1, 2]) === 'Array'
- * type({}) === 'Object'
- * type(String) === 'Function'
- * type(/abc+/) === 'RegExp'
+ * By setting this value to `true`, Prism will not automatically highlight all code elements on the page.
+ *
+ * You obviously have to change this value before the automatic highlighting started. To do this, you can add an
+ * empty Prism object into the global scope before loading the Prism script like this:
+ *
+ * ```js
+ * window.Prism = window.Prism || {};
+ * Prism.manual = true;
+ * // add a new <script> to load Prism's script
+ * ```
+ *
+ * @default false
+ * @type {boolean}
+ * @memberof Prism
+ * @public
*/
- type: function (o) {
- return Object.prototype.toString.call(o).slice(8, -1);
- },
+ manual: _self.Prism && _self.Prism.manual,
+ disableWorkerMessageHandler: _self.Prism && _self.Prism.disableWorkerMessageHandler,
/**
- * Returns a unique number for the given object. Later calls will still return the same number.
+ * A namespace for utility methods.
+ *
+ * All function in this namespace that are not explicitly marked as _public_ are for __internal use only__ and may
+ * change or disappear at any time.
*
- * @param {Object} obj
- * @returns {number}
+ * @namespace
+ * @memberof Prism
*/
- objId: function (obj) {
- if (!obj['__id']) {
- Object.defineProperty(obj, '__id', { value: ++uniqueId });
+ util: {
+ encode: function encode(tokens) {
+ if (tokens instanceof Token) {
+ return new Token(tokens.type, encode(tokens.content), tokens.alias);
+ } else if (Array.isArray(tokens)) {
+ return tokens.map(encode);
+ } else {
+ return tokens.replace(/&/g, '&').replace(/</g, '<').replace(/\u00a0/g, ' ');
+ }
+ },
+
+ /**
+ * Returns the name of the type of the given value.
+ *
+ * @param {any} o
+ * @returns {string}
+ * @example
+ * type(null) === 'Null'
+ * type(undefined) === 'Undefined'
+ * type(123) === 'Number'
+ * type('foo') === 'String'
+ * type(true) === 'Boolean'
+ * type([1, 2]) === 'Array'
+ * type({}) === 'Object'
+ * type(String) === 'Function'
+ * type(/abc+/) === 'RegExp'
+ */
+ type: function (o) {
+ return Object.prototype.toString.call(o).slice(8, -1);
+ },
+
+ /**
+ * Returns a unique number for the given object. Later calls will still return the same number.
+ *
+ * @param {Object} obj
+ * @returns {number}
+ */
+ objId: function (obj) {
+ if (!obj['__id']) {
+ Object.defineProperty(obj, '__id', { value: ++uniqueId });
+ }
+ return obj['__id'];
+ },
+
+ /**
+ * Creates a deep clone of the given object.
+ *
+ * The main intended use of this function is to clone language definitions.
+ *
+ * @param {T} o
+ * @param {Record<number, any>} [visited]
+ * @returns {T}
+ * @template T
+ */
+ clone: function deepClone(o, visited) {
+ visited = visited || {};
+
+ var clone; var id;
+ switch (_.util.type(o)) {
+ case 'Object':
+ id = _.util.objId(o);
+ if (visited[id]) {
+ return visited[id];
+ }
+ clone = /** @type {Record<string, any>} */ ({});
+ visited[id] = clone;
+
+ for (var key in o) {
+ if (o.hasOwnProperty(key)) {
+ clone[key] = deepClone(o[key], visited);
+ }
+ }
+
+ return /** @type {any} */ (clone);
+
+ case 'Array':
+ id = _.util.objId(o);
+ if (visited[id]) {
+ return visited[id];
+ }
+ clone = [];
+ visited[id] = clone;
+
+ (/** @type {Array} */(/** @type {any} */(o))).forEach(function (v, i) {
+ clone[i] = deepClone(v, visited);
+ });
+
+ return /** @type {any} */ (clone);
+
+ default:
+ return o;
+ }
+ },
+
+ /**
+ * Returns the Prism language of the given element set by a `language-xxxx` or `lang-xxxx` class.
+ *
+ * If no language is set for the element or the element is `null` or `undefined`, `none` will be returned.
+ *
+ * @param {Element} element
+ * @returns {string}
+ */
+ getLanguage: function (element) {
+ while (element && !lang.test(element.className)) {
+ element = element.parentElement;
+ }
+ if (element) {
+ return (element.className.match(lang) || [, 'none'])[1].toLowerCase();
+ }
+ return 'none';
+ },
+
+ /**
+ * Returns the script element that is currently executing.
+ *
+ * This does __not__ work for line script element.
+ *
+ * @returns {HTMLScriptElement | null}
+ */
+ currentScript: function () {
+ if (typeof document === 'undefined') {
+ return null;
+ }
+ if ('currentScript' in document && 1 < 2 /* hack to trip TS' flow analysis */) {
+ return /** @type {any} */ (document.currentScript);
+ }
+
+ // IE11 workaround
+ // we'll get the src of the current script by parsing IE11's error stack trace
+ // this will not work for inline scripts
+
+ try {
+ throw new Error();
+ } catch (err) {
+ // Get file src url from stack. Specifically works with the format of stack traces in IE.
+ // A stack will look like this:
+ //
+ // Error
+ // at _.util.currentScript (http://localhost/components/prism-core.js:119:5)
+ // at Global code (http://localhost/components/prism-core.js:606:1)
+
+ var src = (/at [^(\r\n]*\((.*):.+:.+\)$/i.exec(err.stack) || [])[1];
+ if (src) {
+ var scripts = document.getElementsByTagName('script');
+ for (var i in scripts) {
+ if (scripts[i].src == src) {
+ return scripts[i];
+ }
+ }
+ }
+ return null;
+ }
+ },
+
+ /**
+ * Returns whether a given class is active for `element`.
+ *
+ * The class can be activated if `element` or one of its ancestors has the given class and it can be deactivated
+ * if `element` or one of its ancestors has the negated version of the given class. The _negated version_ of the
+ * given class is just the given class with a `no-` prefix.
+ *
+ * Whether the class is active is determined by the closest ancestor of `element` (where `element` itself is
+ * closest ancestor) that has the given class or the negated version of it. If neither `element` nor any of its
+ * ancestors have the given class or the negated version of it, then the default activation will be returned.
+ *
+ * In the paradoxical situation where the closest ancestor contains __both__ the given class and the negated
+ * version of it, the class is considered active.
+ *
+ * @param {Element} element
+ * @param {string} className
+ * @param {boolean} [defaultActivation=false]
+ * @returns {boolean}
+ */
+ isActive: function (element, className, defaultActivation) {
+ var no = 'no-' + className;
+
+ while (element) {
+ var classList = element.classList;
+ if (classList.contains(className)) {
+ return true;
+ }
+ if (classList.contains(no)) {
+ return false;
+ }
+ element = element.parentElement;
+ }
+ return !!defaultActivation;
}
- return obj['__id'];
},
/**
- * Creates a deep clone of the given object.
+ * This namespace contains all currently loaded languages and the some helper functions to create and modify languages.
*
- * The main intended use of this function is to clone language definitions.
- *
- * @param {T} o
- * @param {Record<number, any>} [visited]
- * @returns {T}
- * @template T
+ * @namespace
+ * @memberof Prism
+ * @public
*/
- clone: function deepClone(o, visited) {
- visited = visited || {};
-
- var clone, id;
- switch (_.util.type(o)) {
- case 'Object':
- id = _.util.objId(o);
- if (visited[id]) {
- return visited[id];
- }
- clone = /** @type {Record<string, any>} */ ({});
- visited[id] = clone;
+ languages: {
+ /**
+ * The grammar for plain, unformatted text.
+ */
+ plain: plainTextGrammar,
+ plaintext: plainTextGrammar,
+ text: plainTextGrammar,
+ txt: plainTextGrammar,
+
+ /**
+ * Creates a deep copy of the language with the given id and appends the given tokens.
+ *
+ * If a token in `redef` also appears in the copied language, then the existing token in the copied language
+ * will be overwritten at its original position.
+ *
+ * ## Best practices
+ *
+ * Since the position of overwriting tokens (token in `redef` that overwrite tokens in the copied language)
+ * doesn't matter, they can technically be in any order. However, this can be confusing to others that trying to
+ * understand the language definition because, normally, the order of tokens matters in Prism grammars.
+ *
+ * Therefore, it is encouraged to order overwriting tokens according to the positions of the overwritten tokens.
+ * Furthermore, all non-overwriting tokens should be placed after the overwriting ones.
+ *
+ * @param {string} id The id of the language to extend. This has to be a key in `Prism.languages`.
+ * @param {Grammar} redef The new tokens to append.
+ * @returns {Grammar} The new language created.
+ * @public
+ * @example
+ * Prism.languages['css-with-colors'] = Prism.languages.extend('css', {
+ * // Prism.languages.css already has a 'comment' token, so this token will overwrite CSS' 'comment' token
+ * // at its original position
+ * 'comment': { ... },
+ * // CSS doesn't have a 'color' token, so this token will be appended
+ * 'color': /\b(?:red|green|blue)\b/
+ * });
+ */
+ extend: function (id, redef) {
+ var lang = _.util.clone(_.languages[id]);
+
+ for (var key in redef) {
+ lang[key] = redef[key];
+ }
- for (var key in o) {
- if (o.hasOwnProperty(key)) {
- clone[key] = deepClone(o[key], visited);
+ return lang;
+ },
+
+ /**
+ * Inserts tokens _before_ another token in a language definition or any other grammar.
+ *
+ * ## Usage
+ *
+ * This helper method makes it easy to modify existing languages. For example, the CSS language definition
+ * not only defines CSS highlighting for CSS documents, but also needs to define highlighting for CSS embedded
+ * in HTML through `<style>` elements. To do this, it needs to modify `Prism.languages.markup` and add the
+ * appropriate tokens. However, `Prism.languages.markup` is a regular JavaScript object literal, so if you do
+ * this:
+ *
+ * ```js
+ * Prism.languages.markup.style = {
+ * // token
+ * };
+ * ```
+ *
+ * then the `style` token will be added (and processed) at the end. `insertBefore` allows you to insert tokens
+ * before existing tokens. For the CSS example above, you would use it like this:
+ *
+ * ```js
+ * Prism.languages.insertBefore('markup', 'cdata', {
+ * 'style': {
+ * // token
+ * }
+ * });
+ * ```
+ *
+ * ## Special cases
+ *
+ * If the grammars of `inside` and `insert` have tokens with the same name, the tokens in `inside`'s grammar
+ * will be ignored.
+ *
+ * This behavior can be used to insert tokens after `before`:
+ *
+ * ```js
+ * Prism.languages.insertBefore('markup', 'comment', {
+ * 'comment': Prism.languages.markup.comment,
+ * // tokens after 'comment'
+ * });
+ * ```
+ *
+ * ## Limitations
+ *
+ * The main problem `insertBefore` has to solve is iteration order. Since ES2015, the iteration order for object
+ * properties is guaranteed to be the insertion order (except for integer keys) but some browsers behave
+ * differently when keys are deleted and re-inserted. So `insertBefore` can't be implemented by temporarily
+ * deleting properties which is necessary to insert at arbitrary positions.
+ *
+ * To solve this problem, `insertBefore` doesn't actually insert the given tokens into the target object.
+ * Instead, it will create a new object and replace all references to the target object with the new one. This
+ * can be done without temporarily deleting properties, so the iteration order is well-defined.
+ *
+ * However, only references that can be reached from `Prism.languages` or `insert` will be replaced. I.e. if
+ * you hold the target object in a variable, then the value of the variable will not change.
+ *
+ * ```js
+ * var oldMarkup = Prism.languages.markup;
+ * var newMarkup = Prism.languages.insertBefore('markup', 'comment', { ... });
+ *
+ * assert(oldMarkup !== Prism.languages.markup);
+ * assert(newMarkup === Prism.languages.markup);
+ * ```
+ *
+ * @param {string} inside The property of `root` (e.g. a language id in `Prism.languages`) that contains the
+ * object to be modified.
+ * @param {string} before The key to insert before.
+ * @param {Grammar} insert An object containing the key-value pairs to be inserted.
+ * @param {Object<string, any>} [root] The object containing `inside`, i.e. the object that contains the
+ * object to be modified.
+ *
+ * Defaults to `Prism.languages`.
+ * @returns {Grammar} The new grammar object.
+ * @public
+ */
+ insertBefore: function (inside, before, insert, root) {
+ root = root || /** @type {any} */ (_.languages);
+ var grammar = root[inside];
+ /** @type {Grammar} */
+ var ret = {};
+
+ for (var token in grammar) {
+ if (grammar.hasOwnProperty(token)) {
+
+ if (token == before) {
+ for (var newToken in insert) {
+ if (insert.hasOwnProperty(newToken)) {
+ ret[newToken] = insert[newToken];
+ }
+ }
+ }
+
+ // Do not insert token which also occur in insert. See #1525
+ if (!insert.hasOwnProperty(token)) {
+ ret[token] = grammar[token];
}
}
+ }
- return /** @type {any} */ (clone);
+ var old = root[inside];
+ root[inside] = ret;
- case 'Array':
- id = _.util.objId(o);
- if (visited[id]) {
- return visited[id];
+ // Update references in other language definitions
+ _.languages.DFS(_.languages, function (key, value) {
+ if (value === old && key != inside) {
+ this[key] = ret;
}
- clone = [];
- visited[id] = clone;
+ });
- (/** @type {Array} */(/** @type {any} */(o))).forEach(function (v, i) {
- clone[i] = deepClone(v, visited);
- });
+ return ret;
+ },
- return /** @type {any} */ (clone);
+ // Traverse a language definition with Depth First Search
+ DFS: function DFS(o, callback, type, visited) {
+ visited = visited || {};
- default:
- return o;
- }
- },
+ var objId = _.util.objId;
- /**
- * Returns the Prism language of the given element set by a `language-xxxx` or `lang-xxxx` class.
- *
- * If no language is set for the element or the element is `null` or `undefined`, `none` will be returned.
- *
- * @param {Element} element
- * @returns {string}
- */
- getLanguage: function (element) {
- while (element && !lang.test(element.className)) {
- element = element.parentElement;
- }
- if (element) {
- return (element.className.match(lang) || [, 'none'])[1].toLowerCase();
- }
- return 'none';
- },
+ for (var i in o) {
+ if (o.hasOwnProperty(i)) {
+ callback.call(o, i, o[i], type || i);
- /**
- * Returns the script element that is currently executing.
- *
- * This does __not__ work for line script element.
- *
- * @returns {HTMLScriptElement | null}
- */
- currentScript: function () {
- if (typeof document === 'undefined') {
- return null;
- }
- if ('currentScript' in document && 1 < 2 /* hack to trip TS' flow analysis */) {
- return /** @type {any} */ (document.currentScript);
- }
+ var property = o[i];
+ var propertyType = _.util.type(property);
- // IE11 workaround
- // we'll get the src of the current script by parsing IE11's error stack trace
- // this will not work for inline scripts
-
- try {
- throw new Error();
- } catch (err) {
- // Get file src url from stack. Specifically works with the format of stack traces in IE.
- // A stack will look like this:
- //
- // Error
- // at _.util.currentScript (http://localhost/components/prism-core.js:119:5)
- // at Global code (http://localhost/components/prism-core.js:606:1)
-
- var src = (/at [^(\r\n]*\((.*):.+:.+\)$/i.exec(err.stack) || [])[1];
- if (src) {
- var scripts = document.getElementsByTagName('script');
- for (var i in scripts) {
- if (scripts[i].src == src) {
- return scripts[i];
+ if (propertyType === 'Object' && !visited[objId(property)]) {
+ visited[objId(property)] = true;
+ DFS(property, callback, null, visited);
+ } else if (propertyType === 'Array' && !visited[objId(property)]) {
+ visited[objId(property)] = true;
+ DFS(property, callback, i, visited);
}
}
}
- return null;
}
},
+ plugins: {},
+
/**
- * Returns whether a given class is active for `element`.
- *
- * The class can be activated if `element` or one of its ancestors has the given class and it can be deactivated
- * if `element` or one of its ancestors has the negated version of the given class. The _negated version_ of the
- * given class is just the given class with a `no-` prefix.
+ * This is the most high-level function in Prism’s API.
+ * It fetches all the elements that have a `.language-xxxx` class and then calls {@link Prism.highlightElement} on
+ * each one of them.
*
- * Whether the class is active is determined by the closest ancestor of `element` (where `element` itself is
- * closest ancestor) that has the given class or the negated version of it. If neither `element` nor any of its
- * ancestors have the given class or the negated version of it, then the default activation will be returned.
+ * This is equivalent to `Prism.highlightAllUnder(document, async, callback)`.
*
- * In the paradoxical situation where the closest ancestor contains __both__ the given class and the negated
- * version of it, the class is considered active.
- *
- * @param {Element} element
- * @param {string} className
- * @param {boolean} [defaultActivation=false]
- * @returns {boolean}
+ * @param {boolean} [async=false] Same as in {@link Prism.highlightAllUnder}.
+ * @param {HighlightCallback} [callback] Same as in {@link Prism.highlightAllUnder}.
+ * @memberof Prism
+ * @public
*/
- isActive: function (element, className, defaultActivation) {
- var no = 'no-' + className;
-
- while (element) {
- var classList = element.classList;
- if (classList.contains(className)) {
- return true;
- }
- if (classList.contains(no)) {
- return false;
- }
- element = element.parentElement;
- }
- return !!defaultActivation;
- }
- },
+ highlightAll: function (async, callback) {
+ _.highlightAllUnder(document, async, callback);
+ },
- /**
- * This namespace contains all currently loaded languages and the some helper functions to create and modify languages.
- *
- * @namespace
- * @memberof Prism
- * @public
- */
- languages: {
/**
- * Creates a deep copy of the language with the given id and appends the given tokens.
+ * Fetches all the descendants of `container` that have a `.language-xxxx` class and then calls
+ * {@link Prism.highlightElement} on each one of them.
*
- * If a token in `redef` also appears in the copied language, then the existing token in the copied language
- * will be overwritten at its original position.
+ * The following hooks will be run:
+ * 1. `before-highlightall`
+ * 2. `before-all-elements-highlight`
+ * 3. All hooks of {@link Prism.highlightElement} for each element.
*
- * ## Best practices
- *
- * Since the position of overwriting tokens (token in `redef` that overwrite tokens in the copied language)
- * doesn't matter, they can technically be in any order. However, this can be confusing to others that trying to
- * understand the language definition because, normally, the order of tokens matters in Prism grammars.
- *
- * Therefore, it is encouraged to order overwriting tokens according to the positions of the overwritten tokens.
- * Furthermore, all non-overwriting tokens should be placed after the overwriting ones.
- *
- * @param {string} id The id of the language to extend. This has to be a key in `Prism.languages`.
- * @param {Grammar} redef The new tokens to append.
- * @returns {Grammar} The new language created.
+ * @param {ParentNode} container The root element, whose descendants that have a `.language-xxxx` class will be highlighted.
+ * @param {boolean} [async=false] Whether each element is to be highlighted asynchronously using Web Workers.
+ * @param {HighlightCallback} [callback] An optional callback to be invoked on each element after its highlighting is done.
+ * @memberof Prism
* @public
- * @example
- * Prism.languages['css-with-colors'] = Prism.languages.extend('css', {
- * // Prism.languages.css already has a 'comment' token, so this token will overwrite CSS' 'comment' token
- * // at its original position
- * 'comment': { ... },
- * // CSS doesn't have a 'color' token, so this token will be appended
- * 'color': /\b(?:red|green|blue)\b/
- * });
*/
- extend: function (id, redef) {
- var lang = _.util.clone(_.languages[id]);
+ highlightAllUnder: function (container, async, callback) {
+ var env = {
+ callback: callback,
+ container: container,
+ selector: 'code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'
+ };
- for (var key in redef) {
- lang[key] = redef[key];
- }
+ _.hooks.run('before-highlightall', env);
- return lang;
+ env.elements = Array.prototype.slice.apply(env.container.querySelectorAll(env.selector));
+
+ _.hooks.run('before-all-elements-highlight', env);
+
+ for (var i = 0, element; (element = env.elements[i++]);) {
+ _.highlightElement(element, async === true, env.callback);
+ }
},
/**
- * Inserts tokens _before_ another token in a language definition or any other grammar.
+ * Highlights the code inside a single element.
*
- * ## Usage
+ * The following hooks will be run:
+ * 1. `before-sanity-check`
+ * 2. `before-highlight`
+ * 3. All hooks of {@link Prism.highlight}. These hooks will be run by an asynchronous worker if `async` is `true`.
+ * 4. `before-insert`
+ * 5. `after-highlight`
+ * 6. `complete`
*
- * This helper method makes it easy to modify existing languages. For example, the CSS language definition
- * not only defines CSS highlighting for CSS documents, but also needs to define highlighting for CSS embedded
- * in HTML through `<style>` elements. To do this, it needs to modify `Prism.languages.markup` and add the
- * appropriate tokens. However, `Prism.languages.markup` is a regular JavaScript object literal, so if you do
- * this:
+ * Some the above hooks will be skipped if the element doesn't contain any text or there is no grammar loaded for
+ * the element's language.
*
- * ```js
- * Prism.languages.markup.style = {
- * // token
- * };
- * ```
- *
- * then the `style` token will be added (and processed) at the end. `insertBefore` allows you to insert tokens
- * before existing tokens. For the CSS example above, you would use it like this:
+ * @param {Element} element The element containing the code.
+ * It must have a class of `language-xxxx` to be processed, where `xxxx` is a valid language identifier.
+ * @param {boolean} [async=false] Whether the element is to be highlighted asynchronously using Web Workers
+ * to improve performance and avoid blocking the UI when highlighting very large chunks of code. This option is
+ * [disabled by default](https://prismjs.com/faq.html#why-is-asynchronous-highlighting-disabled-by-default).
*
- * ```js
- * Prism.languages.insertBefore('markup', 'cdata', {
- * 'style': {
- * // token
- * }
- * });
- * ```
- *
- * ## Special cases
- *
- * If the grammars of `inside` and `insert` have tokens with the same name, the tokens in `inside`'s grammar
- * will be ignored.
- *
- * This behavior can be used to insert tokens after `before`:
- *
- * ```js
- * Prism.languages.insertBefore('markup', 'comment', {
- * 'comment': Prism.languages.markup.comment,
- * // tokens after 'comment'
- * });
- * ```
- *
- * ## Limitations
- *
- * The main problem `insertBefore` has to solve is iteration order. Since ES2015, the iteration order for object
- * properties is guaranteed to be the insertion order (except for integer keys) but some browsers behave
- * differently when keys are deleted and re-inserted. So `insertBefore` can't be implemented by temporarily
- * deleting properties which is necessary to insert at arbitrary positions.
- *
- * To solve this problem, `insertBefore` doesn't actually insert the given tokens into the target object.
- * Instead, it will create a new object and replace all references to the target object with the new one. This
- * can be done without temporarily deleting properties, so the iteration order is well-defined.
- *
- * However, only references that can be reached from `Prism.languages` or `insert` will be replaced. I.e. if
- * you hold the target object in a variable, then the value of the variable will not change.
- *
- * ```js
- * var oldMarkup = Prism.languages.markup;
- * var newMarkup = Prism.languages.insertBefore('markup', 'comment', { ... });
- *
- * assert(oldMarkup !== Prism.languages.markup);
- * assert(newMarkup === Prism.languages.markup);
- * ```
- *
- * @param {string} inside The property of `root` (e.g. a language id in `Prism.languages`) that contains the
- * object to be modified.
- * @param {string} before The key to insert before.
- * @param {Grammar} insert An object containing the key-value pairs to be inserted.
- * @param {Object<string, any>} [root] The object containing `inside`, i.e. the object that contains the
- * object to be modified.
- *
- * Defaults to `Prism.languages`.
- * @returns {Grammar} The new grammar object.
+ * Note: All language definitions required to highlight the code must be included in the main `prism.js` file for
+ * asynchronous highlighting to work. You can build your own bundle on the
+ * [Download page](https://prismjs.com/download.html).
+ * @param {HighlightCallback} [callback] An optional callback to be invoked after the highlighting is done.
+ * Mostly useful when `async` is `true`, since in that case, the highlighting is done asynchronously.
+ * @memberof Prism
* @public
*/
- insertBefore: function (inside, before, insert, root) {
- root = root || /** @type {any} */ (_.languages);
- var grammar = root[inside];
- /** @type {Grammar} */
- var ret = {};
-
- for (var token in grammar) {
- if (grammar.hasOwnProperty(token)) {
-
- if (token == before) {
- for (var newToken in insert) {
- if (insert.hasOwnProperty(newToken)) {
- ret[newToken] = insert[newToken];
- }
- }
- }
-
- // Do not insert token which also occur in insert. See #1525
- if (!insert.hasOwnProperty(token)) {
- ret[token] = grammar[token];
- }
- }
+ highlightElement: function (element, async, callback) {
+ // Find language
+ var language = _.util.getLanguage(element);
+ var grammar = _.languages[language];
+
+ // Set language on the element, if not present
+ element.className = element.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
+
+ // Set language on the parent, for styling
+ var parent = element.parentElement;
+ if (parent && parent.nodeName.toLowerCase() === 'pre') {
+ parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
}
- var old = root[inside];
- root[inside] = ret;
+ var code = element.textContent;
- // Update references in other language definitions
- _.languages.DFS(_.languages, function(key, value) {
- if (value === old && key != inside) {
- this[key] = ret;
- }
- });
-
- return ret;
- },
-
- // Traverse a language definition with Depth First Search
- DFS: function DFS(o, callback, type, visited) {
- visited = visited || {};
+ var env = {
+ element: element,
+ language: language,
+ grammar: grammar,
+ code: code
+ };
- var objId = _.util.objId;
+ function insertHighlightedCode(highlightedCode) {
+ env.highlightedCode = highlightedCode;
- for (var i in o) {
- if (o.hasOwnProperty(i)) {
- callback.call(o, i, o[i], type || i);
+ _.hooks.run('before-insert', env);
- var property = o[i],
- propertyType = _.util.type(property);
+ env.element.innerHTML = env.highlightedCode;
- if (propertyType === 'Object' && !visited[objId(property)]) {
- visited[objId(property)] = true;
- DFS(property, callback, null, visited);
- }
- else if (propertyType === 'Array' && !visited[objId(property)]) {
- visited[objId(property)] = true;
- DFS(property, callback, i, visited);
- }
- }
+ _.hooks.run('after-highlight', env);
+ _.hooks.run('complete', env);
+ callback && callback.call(env.element);
}
- }
- },
-
- plugins: {},
-
- /**
- * This is the most high-level function in Prism’s API.
- * It fetches all the elements that have a `.language-xxxx` class and then calls {@link Prism.highlightElement} on
- * each one of them.
- *
- * This is equivalent to `Prism.highlightAllUnder(document, async, callback)`.
- *
- * @param {boolean} [async=false] Same as in {@link Prism.highlightAllUnder}.
- * @param {HighlightCallback} [callback] Same as in {@link Prism.highlightAllUnder}.
- * @memberof Prism
- * @public
- */
- highlightAll: function(async, callback) {
- _.highlightAllUnder(document, async, callback);
- },
- /**
- * Fetches all the descendants of `container` that have a `.language-xxxx` class and then calls
- * {@link Prism.highlightElement} on each one of them.
- *
- * The following hooks will be run:
- * 1. `before-highlightall`
- * 2. `before-all-elements-highlight`
- * 3. All hooks of {@link Prism.highlightElement} for each element.
- *
- * @param {ParentNode} container The root element, whose descendants that have a `.language-xxxx` class will be highlighted.
- * @param {boolean} [async=false] Whether each element is to be highlighted asynchronously using Web Workers.
- * @param {HighlightCallback} [callback] An optional callback to be invoked on each element after its highlighting is done.
- * @memberof Prism
- * @public
- */
- highlightAllUnder: function(container, async, callback) {
- var env = {
- callback: callback,
- container: container,
- selector: 'code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'
- };
-
- _.hooks.run('before-highlightall', env);
-
- env.elements = Array.prototype.slice.apply(env.container.querySelectorAll(env.selector));
-
- _.hooks.run('before-all-elements-highlight', env);
-
- for (var i = 0, element; element = env.elements[i++];) {
- _.highlightElement(element, async === true, env.callback);
- }
- },
+ _.hooks.run('before-sanity-check', env);
- /**
- * Highlights the code inside a single element.
- *
- * The following hooks will be run:
- * 1. `before-sanity-check`
- * 2. `before-highlight`
- * 3. All hooks of {@link Prism.highlight}. These hooks will be run by an asynchronous worker if `async` is `true`.
- * 4. `before-insert`
- * 5. `after-highlight`
- * 6. `complete`
- *
- * Some the above hooks will be skipped if the element doesn't contain any text or there is no grammar loaded for
- * the element's language.
- *
- * @param {Element} element The element containing the code.
- * It must have a class of `language-xxxx` to be processed, where `xxxx` is a valid language identifier.
- * @param {boolean} [async=false] Whether the element is to be highlighted asynchronously using Web Workers
- * to improve performance and avoid blocking the UI when highlighting very large chunks of code. This option is
- * [disabled by default](https://prismjs.com/faq.html#why-is-asynchronous-highlighting-disabled-by-default).
- *
- * Note: All language definitions required to highlight the code must be included in the main `prism.js` file for
- * asynchronous highlighting to work. You can build your own bundle on the
- * [Download page](https://prismjs.com/download.html).
- * @param {HighlightCallback} [callback] An optional callback to be invoked after the highlighting is done.
- * Mostly useful when `async` is `true`, since in that case, the highlighting is done asynchronously.
- * @memberof Prism
- * @public
- */
- highlightElement: function(element, async, callback) {
- // Find language
- var language = _.util.getLanguage(element);
- var grammar = _.languages[language];
-
- // Set language on the element, if not present
- element.className = element.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
-
- // Set language on the parent, for styling
- var parent = element.parentElement;
- if (parent && parent.nodeName.toLowerCase() === 'pre') {
- parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
- }
+ // plugins may change/add the parent/element
+ parent = env.element.parentElement;
+ if (parent && parent.nodeName.toLowerCase() === 'pre' && !parent.hasAttribute('tabindex')) {
+ parent.setAttribute('tabindex', '0');
+ }
- var code = element.textContent;
+ if (!env.code) {
+ _.hooks.run('complete', env);
+ callback && callback.call(env.element);
+ return;
+ }
- var env = {
- element: element,
- language: language,
- grammar: grammar,
- code: code
- };
+ _.hooks.run('before-highlight', env);
- function insertHighlightedCode(highlightedCode) {
- env.highlightedCode = highlightedCode;
+ if (!env.grammar) {
+ insertHighlightedCode(_.util.encode(env.code));
+ return;
+ }
- _.hooks.run('before-insert', env);
+ if (async && _self.Worker) {
+ var worker = new Worker(_.filename);
- env.element.innerHTML = env.highlightedCode;
+ worker.onmessage = function (evt) {
+ insertHighlightedCode(evt.data);
+ };
- _.hooks.run('after-highlight', env);
- _.hooks.run('complete', env);
- callback && callback.call(env.element);
- }
+ worker.postMessage(JSON.stringify({
+ language: env.language,
+ code: env.code,
+ immediateClose: true
+ }));
+ } else {
+ insertHighlightedCode(_.highlight(env.code, env.grammar, env.language));
+ }
+ },
- _.hooks.run('before-sanity-check', env);
+ /**
+ * Low-level function, only use if you know what you’re doing. It accepts a string of text as input
+ * and the language definitions to use, and returns a string with the HTML produced.
+ *
+ * The following hooks will be run:
+ * 1. `before-tokenize`
+ * 2. `after-tokenize`
+ * 3. `wrap`: On each {@link Token}.
+ *
+ * @param {string} text A string with the code to be highlighted.
+ * @param {Grammar} grammar An object containing the tokens to use.
+ *
+ * Usually a language definition like `Prism.languages.markup`.
+ * @param {string} language The name of the language definition passed to `grammar`.
+ * @returns {string} The highlighted HTML.
+ * @memberof Prism
+ * @public
+ * @example
+ * Prism.highlight('var foo = true;', Prism.languages.javascript, 'javascript');
+ */
+ highlight: function (text, grammar, language) {
+ var env = {
+ code: text,
+ grammar: grammar,
+ language: language
+ };
+ _.hooks.run('before-tokenize', env);
+ env.tokens = _.tokenize(env.code, env.grammar);
+ _.hooks.run('after-tokenize', env);
+ return Token.stringify(_.util.encode(env.tokens), env.language);
+ },
- if (!env.code) {
- _.hooks.run('complete', env);
- callback && callback.call(env.element);
- return;
- }
+ /**
+ * This is the heart of Prism, and the most low-level function you can use. It accepts a string of text as input
+ * and the language definitions to use, and returns an array with the tokenized code.
+ *
+ * When the language definition includes nested tokens, the function is called recursively on each of these tokens.
+ *
+ * This method could be useful in other contexts as well, as a very crude parser.
+ *
+ * @param {string} text A string with the code to be highlighted.
+ * @param {Grammar} grammar An object containing the tokens to use.
+ *
+ * Usually a language definition like `Prism.languages.markup`.
+ * @returns {TokenStream} An array of strings and tokens, a token stream.
+ * @memberof Prism
+ * @public
+ * @example
+ * let code = `var foo = 0;`;
+ * let tokens = Prism.tokenize(code, Prism.languages.javascript);
+ * tokens.forEach(token => {
+ * if (token instanceof Prism.Token && token.type === 'number') {
+ * console.log(`Found numeric literal: ${token.content}`);
+ * }
+ * });
+ */
+ tokenize: function (text, grammar) {
+ var rest = grammar.rest;
+ if (rest) {
+ for (var token in rest) {
+ grammar[token] = rest[token];
+ }
- _.hooks.run('before-highlight', env);
+ delete grammar.rest;
+ }
- if (!env.grammar) {
- insertHighlightedCode(_.util.encode(env.code));
- return;
- }
+ var tokenList = new LinkedList();
+ addAfter(tokenList, tokenList.head, text);
- if (async && _self.Worker) {
- var worker = new Worker(_.filename);
+ matchGrammar(text, tokenList, grammar, tokenList.head, 0);
- worker.onmessage = function(evt) {
- insertHighlightedCode(evt.data);
- };
+ return toArray(tokenList);
+ },
- worker.postMessage(JSON.stringify({
- language: env.language,
- code: env.code,
- immediateClose: true
- }));
- }
- else {
- insertHighlightedCode(_.highlight(env.code, env.grammar, env.language));
- }
- },
+ /**
+ * @namespace
+ * @memberof Prism
+ * @public
+ */
+ hooks: {
+ all: {},
+
+ /**
+ * Adds the given callback to the list of callbacks for the given hook.
+ *
+ * The callback will be invoked when the hook it is registered for is run.
+ * Hooks are usually directly run by a highlight function but you can also run hooks yourself.
+ *
+ * One callback function can be registered to multiple hooks and the same hook multiple times.
+ *
+ * @param {string} name The name of the hook.
+ * @param {HookCallback} callback The callback function which is given environment variables.
+ * @public
+ */
+ add: function (name, callback) {
+ var hooks = _.hooks.all;
+
+ hooks[name] = hooks[name] || [];
+
+ hooks[name].push(callback);
+ },
- /**
- * Low-level function, only use if you know what you’re doing. It accepts a string of text as input
- * and the language definitions to use, and returns a string with the HTML produced.
- *
- * The following hooks will be run:
- * 1. `before-tokenize`
- * 2. `after-tokenize`
- * 3. `wrap`: On each {@link Token}.
- *
- * @param {string} text A string with the code to be highlighted.
- * @param {Grammar} grammar An object containing the tokens to use.
- *
- * Usually a language definition like `Prism.languages.markup`.
- * @param {string} language The name of the language definition passed to `grammar`.
- * @returns {string} The highlighted HTML.
- * @memberof Prism
- * @public
- * @example
- * Prism.highlight('var foo = true;', Prism.languages.javascript, 'javascript');
- */
- highlight: function (text, grammar, language) {
- var env = {
- code: text,
- grammar: grammar,
- language: language
- };
- _.hooks.run('before-tokenize', env);
- env.tokens = _.tokenize(env.code, env.grammar);
- _.hooks.run('after-tokenize', env);
- return Token.stringify(_.util.encode(env.tokens), env.language);
- },
+ /**
+ * Runs a hook invoking all registered callbacks with the given environment variables.
+ *
+ * Callbacks will be invoked synchronously and in the order in which they were registered.
+ *
+ * @param {string} name The name of the hook.
+ * @param {Object<string, any>} env The environment variables of the hook passed to all callbacks registered.
+ * @public
+ */
+ run: function (name, env) {
+ var callbacks = _.hooks.all[name];
+
+ if (!callbacks || !callbacks.length) {
+ return;
+ }
- /**
- * This is the heart of Prism, and the most low-level function you can use. It accepts a string of text as input
- * and the language definitions to use, and returns an array with the tokenized code.
- *
- * When the language definition includes nested tokens, the function is called recursively on each of these tokens.
- *
- * This method could be useful in other contexts as well, as a very crude parser.
- *
- * @param {string} text A string with the code to be highlighted.
- * @param {Grammar} grammar An object containing the tokens to use.
- *
- * Usually a language definition like `Prism.languages.markup`.
- * @returns {TokenStream} An array of strings and tokens, a token stream.
- * @memberof Prism
- * @public
- * @example
- * let code = `var foo = 0;`;
- * let tokens = Prism.tokenize(code, Prism.languages.javascript);
- * tokens.forEach(token => {
- * if (token instanceof Prism.Token && token.type === 'number') {
- * console.log(`Found numeric literal: ${token.content}`);
- * }
- * });
- */
- tokenize: function(text, grammar) {
- var rest = grammar.rest;
- if (rest) {
- for (var token in rest) {
- grammar[token] = rest[token];
+ for (var i = 0, callback; (callback = callbacks[i++]);) {
+ callback(env);
+ }
}
+ },
- delete grammar.rest;
- }
-
- var tokenList = new LinkedList();
- addAfter(tokenList, tokenList.head, text);
+ Token: Token
+ };
+ _self.Prism = _;
- matchGrammar(text, tokenList, grammar, tokenList.head, 0);
- return toArray(tokenList);
- },
+ // Typescript note:
+ // The following can be used to import the Token type in JSDoc:
+ //
+ // @typedef {InstanceType<import("./prism-core")["Token"]>} Token
/**
- * @namespace
- * @memberof Prism
+ * Creates a new token.
+ *
+ * @param {string} type See {@link Token#type type}
+ * @param {string | TokenStream} content See {@link Token#content content}
+ * @param {string|string[]} [alias] The alias(es) of the token.
+ * @param {string} [matchedStr=""] A copy of the full string this token was created from.
+ * @class
+ * @global
* @public
*/
- hooks: {
- all: {},
-
+ function Token(type, content, alias, matchedStr) {
/**
- * Adds the given callback to the list of callbacks for the given hook.
- *
- * The callback will be invoked when the hook it is registered for is run.
- * Hooks are usually directly run by a highlight function but you can also run hooks yourself.
+ * The type of the token.
*
- * One callback function can be registered to multiple hooks and the same hook multiple times.
+ * This is usually the key of a pattern in a {@link Grammar}.
*
- * @param {string} name The name of the hook.
- * @param {HookCallback} callback The callback function which is given environment variables.
+ * @type {string}
+ * @see GrammarToken
* @public
*/
- add: function (name, callback) {
- var hooks = _.hooks.all;
-
- hooks[name] = hooks[name] || [];
-
- hooks[name].push(callback);
- },
-
+ this.type = type;
/**
- * Runs a hook invoking all registered callbacks with the given environment variables.
+ * The strings or tokens contained by this token.
*
- * Callbacks will be invoked synchronously and in the order in which they were registered.
+ * This will be a token stream if the pattern matched also defined an `inside` grammar.
*
- * @param {string} name The name of the hook.
- * @param {Object<string, any>} env The environment variables of the hook passed to all callbacks registered.
+ * @type {string | TokenStream}
* @public
*/
- run: function (name, env) {
- var callbacks = _.hooks.all[name];
-
- if (!callbacks || !callbacks.length) {
- return;
- }
-
- for (var i=0, callback; callback = callbacks[i++];) {
- callback(env);
- }
- }
- },
-
- Token: Token
- };
- _self.Prism = _;
-
-
- // Typescript note:
- // The following can be used to import the Token type in JSDoc:
- //
- // @typedef {InstanceType<import("./prism-core")["Token"]>} Token
+ this.content = content;
+ /**
+ * The alias(es) of the token.
+ *
+ * @type {string|string[]}
+ * @see GrammarToken
+ * @public
+ */
+ this.alias = alias;
+ // Copy of the full string this token was created from
+ this.length = (matchedStr || '').length | 0;
+ }
- /**
- * Creates a new token.
- *
- * @param {string} type See {@link Token#type type}
- * @param {string | TokenStream} content See {@link Token#content content}
- * @param {string|string[]} [alias] The alias(es) of the token.
- * @param {string} [matchedStr=""] A copy of the full string this token was created from.
- * @class
- * @global
- * @public
- */
- function Token(type, content, alias, matchedStr) {
/**
- * The type of the token.
+ * A token stream is an array of strings and {@link Token Token} objects.
*
- * This is usually the key of a pattern in a {@link Grammar}.
+ * Token streams have to fulfill a few properties that are assumed by most functions (mostly internal ones) that process
+ * them.
*
- * @type {string}
- * @see GrammarToken
- * @public
- */
- this.type = type;
- /**
- * The strings or tokens contained by this token.
+ * 1. No adjacent strings.
+ * 2. No empty strings.
*
- * This will be a token stream if the pattern matched also defined an `inside` grammar.
+ * The only exception here is the token stream that only contains the empty string and nothing else.
*
- * @type {string | TokenStream}
+ * @typedef {Array<string | Token>} TokenStream
+ * @global
* @public
*/
- this.content = content;
+
/**
- * The alias(es) of the token.
+ * Converts the given token or token stream to an HTML representation.
*
- * @type {string|string[]}
- * @see GrammarToken
- * @public
+ * The following hooks will be run:
+ * 1. `wrap`: On each {@link Token}.
+ *
+ * @param {string | Token | TokenStream} o The token or token stream to be converted.
+ * @param {string} language The name of current language.
+ * @returns {string} The HTML representation of the token or token stream.
+ * @memberof Token
+ * @static
*/
- this.alias = alias;
- // Copy of the full string this token was created from
- this.length = (matchedStr || '').length | 0;
- }
-
- /**
- * A token stream is an array of strings and {@link Token Token} objects.
- *
- * Token streams have to fulfill a few properties that are assumed by most functions (mostly internal ones) that process
- * them.
- *
- * 1. No adjacent strings.
- * 2. No empty strings.
- *
- * The only exception here is the token stream that only contains the empty string and nothing else.
- *
- * @typedef {Array<string | Token>} TokenStream
- * @global
- * @public
- */
-
- /**
- * Converts the given token or token stream to an HTML representation.
- *
- * The following hooks will be run:
- * 1. `wrap`: On each {@link Token}.
- *
- * @param {string | Token | TokenStream} o The token or token stream to be converted.
- * @param {string} language The name of current language.
- * @returns {string} The HTML representation of the token or token stream.
- * @memberof Token
- * @static
- */
- Token.stringify = function stringify(o, language) {
- if (typeof o == 'string') {
- return o;
- }
- if (Array.isArray(o)) {
- var s = '';
- o.forEach(function (e) {
- s += stringify(e, language);
- });
- return s;
- }
-
- var env = {
- type: o.type,
- content: stringify(o.content, language),
- tag: 'span',
- classes: ['token', o.type],
- attributes: {},
- language: language
- };
-
- var aliases = o.alias;
- if (aliases) {
- if (Array.isArray(aliases)) {
- Array.prototype.push.apply(env.classes, aliases);
- } else {
- env.classes.push(aliases);
+ Token.stringify = function stringify(o, language) {
+ if (typeof o == 'string') {
+ return o;
+ }
+ if (Array.isArray(o)) {
+ var s = '';
+ o.forEach(function (e) {
+ s += stringify(e, language);
+ });
+ return s;
}
- }
-
- _.hooks.run('wrap', env);
- var attributes = '';
- for (var name in env.attributes) {
- attributes += ' ' + name + '="' + (env.attributes[name] || '').replace(/"/g, '"') + '"';
- }
+ var env = {
+ type: o.type,
+ content: stringify(o.content, language),
+ tag: 'span',
+ classes: ['token', o.type],
+ attributes: {},
+ language: language
+ };
- return '<' + env.tag + ' class="' + env.classes.join(' ') + '"' + attributes + '>' + env.content + '</' + env.tag + '>';
- };
+ var aliases = o.alias;
+ if (aliases) {
+ if (Array.isArray(aliases)) {
+ Array.prototype.push.apply(env.classes, aliases);
+ } else {
+ env.classes.push(aliases);
+ }
+ }
- /**
- * @param {RegExp} pattern
- * @param {number} pos
- * @param {string} text
- * @param {boolean} lookbehind
- * @returns {RegExpExecArray | null}
- */
- function matchPattern(pattern, pos, text, lookbehind) {
- pattern.lastIndex = pos;
- var match = pattern.exec(text);
- if (match && lookbehind && match[1]) {
- // change the match to remove the text matched by the Prism lookbehind group
- var lookbehindLength = match[1].length;
- match.index += lookbehindLength;
- match[0] = match[0].slice(lookbehindLength);
- }
- return match;
- }
+ _.hooks.run('wrap', env);
- /**
- * @param {string} text
- * @param {LinkedList<string | Token>} tokenList
- * @param {any} grammar
- * @param {LinkedListNode<string | Token>} startNode
- * @param {number} startPos
- * @param {RematchOptions} [rematch]
- * @returns {void}
- * @private
- *
- * @typedef RematchOptions
- * @property {string} cause
- * @property {number} reach
- */
- function matchGrammar(text, tokenList, grammar, startNode, startPos, rematch) {
- for (var token in grammar) {
- if (!grammar.hasOwnProperty(token) || !grammar[token]) {
- continue;
+ var attributes = '';
+ for (var name in env.attributes) {
+ attributes += ' ' + name + '="' + (env.attributes[name] || '').replace(/"/g, '"') + '"';
}
- var patterns = grammar[token];
- patterns = Array.isArray(patterns) ? patterns : [patterns];
-
- for (var j = 0; j < patterns.length; ++j) {
- if (rematch && rematch.cause == token + ',' + j) {
- return;
- }
+ return '<' + env.tag + ' class="' + env.classes.join(' ') + '"' + attributes + '>' + env.content + '</' + env.tag + '>';
+ };
- var patternObj = patterns[j],
- inside = patternObj.inside,
- lookbehind = !!patternObj.lookbehind,
- greedy = !!patternObj.greedy,
- alias = patternObj.alias;
+ /**
+ * @param {RegExp} pattern
+ * @param {number} pos
+ * @param {string} text
+ * @param {boolean} lookbehind
+ * @returns {RegExpExecArray | null}
+ */
+ function matchPattern(pattern, pos, text, lookbehind) {
+ pattern.lastIndex = pos;
+ var match = pattern.exec(text);
+ if (match && lookbehind && match[1]) {
+ // change the match to remove the text matched by the Prism lookbehind group
+ var lookbehindLength = match[1].length;
+ match.index += lookbehindLength;
+ match[0] = match[0].slice(lookbehindLength);
+ }
+ return match;
+ }
- if (greedy && !patternObj.pattern.global) {
- // Without the global flag, lastIndex won't work
- var flags = patternObj.pattern.toString().match(/[imsuy]*$/)[0];
- patternObj.pattern = RegExp(patternObj.pattern.source, flags + 'g');
+ /**
+ * @param {string} text
+ * @param {LinkedList<string | Token>} tokenList
+ * @param {any} grammar
+ * @param {LinkedListNode<string | Token>} startNode
+ * @param {number} startPos
+ * @param {RematchOptions} [rematch]
+ * @returns {void}
+ * @private
+ *
+ * @typedef RematchOptions
+ * @property {string} cause
+ * @property {number} reach
+ */
+ function matchGrammar(text, tokenList, grammar, startNode, startPos, rematch) {
+ for (var token in grammar) {
+ if (!grammar.hasOwnProperty(token) || !grammar[token]) {
+ continue;
}
- /** @type {RegExp} */
- var pattern = patternObj.pattern || patternObj;
-
- for ( // iterate the token list and keep track of the current token/string position
- var currentNode = startNode.next, pos = startPos;
- currentNode !== tokenList.tail;
- pos += currentNode.value.length, currentNode = currentNode.next
- ) {
+ var patterns = grammar[token];
+ patterns = Array.isArray(patterns) ? patterns : [patterns];
- if (rematch && pos >= rematch.reach) {
- break;
+ for (var j = 0; j < patterns.length; ++j) {
+ if (rematch && rematch.cause == token + ',' + j) {
+ return;
}
- var str = currentNode.value;
+ var patternObj = patterns[j];
+ var inside = patternObj.inside;
+ var lookbehind = !!patternObj.lookbehind;
+ var greedy = !!patternObj.greedy;
+ var alias = patternObj.alias;
- if (tokenList.length > text.length) {
- // Something went terribly wrong, ABORT, ABORT!
- return;
+ if (greedy && !patternObj.pattern.global) {
+ // Without the global flag, lastIndex won't work
+ var flags = patternObj.pattern.toString().match(/[imsuy]*$/)[0];
+ patternObj.pattern = RegExp(patternObj.pattern.source, flags + 'g');
}
- if (str instanceof Token) {
- continue;
- }
+ /** @type {RegExp} */
+ var pattern = patternObj.pattern || patternObj;
- var removeCount = 1; // this is the to parameter of removeBetween
- var match;
+ for ( // iterate the token list and keep track of the current token/string position
+ var currentNode = startNode.next, pos = startPos;
+ currentNode !== tokenList.tail;
+ pos += currentNode.value.length, currentNode = currentNode.next
+ ) {
- if (greedy) {
- match = matchPattern(pattern, pos, text, lookbehind);
- if (!match) {
+ if (rematch && pos >= rematch.reach) {
break;
}
- var from = match.index;
- var to = match.index + match[0].length;
- var p = pos;
+ var str = currentNode.value;
- // find the node that contains the match
- p += currentNode.value.length;
- while (from >= p) {
- currentNode = currentNode.next;
- p += currentNode.value.length;
+ if (tokenList.length > text.length) {
+ // Something went terribly wrong, ABORT, ABORT!
+ return;
}
- // adjust pos (and p)
- p -= currentNode.value.length;
- pos = p;
- // the current node is a Token, then the match starts inside another Token, which is invalid
- if (currentNode.value instanceof Token) {
+ if (str instanceof Token) {
continue;
}
- // find the last node which is affected by this match
- for (
- var k = currentNode;
- k !== tokenList.tail && (p < to || typeof k.value === 'string');
- k = k.next
- ) {
- removeCount++;
- p += k.value.length;
+ var removeCount = 1; // this is the to parameter of removeBetween
+ var match;
+
+ if (greedy) {
+ match = matchPattern(pattern, pos, text, lookbehind);
+ if (!match) {
+ break;
+ }
+
+ var from = match.index;
+ var to = match.index + match[0].length;
+ var p = pos;
+
+ // find the node that contains the match
+ p += currentNode.value.length;
+ while (from >= p) {
+ currentNode = currentNode.next;
+ p += currentNode.value.length;
+ }
+ // adjust pos (and p)
+ p -= currentNode.value.length;
+ pos = p;
+
+ // the current node is a Token, then the match starts inside another Token, which is invalid
+ if (currentNode.value instanceof Token) {
+ continue;
+ }
+
+ // find the last node which is affected by this match
+ for (
+ var k = currentNode;
+ k !== tokenList.tail && (p < to || typeof k.value === 'string');
+ k = k.next
+ ) {
+ removeCount++;
+ p += k.value.length;
+ }
+ removeCount--;
+
+ // replace with the new match
+ str = text.slice(pos, p);
+ match.index -= pos;
+ } else {
+ match = matchPattern(pattern, 0, str, lookbehind);
+ if (!match) {
+ continue;
+ }
}
- removeCount--;
- // replace with the new match
- str = text.slice(pos, p);
- match.index -= pos;
- } else {
- match = matchPattern(pattern, 0, str, lookbehind);
- if (!match) {
- continue;
+ // eslint-disable-next-line no-redeclare
+ var from = match.index;
+ var matchStr = match[0];
+ var before = str.slice(0, from);
+ var after = str.slice(from + matchStr.length);
+
+ var reach = pos + str.length;
+ if (rematch && reach > rematch.reach) {
+ rematch.reach = reach;
}
- }
- var from = match.index,
- matchStr = match[0],
- before = str.slice(0, from),
- after = str.slice(from + matchStr.length);
+ var removeFrom = currentNode.prev;
- var reach = pos + str.length;
- if (rematch && reach > rematch.reach) {
- rematch.reach = reach;
- }
+ if (before) {
+ removeFrom = addAfter(tokenList, removeFrom, before);
+ pos += before.length;
+ }
- var removeFrom = currentNode.prev;
+ removeRange(tokenList, removeFrom, removeCount);
- if (before) {
- removeFrom = addAfter(tokenList, removeFrom, before);
- pos += before.length;
- }
+ var wrapped = new Token(token, inside ? _.tokenize(matchStr, inside) : matchStr, alias, matchStr);
+ currentNode = addAfter(tokenList, removeFrom, wrapped);
- removeRange(tokenList, removeFrom, removeCount);
+ if (after) {
+ addAfter(tokenList, currentNode, after);
+ }
- var wrapped = new Token(token, inside ? _.tokenize(matchStr, inside) : matchStr, alias, matchStr);
- currentNode = addAfter(tokenList, removeFrom, wrapped);
+ if (removeCount > 1) {
+ // at least one Token object was removed, so we have to do some rematching
+ // this can only happen if the current pattern is greedy
- if (after) {
- addAfter(tokenList, currentNode, after);
- }
+ /** @type {RematchOptions} */
+ var nestedRematch = {
+ cause: token + ',' + j,
+ reach: reach
+ };
+ matchGrammar(text, tokenList, grammar, currentNode.prev, pos, nestedRematch);
- if (removeCount > 1) {
- // at least one Token object was removed, so we have to do some rematching
- // this can only happen if the current pattern is greedy
- matchGrammar(text, tokenList, grammar, currentNode.prev, pos, {
- cause: token + ',' + j,
- reach: reach
- });
+ // the reach might have been extended because of the rematching
+ if (rematch && nestedRematch.reach > rematch.reach) {
+ rematch.reach = nestedRematch.reach;
+ }
+ }
}
}
}
}
- }
- /**
- * @typedef LinkedListNode
- * @property {T} value
- * @property {LinkedListNode<T> | null} prev The previous node.
- * @property {LinkedListNode<T> | null} next The next node.
- * @template T
- * @private
- */
+ /**
+ * @typedef LinkedListNode
+ * @property {T} value
+ * @property {LinkedListNode<T> | null} prev The previous node.
+ * @property {LinkedListNode<T> | null} next The next node.
+ * @template T
+ * @private
+ */
- /**
- * @template T
- * @private
- */
- function LinkedList() {
- /** @type {LinkedListNode<T>} */
- var head = { value: null, prev: null, next: null };
- /** @type {LinkedListNode<T>} */
- var tail = { value: null, prev: head, next: null };
- head.next = tail;
-
- /** @type {LinkedListNode<T>} */
- this.head = head;
- /** @type {LinkedListNode<T>} */
- this.tail = tail;
- this.length = 0;
- }
+ /**
+ * @template T
+ * @private
+ */
+ function LinkedList() {
+ /** @type {LinkedListNode<T>} */
+ var head = { value: null, prev: null, next: null };
+ /** @type {LinkedListNode<T>} */
+ var tail = { value: null, prev: head, next: null };
+ head.next = tail;
+
+ /** @type {LinkedListNode<T>} */
+ this.head = head;
+ /** @type {LinkedListNode<T>} */
+ this.tail = tail;
+ this.length = 0;
+ }
- /**
- * Adds a new node with the given value to the list.
- * @param {LinkedList<T>} list
- * @param {LinkedListNode<T>} node
- * @param {T} value
- * @returns {LinkedListNode<T>} The added node.
- * @template T
- */
- function addAfter(list, node, value) {
- // assumes that node != list.tail && values.length >= 0
- var next = node.next;
+ /**
+ * Adds a new node with the given value to the list.
+ *
+ * @param {LinkedList<T>} list
+ * @param {LinkedListNode<T>} node
+ * @param {T} value
+ * @returns {LinkedListNode<T>} The added node.
+ * @template T
+ */
+ function addAfter(list, node, value) {
+ // assumes that node != list.tail && values.length >= 0
+ var next = node.next;
- var newNode = { value: value, prev: node, next: next };
- node.next = newNode;
- next.prev = newNode;
- list.length++;
+ var newNode = { value: value, prev: node, next: next };
+ node.next = newNode;
+ next.prev = newNode;
+ list.length++;
- return newNode;
- }
- /**
- * Removes `count` nodes after the given node. The given node will not be removed.
- * @param {LinkedList<T>} list
- * @param {LinkedListNode<T>} node
- * @param {number} count
- * @template T
- */
- function removeRange(list, node, count) {
- var next = node.next;
- for (var i = 0; i < count && next !== list.tail; i++) {
- next = next.next;
+ return newNode;
}
- node.next = next;
- next.prev = node;
- list.length -= i;
- }
- /**
- * @param {LinkedList<T>} list
- * @returns {T[]}
- * @template T
- */
- function toArray(list) {
- var array = [];
- var node = list.head.next;
- while (node !== list.tail) {
- array.push(node.value);
- node = node.next;
+ /**
+ * Removes `count` nodes after the given node. The given node will not be removed.
+ *
+ * @param {LinkedList<T>} list
+ * @param {LinkedListNode<T>} node
+ * @param {number} count
+ * @template T
+ */
+ function removeRange(list, node, count) {
+ var next = node.next;
+ for (var i = 0; i < count && next !== list.tail; i++) {
+ next = next.next;
+ }
+ node.next = next;
+ next.prev = node;
+ list.length -= i;
+ }
+ /**
+ * @param {LinkedList<T>} list
+ * @returns {T[]}
+ * @template T
+ */
+ function toArray(list) {
+ var array = [];
+ var node = list.head.next;
+ while (node !== list.tail) {
+ array.push(node.value);
+ node = node.next;
+ }
+ return array;
}
- return array;
- }
- if (!_self.document) {
- if (!_self.addEventListener) {
- // in Node.js
- return _;
- }
+ if (!_self.document) {
+ if (!_self.addEventListener) {
+ // in Node.js
+ return _;
+ }
- if (!_.disableWorkerMessageHandler) {
- // In worker
- _self.addEventListener('message', function (evt) {
- var message = JSON.parse(evt.data),
- lang = message.language,
- code = message.code,
- immediateClose = message.immediateClose;
-
- _self.postMessage(_.highlight(code, _.languages[lang], lang));
- if (immediateClose) {
- _self.close();
- }
- }, false);
- }
+ if (!_.disableWorkerMessageHandler) {
+ // In worker
+ _self.addEventListener('message', function (evt) {
+ var message = JSON.parse(evt.data);
+ var lang = message.language;
+ var code = message.code;
+ var immediateClose = message.immediateClose;
+
+ _self.postMessage(_.highlight(code, _.languages[lang], lang));
+ if (immediateClose) {
+ _self.close();
+ }
+ }, false);
+ }
- return _;
- }
+ return _;
+ }
- // Get current script and highlight
- var script = _.util.currentScript();
+ // Get current script and highlight
+ var script = _.util.currentScript();
- if (script) {
- _.filename = script.src;
+ if (script) {
+ _.filename = script.src;
- if (script.hasAttribute('data-manual')) {
- _.manual = true;
+ if (script.hasAttribute('data-manual')) {
+ _.manual = true;
+ }
}
- }
- function highlightAutomaticallyCallback() {
- if (!_.manual) {
- _.highlightAll();
+ function highlightAutomaticallyCallback() {
+ if (!_.manual) {
+ _.highlightAll();
+ }
}
- }
- if (!_.manual) {
- // If the document state is "loading", then we'll use DOMContentLoaded.
- // If the document state is "interactive" and the prism.js script is deferred, then we'll also use the
- // DOMContentLoaded event because there might be some plugins or languages which have also been deferred and they
- // might take longer one animation frame to execute which can create a race condition where only some plugins have
- // been loaded when Prism.highlightAll() is executed, depending on how fast resources are loaded.
- // See https://github.com/PrismJS/prism/issues/2102
- var readyState = document.readyState;
- if (readyState === 'loading' || readyState === 'interactive' && script && script.defer) {
- document.addEventListener('DOMContentLoaded', highlightAutomaticallyCallback);
- } else {
- if (window.requestAnimationFrame) {
- window.requestAnimationFrame(highlightAutomaticallyCallback);
+ if (!_.manual) {
+ // If the document state is "loading", then we'll use DOMContentLoaded.
+ // If the document state is "interactive" and the prism.js script is deferred, then we'll also use the
+ // DOMContentLoaded event because there might be some plugins or languages which have also been deferred and they
+ // might take longer one animation frame to execute which can create a race condition where only some plugins have
+ // been loaded when Prism.highlightAll() is executed, depending on how fast resources are loaded.
+ // See https://github.com/PrismJS/prism/issues/2102
+ var readyState = document.readyState;
+ if (readyState === 'loading' || readyState === 'interactive' && script && script.defer) {
+ document.addEventListener('DOMContentLoaded', highlightAutomaticallyCallback);
} else {
- window.setTimeout(highlightAutomaticallyCallback, 16);
+ if (window.requestAnimationFrame) {
+ window.requestAnimationFrame(highlightAutomaticallyCallback);
+ } else {
+ window.setTimeout(highlightAutomaticallyCallback, 16);
+ }
}
}
- }
- return _;
+ return _;
- })(_self);
+ }(_self));
if (typeof module !== 'undefined' && module.exports) {
module.exports = Prism;
@@ -1266,7 +1292,7 @@
* each another.
* @global
* @public
- */
+ */
/**
* @typedef Grammar
@@ -1284,7 +1310,7 @@
* @returns {void}
* @global
* @public
- */
+ */
/**
* @callback HookCallback
@@ -1308,7 +1334,7 @@
greedy: true,
inside: {
'internal-subset': {
- pattern: /(\[)[\s\S]+(?=\]>$)/,
+ pattern: /(^[^\[]*\[)[\s\S]+(?=\]>$)/,
lookbehind: true,
greedy: true,
inside: null // see below
@@ -1322,7 +1348,7 @@
'name': /[^\s<>'"]+/
}
},
- 'cdata': /<!\[CDATA\[[\s\S]*?]]>/i,
+ 'cdata': /<!\[CDATA\[[\s\S]*?\]\]>/i,
'tag': {
pattern: /<\/?(?!\d)[^\s>\/=$<%]+(?:\s(?:\s*[^\s>\/=]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+(?=[\s>]))|(?=[\s/>])))+)?\s*\/?>/,
greedy: true,
@@ -1334,6 +1360,7 @@
'namespace': /^[^\s>\/:]+:/
}
},
+ 'special-attr': [],
'attr-value': {
pattern: /=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+)/,
inside: {
@@ -1420,6 +1447,49 @@
Prism.languages.insertBefore('markup', 'cdata', def);
}
});
+ Object.defineProperty(Prism.languages.markup.tag, 'addAttribute', {
+ /**
+ * Adds an pattern to highlight languages embedded in HTML attributes.
+ *
+ * An example of an inlined language is CSS with `style` attributes.
+ *
+ * @param {string} attrName The name of the tag that contains the inlined language. This name will be treated as
+ * case insensitive.
+ * @param {string} lang The language key.
+ * @example
+ * addAttribute('style', 'css');
+ */
+ value: function (attrName, lang) {
+ Prism.languages.markup.tag.inside['special-attr'].push({
+ pattern: RegExp(
+ /(^|["'\s])/.source + '(?:' + attrName + ')' + /\s*=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+(?=[\s>]))/.source,
+ 'i'
+ ),
+ lookbehind: true,
+ inside: {
+ 'attr-name': /^[^\s=]+/,
+ 'attr-value': {
+ pattern: /=[\s\S]+/,
+ inside: {
+ 'value': {
+ pattern: /(^=\s*(["']|(?!["'])))\S[\s\S]*(?=\2$)/,
+ lookbehind: true,
+ alias: [lang, 'language-' + lang],
+ inside: Prism.languages[lang]
+ },
+ 'punctuation': [
+ {
+ pattern: /^=/,
+ alias: 'attr-equals'
+ },
+ /"|'/
+ ]
+ }
+ }
+ }
+ });
+ }
+ });
Prism.languages.html = Prism.languages.markup;
Prism.languages.mathml = Prism.languages.markup;
@@ -1437,7 +1507,7 @@
(function (Prism) {
- var string = /("|')(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/;
+ var string = /(?:"(?:\\(?:\r\n|[\s\S])|[^"\\\r\n])*"|'(?:\\(?:\r\n|[\s\S])|[^'\\\r\n])*')/;
Prism.languages.css = {
'comment': /\/\*[\s\S]*?\*\//,
@@ -1470,14 +1540,23 @@
}
}
},
- 'selector': RegExp('[^{}\\s](?:[^{};"\'\\s]|\\s+(?![\\s{])|' + string.source + ')*(?=\\s*\\{)'),
+ 'selector': {
+ pattern: RegExp('(^|[{}\\s])[^{}\\s](?:[^{};"\'\\s]|\\s+(?![\\s{])|' + string.source + ')*(?=\\s*\\{)'),
+ lookbehind: true
+ },
'string': {
pattern: string,
greedy: true
},
- 'property': /(?!\s)[-_a-z\xA0-\uFFFF](?:(?!\s)[-\w\xA0-\uFFFF])*(?=\s*:)/i,
+ 'property': {
+ pattern: /(^|[^-\w\xA0-\uFFFF])(?!\s)[-_a-z\xA0-\uFFFF](?:(?!\s)[-\w\xA0-\uFFFF])*(?=\s*:)/i,
+ lookbehind: true
+ },
'important': /!important\b/i,
- 'function': /[-a-z0-9]+(?=\()/i,
+ 'function': {
+ pattern: /(^|[^-a-z0-9])[-a-z0-9]+(?=\()/i,
+ lookbehind: true
+ },
'punctuation': /[(){};:,]/
};
@@ -1486,34 +1565,7 @@
var markup = Prism.languages.markup;
if (markup) {
markup.tag.addInlined('style', 'css');
-
- Prism.languages.insertBefore('inside', 'attr-value', {
- 'style-attr': {
- pattern: /(^|["'\s])style\s*=\s*(?:"[^"]*"|'[^']*')/i,
- lookbehind: true,
- inside: {
- 'attr-value': {
- pattern: /=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+)/,
- inside: {
- 'style': {
- pattern: /(["'])[\s\S]+(?=["']$)/,
- lookbehind: true,
- alias: 'language-css',
- inside: Prism.languages.css
- },
- 'punctuation': [
- {
- pattern: /^=/,
- alias: 'attr-equals'
- },
- /"|'/
- ]
- }
- },
- 'attr-name': /^style/i
- }
- }
- }, markup.tag);
+ markup.tag.addAttribute('style', 'css');
}
}(Prism));
@@ -1549,7 +1601,7 @@
},
'keyword': /\b(?:if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,
'boolean': /\b(?:true|false)\b/,
- 'function': /\w+(?=\()/,
+ 'function': /\b\w+(?=\()/,
'number': /\b0x[\da-f]+\b|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[+-]?\d+)?/i,
'operator': /[<>]=?|[!=]=?=?|--?|\+\+?|&&?|\|\|?|[?*/~^%]/,
'punctuation': /[{}[\];(),.:]/
@@ -1570,11 +1622,11 @@
],
'keyword': [
{
- pattern: /((?:^|})\s*)(?:catch|finally)\b/,
+ pattern: /((?:^|\})\s*)catch\b/,
lookbehind: true
},
{
- pattern: /(^|[^.]|\.\.\.\s*)\b(?:as|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|for|from|function|(?:get|set)(?=\s*[\[$\w\xA0-\uFFFF])|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,
+ pattern: /(^|[^.]|\.\.\.\s*)\b(?:as|assert(?=\s*\{)|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally(?=\s*(?:\{|$))|for|from(?=\s*(?:['"]|$))|function|(?:get|set)(?=\s*(?:[#\[$\w\xA0-\uFFFF]|$))|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,
lookbehind: true
},
],
@@ -1588,7 +1640,8 @@
Prism.languages.insertBefore('javascript', 'keyword', {
'regex': {
- pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyus]{0,6}(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/,
+ // eslint-disable-next-line regexp/no-dupe-characters-character-class
+ pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*\]|\\.|[^/\\\[\r\n])+\/[dgimyus]{0,7}(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/,
lookbehind: true,
greedy: true,
inside: {
@@ -1598,8 +1651,8 @@
alias: 'language-regex',
inside: Prism.languages.regex
},
- 'regex-flags': /[a-z]+$/,
- 'regex-delimiter': /^\/|\/$/
+ 'regex-delimiter': /^\/|\/$/,
+ 'regex-flags': /^[a-z]+$/,
}
},
// This must be declared before keyword because we use "function" inside the look-forward
@@ -1614,7 +1667,8 @@
inside: Prism.languages.javascript
},
{
- pattern: /(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*=>)/i,
+ pattern: /(^|[^$\w\xA0-\uFFFF])(?!\s)[_$a-z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*=>)/i,
+ lookbehind: true,
inside: Prism.languages.javascript
},
{
@@ -1632,8 +1686,13 @@
});
Prism.languages.insertBefore('javascript', 'string', {
+ 'hashbang': {
+ pattern: /^#!.*/,
+ greedy: true,
+ alias: 'comment'
+ },
'template-string': {
- pattern: /`(?:\\[\s\S]|\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}|(?!\${)[^\\`])*`/,
+ pattern: /`(?:\\[\s\S]|\$\{(?:[^{}]|\{(?:[^{}]|\{[^}]*\})*\})+\}|(?!\$\{)[^\\`])*`/,
greedy: true,
inside: {
'template-punctuation': {
@@ -1641,11 +1700,11 @@
alias: 'string'
},
'interpolation': {
- pattern: /((?:^|[^\\])(?:\\{2})*)\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}/,
+ pattern: /((?:^|[^\\])(?:\\{2})*)\$\{(?:[^{}]|\{(?:[^{}]|\{[^}]*\})*\})+\}/,
lookbehind: true,
inside: {
'interpolation-punctuation': {
- pattern: /^\${|}$/,
+ pattern: /^\$\{|\}$/,
alias: 'punctuation'
},
rest: Prism.languages.javascript
@@ -1658,6 +1717,13 @@
if (Prism.languages.markup) {
Prism.languages.markup.tag.addInlined('script', 'javascript');
+
+ // add attribute support for all DOM events.
+ // https://developer.mozilla.org/en-US/docs/Web/Events#Standard_events
+ Prism.languages.markup.tag.addAttribute(
+ /on(?:abort|blur|change|click|composition(?:end|start|update)|dblclick|error|focus(?:in|out)?|key(?:down|up)|load|mouse(?:down|enter|leave|move|out|over|up)|reset|resize|scroll|select|slotchange|submit|unload|wheel)/.source,
+ 'javascript'
+ );
}
Prism.languages.js = Prism.languages.javascript;
@@ -1668,7 +1734,8 @@
********************************************** */
(function () {
- if (typeof self === 'undefined' || !self.Prism || !self.document) {
+
+ if (typeof Prism === 'undefined' || typeof document === 'undefined') {
return;
}
@@ -1677,8 +1744,6 @@
Element.prototype.matches = Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector;
}
- var Prism = window.Prism;
-
var LOADING_MESSAGE = 'Loading…';
var FAILURE_MESSAGE = function (status, message) {
return '✖ Error ' + status + ' while fetching file: ' + message;
@@ -1796,7 +1861,7 @@
highlight: function highlight(container) {
var elements = (container || document).querySelectorAll(SELECTOR);
- for (var i = 0, element; element = elements[i++];) {
+ for (var i = 0, element; (element = elements[i++]);) {
Prism.highlightElement(element);
}
}
@@ -1812,7 +1877,7 @@
Prism.plugins.fileHighlight.highlight.apply(this, arguments);
};
- })();
+ }());
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/js/demo.js.map b/tobago-example/tobago-example-demo/src/main/webapp/js/demo.js.map
index 17e1446..bbe8112 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/js/demo.js.map
+++ b/tobago-example/tobago-example-demo/src/main/webapp/js/demo.js.map
@@ -1 +1 @@
-{"version":3,"file":"demo.js","sources":["demo-alert.js","demo-copy-to-clipboard.js","../../../../node_modules/prismjs/prism.js","demo-highlight.js","demo-inspect.js","demo-login.js","demo-search.js","demo-test.js"],"sourcesContent":["/*\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You [...]
\ No newline at end of file
+{"version":3,"file":"demo.js","sources":["demo-alert.js","demo-copy-to-clipboard.js","../../../../node_modules/prismjs/prism.js","demo-highlight.js","demo-inspect.js","demo-login.js","demo-search.js","demo-test.js"],"sourcesContent":["/*\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
index c95fb3a..84c79c3 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
@@ -11309,6 +11309,7 @@ tobago-flex-layout > tobago-flex-layout {
/* the non-label-element inside of a label-layout with flex box */
.tobago-label-container {
display: flex;
+ align-items: center;
}
.tobago-label-container > label {
width: 155px;
diff --git a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map
index 3dee034..46b0f88 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scs [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scs [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
index 5107a18..9d27306 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
@@ -11332,6 +11332,7 @@ tobago-flex-layout > tobago-flex-layout {
/* the non-label-element inside of a label-layout with flex box */
.tobago-label-container {
display: flex;
+ align-items: center;
}
.tobago-label-container > label {
width: 155px;
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map
index 91da657..ada3692 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scs [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scs [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
index 4411cce..e214c64 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
@@ -11319,6 +11319,7 @@ tobago-flex-layout > tobago-flex-layout {
/* the non-label-element inside of a label-layout with flex box */
.tobago-label-container {
display: flex;
+ align-items: center;
}
.tobago-label-container > label {
width: 155px;
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map
index f396096..c228a75 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_mo [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_mo [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
index 4d5e734..fb3b5c0 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
@@ -11020,6 +11020,7 @@ tobago-flex-layout > tobago-flex-layout {
/* the non-label-element inside of a label-layout with flex box */
.tobago-label-container {
display: flex;
+ align-items: center;
}
.tobago-label-container > label {
width: 155px;
diff --git a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map
index 0fd35e7..b3e2b96 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_modules/bootstrap/scss/mixins/_lists.scss","../. [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_modules/bootstrap/scss/mixins/_lists.scss","../. [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
index f289d5f..5ee45c5 100644
--- a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
@@ -11289,6 +11289,7 @@ tobago-flex-layout > tobago-flex-layout {
/* the non-label-element inside of a label-layout with flex box */
.tobago-label-container {
display: flex;
+ align-items: center;
}
.tobago-label-container > label {
width: 155px;
diff --git a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map
index e81cea2..f3185ad 100644
--- a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_mo [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_mo [...]
\ No newline at end of file