jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338100 )
Change subject: Move standalone diff dialog into separate module
......................................................................
Move standalone diff dialog into separate module
Change-Id: I955f1957270e304b7d5d9c885a42779644b8a935
---
M build/modules.json
M demos/ve/desktop.html
M demos/ve/mobile.html
M tests/index.html
4 files changed, 19 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/build/modules.json b/build/modules.json
index c6f2a81..e42f8e5 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -607,7 +607,6 @@
"src/ve.DiffTreeNode.js",
"src/ve.DiffMatchPatch.js",
"src/dm/ve.dm.VisualDiff.js",
- "src/ui/dialogs/ve.ui.DiffDialog.js",
"src/ui/elements/ve.ui.DiffElement.js"
],
"styles": [
@@ -617,6 +616,14 @@
"visualEditor.core.build",
"treeDiffer",
"diffMatchPatch"
+ ]
+ },
+ "visualEditor.diffing.standalone": {
+ "scripts": [
+ "src/ui/dialogs/ve.ui.DiffDialog.js"
+ ],
+ "dependencies": [
+ "visualEditor.diffing"
]
},
"visualEditor.rebase": {
@@ -770,7 +777,7 @@
"visualEditor.core",
"visualEditor.desktop.build",
"visualEditor.theme.apex",
- "visualEditor.diffing"
+ "visualEditor.diffing.standalone"
]
},
"visualEditor.desktop.build": {
@@ -791,7 +798,7 @@
"visualEditor.core",
"visualEditor.mobile.build",
"visualEditor.theme.mediawiki",
- "visualEditor.diffing"
+ "visualEditor.diffing.standalone"
]
},
"visualEditor.mobile.build": {
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index 99a138e..00833f2 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -502,9 +502,11 @@
<script src="../../src/ve.DiffTreeNode.js"></script>
<script src="../../src/ve.DiffMatchPatch.js"></script>
<script src="../../src/dm/ve.dm.VisualDiff.js"></script>
- <script src="../../src/ui/dialogs/ve.ui.DiffDialog.js"></script>
<script
src="../../src/ui/elements/ve.ui.DiffElement.js"></script>
+ <!-- visualEditor.diffing.standalone -->
+ <script src="../../src/ui/dialogs/ve.ui.DiffDialog.js"></script>
+
<!-- visualEditor.desktop.standalone -->
<script
src="../../src/init/sa/ve.init.sa.DesktopTarget.js"></script>
diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index 547acd2..5f0f8ad 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -503,9 +503,11 @@
<script src="../../src/ve.DiffTreeNode.js"></script>
<script src="../../src/ve.DiffMatchPatch.js"></script>
<script src="../../src/dm/ve.dm.VisualDiff.js"></script>
- <script src="../../src/ui/dialogs/ve.ui.DiffDialog.js"></script>
<script
src="../../src/ui/elements/ve.ui.DiffElement.js"></script>
+ <!-- visualEditor.diffing.standalone -->
+ <script src="../../src/ui/dialogs/ve.ui.DiffDialog.js"></script>
+
<!-- visualEditor.mobile.standalone -->
<script
src="../../src/init/sa/ve.init.sa.MobileTarget.js"></script>
diff --git a/tests/index.html b/tests/index.html
index 0cab8eb..2be5373 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -421,9 +421,11 @@
<script src="../src/ve.DiffTreeNode.js"></script>
<script src="../src/ve.DiffMatchPatch.js"></script>
<script src="../src/dm/ve.dm.VisualDiff.js"></script>
- <script src="../src/ui/dialogs/ve.ui.DiffDialog.js"></script>
<script src="../src/ui/elements/ve.ui.DiffElement.js"></script>
+ <!-- visualEditor.diffing.standalone -->
+ <script src="../src/ui/dialogs/ve.ui.DiffDialog.js"></script>
+
<!-- visualEditor.desktop.standalone -->
<script
src="../src/init/sa/ve.init.sa.DesktopTarget.js"></script>
--
To view, visit https://gerrit.wikimedia.org/r/338100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I955f1957270e304b7d5d9c885a42779644b8a935
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
