Merge pull request #1407 from devinit/develop

Dev to master for footnote hotfix

src/admin/footnotes/app/footnotes.entry.js

@@ -2,15 +2,12 @@ import '../js/custom-modal-workflow';
 import Footnote from '../js/decorators/Footnote';
 import FootnoteSource from '../js/sources/FootnoteSource';
 
-const draftail = window.draftail;
-
-// Plugins for the built-in entities.
-const plugins = [
+// Register the plugin directly on script execution so the editor loads it when initializing.
+window.draftail.registerPlugin(
   {
     type: 'FOOTNOTE',
     source: FootnoteSource,
     decorator: Footnote,
   },
-];
-
-plugins.forEach(draftail.registerPlugin);
+  'entityTypes',
+);