jenkins-bot has submitted this change and it was merged.
Change subject: Ensure demo init script runs last
......................................................................
Ensure demo init script runs last
This was causing the mobile demo to die.
Change-Id: I6f5f63037080f5a68e500d4d5d2648e209ceaf7a
---
M build/modules.json
M demos/ve/desktop-dist.html
M demos/ve/desktop.html
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
5 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/build/modules.json b/build/modules.json
index 5e04ca0..bdf0329 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -699,8 +699,7 @@
"visualEditor.standalone.demo": {
"scripts": [
"demos/ve/ve.demo.js",
- "demos/ve/ve.demo.SurfaceContainer.js",
- "demos/ve/ve.demo.init.js"
+ "demos/ve/ve.demo.SurfaceContainer.js"
],
"styles": [
"demos/ve/demo.css"
@@ -709,7 +708,8 @@
},
"visualEditor.desktop.standalone.demo": {
"scripts": [
- "demos/ve/demo.desktop.js"
+ "demos/ve/demo.desktop.js",
+ "demos/ve/ve.demo.init.js"
],
"styles": [
"demos/ve/demo.desktop.css"
@@ -721,7 +721,8 @@
},
"visualEditor.mobile.standalone.demo": {
"scripts": [
- "demos/ve/demo.mobile.js"
+ "demos/ve/demo.mobile.js",
+ "demos/ve/ve.demo.init.js"
],
"styles": [
"demos/ve/demo.mobile.css"
diff --git a/demos/ve/desktop-dist.html b/demos/ve/desktop-dist.html
index b4b4d53..5f124eb 100644
--- a/demos/ve/desktop-dist.html
+++ b/demos/ve/desktop-dist.html
@@ -79,10 +79,10 @@
<!-- visualEditor.standalone.demo -->
<script src="../../demos/ve/ve.demo.js"></script>
<script
src="../../demos/ve/ve.demo.SurfaceContainer.js"></script>
- <script src="../../demos/ve/ve.demo.init.js"></script>
<!-- visualEditor.desktop.standalone.demo -->
<script src="../../demos/ve/demo.desktop.js"></script>
+ <script src="../../demos/ve/ve.demo.init.js"></script>
</body>
</html>
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index e801418..6baa16c 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -432,10 +432,10 @@
<!-- visualEditor.standalone.demo -->
<script src="../../demos/ve/ve.demo.js"></script>
<script
src="../../demos/ve/ve.demo.SurfaceContainer.js"></script>
- <script src="../../demos/ve/ve.demo.init.js"></script>
<!-- visualEditor.desktop.standalone.demo -->
<script src="../../demos/ve/demo.desktop.js"></script>
+ <script src="../../demos/ve/ve.demo.init.js"></script>
</body>
</html>
diff --git a/demos/ve/mobile-dist.html b/demos/ve/mobile-dist.html
index f66ce71..55cd194 100644
--- a/demos/ve/mobile-dist.html
+++ b/demos/ve/mobile-dist.html
@@ -79,10 +79,10 @@
<!-- visualEditor.standalone.demo -->
<script src="../../demos/ve/ve.demo.js"></script>
<script
src="../../demos/ve/ve.demo.SurfaceContainer.js"></script>
- <script src="../../demos/ve/ve.demo.init.js"></script>
<!-- visualEditor.mobile.standalone.demo -->
<script src="../../demos/ve/demo.mobile.js"></script>
+ <script src="../../demos/ve/ve.demo.init.js"></script>
</body>
</html>
diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index 0cd3079..dec36cf 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -433,10 +433,10 @@
<!-- visualEditor.standalone.demo -->
<script src="../../demos/ve/ve.demo.js"></script>
<script
src="../../demos/ve/ve.demo.SurfaceContainer.js"></script>
- <script src="../../demos/ve/ve.demo.init.js"></script>
<!-- visualEditor.mobile.standalone.demo -->
<script src="../../demos/ve/demo.mobile.js"></script>
+ <script src="../../demos/ve/ve.demo.init.js"></script>
</body>
</html>
--
To view, visit https://gerrit.wikimedia.org/r/230395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f5f63037080f5a68e500d4d5d2648e209ceaf7a
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
