Compare commits

..

2 Commits

Author SHA1 Message Date
Ludwig Schubert a54f434a52 2.2.9 2017-11-08 10:16:20 -08:00
Ludwig Schubert 2ab9a24a79 explicitly trigger controller load event 2017-11-08 10:16:10 -08:00
4 changed files with 10 additions and 3 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "distill-template",
"version": "2.2.8",
"version": "2.2.9",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "distill-template",
"version": "2.2.8",
"version": "2.2.9",
"description": "Template for creating Distill articles.",
"main": "dist/template.v2.js",
"bin": {
+3
View File
@@ -86,6 +86,9 @@ const distillMain = function() {
console.info('Runlevel 3: We can now listen to controller events.');
console.info('Runlevel 3->4.');
window.distillRunlevel += 1;
// If template was added after DOMContentLoaded we may have missed that event.
// Controller will check for that case, so trigger the event explicitly:
Controller.listeners.DOMContentLoaded();
console.info('Runlevel 4: Distill Template initialisation complete.');
};
+5 -1
View File
@@ -145,7 +145,11 @@ export const Controller = {
},
DOMContentLoaded() {
if (Controller.loaded || !domContentLoaded()) {
if (Controller.loaded) {
console.warn('Controller received DOMContentLoaded but was already loaded!');
return;
} else if (!domContentLoaded()) {
console.warn('Controller received DOMContentLoaded before appropriate document.readyState!');
return;
} else {
Controller.loaded = true;