Merge ….HelpDialog ResourceLoader module away

It's never used in another context but together with the
….Slider module as well as the ….init module. The ….init
module continues to require the ….Slider module, so all
dependencies are still met.

Motivated by the confusion about the two types of require()
introduced in Idf1cc79.

Bug: T233279
Change-Id: I4b4ef69f3074d57f884763c092a515ce976daaef

extension.json

@@ -44,7 +44,6 @@
 		"dependencies": [
 			"ext.RevisionSlider.Slider",
 			"ext.RevisionSlider.RevisionList",
-			"ext.RevisionSlider.HelpDialog",
 			"jquery.ui",
 			"oojs-ui"
 		],
@@ -91,7 +90,6 @@
 				"ext.RevisionSlider.Settings",
 				"ext.RevisionSlider.Slider",
 				"ext.RevisionSlider.RevisionList",
-				"ext.RevisionSlider.HelpDialog",
 				"mediawiki.api",
 				"mediawiki.util"
 			],
@@ -123,6 +121,8 @@
 				"modules/ext.RevisionSlider.Slider.js",
 				"modules/ext.RevisionSlider.Api.js",
 				"modules/ext.RevisionSlider.DiffPage.js",
+				"modules/ext.RevisionSlider.HelpButtonView.js",
+				"modules/ext.RevisionSlider.HelpDialog.js",
 				"modules/ext.RevisionSlider.Pointer.js",
 				"modules/ext.RevisionSlider.PointerLine.js",
 				"modules/ext.RevisionSlider.PointerView.js",
@@ -131,16 +131,26 @@
 				"modules/ext.RevisionSlider.util.js"
 			],
 			"dependencies": [
+				"ext.RevisionSlider.dialogImages",
+				"ext.RevisionSlider.RevisionList",
 				"jquery.ui",
 				"mediawiki.Uri",
 				"mediawiki.util",
 				"oojs-ui",
-				"oojs-ui.styles.icons-movement",
+				"oojs-ui.styles.icons-interactions",
-				"ext.RevisionSlider.HelpDialog"
+				"oojs-ui.styles.icons-movement"
 			],
 			"messages": [
 				"revisionslider-arrow-tooltip-newer",
-				"revisionslider-arrow-tooltip-older"
+				"revisionslider-arrow-tooltip-older",
+				"revisionslider-close-dialog",
+				"revisionslider-help-dialog-slide1",
+				"revisionslider-help-dialog-slide2",
+				"revisionslider-help-dialog-slide3a",
+				"revisionslider-help-dialog-slide4",
+				"revisionslider-next-dialog",
+				"revisionslider-previous-dialog",
+				"revisionslider-tutorial"
 			]
 		},
 		"ext.RevisionSlider.RevisionList": {
@@ -167,27 +177,6 @@
 				"oojs-ui"
 			]
 		},
-		"ext.RevisionSlider.HelpDialog": {
-			"packageFiles": [
-				"modules/ext.RevisionSlider.HelpDialog.js",
-				"modules/ext.RevisionSlider.HelpButtonView.js"
-			],
-			"dependencies": [
-				"oojs-ui",
-				"oojs-ui.styles.icons-interactions",
-				"ext.RevisionSlider.dialogImages"
-			],
-			"messages": [
-				"revisionslider-help-dialog-slide1",
-				"revisionslider-help-dialog-slide2",
-				"revisionslider-help-dialog-slide3a",
-				"revisionslider-help-dialog-slide4",
-				"revisionslider-tutorial",
-				"revisionslider-previous-dialog",
-				"revisionslider-next-dialog",
-				"revisionslider-close-dialog"
-			]
-		},
 		"ext.RevisionSlider.dialogImages": {
 			"class": "ResourceLoaderImageModule",
 			"selector": ".mw-revslider-help-dialog-slide-{name}",

modules/ext.RevisionSlider.HelpButtonView.js

@@ -44,7 +44,7 @@ var HelpButtonView = {
 	},
 
 	showDialog: function () {
-		require( 'ext.RevisionSlider.HelpDialog' ).HelpDialog.show();
+		require( './ext.RevisionSlider.HelpDialog.js' ).show();
 	}
 };
 

modules/ext.RevisionSlider.HelpDialog.js

@@ -186,7 +186,4 @@ HelpDialog.init = function () {
 	};
 };
 
-module.exports = {
+module.exports = HelpDialog;
-	HelpButtonView: require( './ext.RevisionSlider.HelpButtonView.js' ),
-	HelpDialog: HelpDialog
-};

modules/ext.RevisionSlider.Slider.js

@@ -125,6 +125,7 @@ $.extend( Slider.prototype, {
 module.exports = {
 	Api: require( './ext.RevisionSlider.Api.js' ),
 	DiffPage: require( './ext.RevisionSlider.DiffPage.js' ),
+	HelpDialog: require( './ext.RevisionSlider.HelpDialog.js' ),
 	Slider: Slider,
 	SliderView: SliderView,
 	utils: require( './ext.RevisionSlider.util.js' ),

modules/ext.RevisionSlider.SliderView.js

@@ -5,7 +5,7 @@
  * @external Slider
  */
 var DiffPage = require( './ext.RevisionSlider.DiffPage.js' ),
-	HelpButtonView = require( 'ext.RevisionSlider.HelpDialog' ).HelpButtonView,
+	HelpButtonView = require( './ext.RevisionSlider.HelpButtonView.js' ),
 	makeRevisions = require( 'ext.RevisionSlider.RevisionList' ).makeRevisions,
 	Pointer = require( './ext.RevisionSlider.Pointer.js' ),
 	RevisionListView = require( 'ext.RevisionSlider.RevisionList' ).RevisionListView,

modules/ext.RevisionSlider.init.js

@@ -1,8 +1,8 @@
 var Settings = require( 'ext.RevisionSlider.Settings' ),
 	settings = new Settings(),
-	HelpDialog = require( 'ext.RevisionSlider.HelpDialog' ).HelpDialog,
 	RevisionListModule = require( 'ext.RevisionSlider.RevisionList' ),
 	SliderModule = require( 'ext.RevisionSlider.Slider' ),
+	HelpDialog = SliderModule.HelpDialog,
 	RevisionSliderApi = SliderModule.Api,
 	Slider = SliderModule.Slider,
 	utils = SliderModule.utils,

tests/qunit/RevisionSlider.HelpDialog.test.js

@@ -1,4 +1,4 @@
-var HelpDialog = require( 'ext.RevisionSlider.HelpDialog' ).HelpDialog;
+var HelpDialog = require( 'ext.RevisionSlider.Slider' ).HelpDialog;
 
 QUnit.module( 'ext.RevisionSlider.HelpDialog' );