Update test and example pages to use Autoloader (#1936)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214
diff --git a/assets/examples.js b/assets/examples.js
index fe1c275..a72b37e 100644
--- a/assets/examples.js
+++ b/assets/examples.js
@@ -179,62 +179,22 @@
language.examplesPromise.then(function (contents) {
examples[id].innerHTML = buildContentsHeader(id) + contents;
- loadLanguage(id).then(function () {
- Prism.highlightAllUnder(examples[id]);
+ /** @type {HTMLElement} */
+ var container = examples[id];
+ container.innerHTML = buildContentsHeader(id) + contents;
+
+ // the current language might be an extension of a language
+ // so to be safe, we explicitly add a dependency to the current language
+ $$('pre', container).forEach(/** @param {HTMLElement} pre */function (pre) {
+ var dependencies = (pre.getAttribute('data-dependencies') || '').trim();
+ dependencies = dependencies ? dependencies + ',' + id : id;
+ pre.setAttribute('data-dependencies', dependencies);
});
+
+ Prism.highlightAllUnder(container);
});
} else {
examples[id].innerHTML = '';
}
}
-
- /**
- * Loads a language, including all dependencies
- *
- * @param {string} lang the language to load
- * @returns {Promise} the promise which resolves as soon as everything is loaded
- */
- function loadLanguage(lang) {
- // at first we need to fetch all dependencies for the main language
- // Note: we need to do this, even if the main language already is loaded (just to be sure..)
- //
- // We load an array of all dependencies and call recursively this function on each entry
- //
- // dependencies is now an (possibly empty) array of loading-promises
- var dependencies = getDependenciesOfLanguage(lang).map(loadLanguage);
-
- // We create a promise, which will resolve, as soon as all dependencies are loaded.
- // They need to be fully loaded because the main language may extend them.
- return Promise.all(dependencies)
- .then(function () {
-
- // If the main language itself isn't already loaded, load it now
- // and return the newly created promise (we chain the promises).
- // If the language is already loaded, just do nothing - the next .then()
- // will immediately be called
- if (!Prism.languages[lang]) {
- return new Promise(function (resolve) {
- $u.script('components/prism-' + lang + '.js', resolve);
- });
- }
- });
- }
-
-
- /**
- * Returns all dependencies (as identifiers) of a specific language
- *
- * @param {string} lang
- * @returns {string[]} the list of dependencies. Empty if the language has none.
- */
- function getDependenciesOfLanguage(lang) {
- if (!components.languages[lang] || !components.languages[lang].require) {
- return [];
- }
-
- return ($u.type(components.languages[lang].require) === 'array')
- ? components.languages[lang].require
- : [components.languages[lang].require];
- }
-
}());
diff --git a/examples.html b/examples.html
index 6ce28fe..0d979d5 100644
--- a/examples.html
+++ b/examples.html
@@ -101,6 +101,7 @@ ul {
<script src="assets/vendor/utopia.js"></script>
<script src="prism.js"></script>
+<script src="plugins/autoloader/prism-autoloader.js" data-autoloader-path="components/"></script>
<script src="components.js"></script>
<script src="assets/code.js"></script>
<script src="assets/vendor/promise.js"></script>
diff --git a/examples/prism-js-templates.html b/examples/prism-js-templates.html
index 2fc947a..e1fd09d 100644
--- a/examples/prism-js-templates.html
+++ b/examples/prism-js-templates.html
@@ -1,25 +1,25 @@
<h2>HTML template literals</h2>
-<pre><code class="language-javascript">html`
+<pre data-dependencies="markup"><code class="language-javascript">html`
<p>
Foo.
</p>`;</code></pre>
<h2>JS DOM</h2>
-<pre><code class="language-javascript">div.innerHTML = `<p></p>`;
+<pre data-dependencies="markup"><code class="language-javascript">div.innerHTML = `<p></p>`;
div.outerHTML = `<p></p>`;</code></pre>
<h2><a href="https://github.com/zeit/styled-jsx">styled-jsx</a> CSS template literals</h2>
-<pre><code class="language-javascript">css`a:hover { color: blue; }`;</code></pre>
+<pre data-dependencies="css"><code class="language-javascript">css`a:hover { color: blue; }`;</code></pre>
<h2><a href="https://github.com/styled-components/styled-components"><code class="language-none">styled-components</code></a> CSS template literals</h2>
-<pre><code class="language-javascript">const Button = styled.button`
+<pre data-dependencies="css"><code class="language-javascript">const Button = styled.button`
color: blue;
background: red;
`;</code></pre>
<h2>Markdown template literals</h2>
-<pre><code class="language-javascript">markdown`# My title`;</code></pre>
+<pre data-dependencies="markdown"><code class="language-javascript">markdown`# My title`;</code></pre>
<h2>GraphQL template literals</h2>
-<pre><code class="language-javascript">gql`{ foo }`;
+<pre data-dependencies="graphql"><code class="language-javascript">gql`{ foo }`;
graphql`{ foo }`;</code></pre>
diff --git a/test.html b/test.html
index 0f363e8..04a0dfc 100644
--- a/test.html
+++ b/test.html
@@ -173,6 +173,10 @@ pre.show-tokens {
<script src="assets/vendor/utopia.js"></script>
<script src="components/prism-core.js"></script>
+<script src="plugins/autoloader/prism-autoloader.js" data-autoloader-path="components/"></script>
+<script>
+Prism.plugins.autoloader.use_minified = false;
+</script>
<script src="components.js"></script>
<script src="assets/code.js"></script>
<script src="assets/vendor/promise.js"></script>
@@ -266,10 +270,7 @@ for (var id in languages) {
updateHashLanguage(lang);
updateShareLink();
- // loadLanguage() returns a promise, so we use highlightCode()
- // as resolve callback. The promise will be immediately
- // resolved if there is nothing to load.
- loadLanguage(lang).then(highlightCode);
+ highlightCode();
}
}
}, name
@@ -279,59 +280,6 @@ for (var id in languages) {
}
-/**
- * Loads a language, including all dependencies
- *
- * @param {string} lang the language to load
- * @type {Promise} the promise which resolves as soon as everything is loaded
- */
-function loadLanguage (lang)
-{
- // at first we need to fetch all dependencies for the main language
- // Note: we need to do this, even if the main language already is loaded (just to be sure..)
- //
- // We load an array of all dependencies and call recursively this function on each entry
- //
- // dependencies is now an (possibly empty) array of loading-promises
- var dependencies = getDependenciesOfLanguage(lang).map(loadLanguage);
-
- // We create a promise, which will resolve, as soon as all dependencies are loaded.
- // They need to be fully loaded because the main language may extend them.
- return Promise.all(dependencies)
- .then(function () {
-
- // If the main language itself isn't already loaded, load it now
- // and return the newly created promise (we chain the promises).
- // If the language is already loaded, just do nothing - the next .then()
- // will immediately be called
- if (!Prism.languages[lang]) {
- return new Promise(function (resolve) {
- $u.script('components/prism-' + lang + '.js', resolve);
- });
- }
- });
-}
-
-
-/**
- * Returns all dependencies (as identifiers) of a specific language
- *
- * @param {string} lang
- * @returns {Array.<string>} the list of dependencies. Empty if the language has none.
- */
-function getDependenciesOfLanguage (lang)
-{
- if (!components.languages[lang] || !components.languages[lang].require)
- {
- return [];
- }
-
- return ($u.type(components.languages[lang].require) === "array")
- ? components.languages[lang].require
- : [components.languages[lang].require];
-}
-
-
var radios = $$('input[name=language]');
var selectedRadio = radios[0];