From c89a97409a4c56320ed7ba4ec02f55d840d6c4bc Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Tue, 23 May 2017 21:00:57 +0200
Subject: [PATCH] Create object mw.page in watch.js

The object mw.page is only used in watch.js and it is not intended to extend
this object by other modules because with module.exports exists a more
flexible way.

This change avoids the dependency on module 'mediawiki.page.startup'.

Change-Id: Ib717261c20856d048c67e2196e9dc619b72ab1db
---
 resources/Resources.php                 | 1 -
 resources/src/mediawiki/page/startup.js | 2 --
 resources/src/mediawiki/page/watch.js   | 6 ++++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/resources/Resources.php b/resources/Resources.php
index 5a75e5a947..42376392f3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1685,7 +1685,6 @@ return [
 	'mediawiki.page.watch.ajax' => [
 		'scripts' => 'resources/src/mediawiki/page/watch.js',
 		'dependencies' => [
-			'mediawiki.page.startup',
 			'mediawiki.api.watch',
 			'mediawiki.notify',
 			'mediawiki.util',
diff --git a/resources/src/mediawiki/page/startup.js b/resources/src/mediawiki/page/startup.js
index 9655fa499d..49cfd8ac3f 100644
--- a/resources/src/mediawiki/page/startup.js
+++ b/resources/src/mediawiki/page/startup.js
@@ -1,7 +1,5 @@
 ( function ( mw, $ ) {
 
-	mw.page = {};
-
 	$( function () {
 		var $diff;
 
diff --git a/resources/src/mediawiki/page/watch.js b/resources/src/mediawiki/page/watch.js
index 7d35cb759c..6f52cbfd37 100644
--- a/resources/src/mediawiki/page/watch.js
+++ b/resources/src/mediawiki/page/watch.js
@@ -96,8 +96,10 @@
 	}
 
 	// Expose public methods
-	mw.page.watch = {
-		updateWatchLink: updateWatchLink
+	mw.page = {
+		watch: {
+			updateWatchLink: updateWatchLink
+		}
 	};
 
 	$( function () {
-- 
2.20.1