From 333610460c19ae167fb825f7aa05dbd6b606d9cb Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Thu, 9 Dec 2010 21:59:02 +0000
Subject: [PATCH] start resourceloadify mw.legacy.ajaxwatch

---
 includes/OutputPage.php                          |  2 +-
 resources/Resources.php                          | 16 ++++++++--------
 .../mediawiki.action/mediawiki.action.watch.js   |  0
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename skins/common/ajaxwatch.js => resources/mediawiki.action/mediawiki.action.watch.js (100%)

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index c6f05b1733..a2c53d1b27 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1627,7 +1627,7 @@ class OutputPage {
 			wfRunHooks( 'AjaxAddScript', array( &$this ) );
 
 			if( $wgAjaxWatch && $wgUser->isLoggedIn() ) {
-				$this->addModules( 'mediawiki.legacy.ajaxwatch' );
+				$this->addModules( 'mediawiki.action.watch.ajax' );
 			}
 
 			if ( $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ) {
diff --git a/resources/Resources.php b/resources/Resources.php
index c889b4c7ef..6ca5db34d6 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -334,9 +334,17 @@ return array(
 		'dependencies' => array( 'jquery.checkboxShiftClick', 'jquery.client', 'jquery.placeholder' ),
 		'debugScripts' => 'resources/mediawiki.util/mediawiki.util.test.js',
 	),
+	'mediawiki.action.history' => array(
+		'scripts' => 'resources/mediawiki.action/mediawiki.action.history.js',
+		'dependencies' => 'mediawiki.legacy.history',
+	),
 	'mediawiki.action.view.rightClickEdit' => array(
 		'scripts' => 'resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js',
 	),
+	'mediawiki.action.watch' => array(
+		'scripts' => 'resources/mediawiki.action/mediawiki.action.watch.js',
+		'dependencies' => 'mediawiki.legacy.wikibits',
+	),
 	'mediawiki.special.preferences' => array(
 		'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js',
 		'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css',
@@ -344,10 +352,6 @@ return array(
 	'mediawiki.special.search' => array(
 		'scripts' => 'resources/mediawiki.special/mediawiki.special.search.js',
 	),
-	'mediawiki.action.history' => array(
-		'scripts' => 'resources/mediawiki.action/mediawiki.action.history.js',
-		'dependencies' => 'mediawiki.legacy.history',
-	),
 	'mediawiki.language' => array(
 		'scripts' => 'resources/mediawiki.language/mediawiki.language.js',
 		'languageScripts' => array(
@@ -409,10 +413,6 @@ return array(
 		),
 		'dependencies' => 'mediawiki.legacy.wikibits',
 	),
-	'mediawiki.legacy.ajaxwatch' => array(
-		'scripts' => 'skins/common/ajaxwatch.js',
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	),
 	'mediawiki.legacy.block' => array(
 		'scripts' => 'skins/common/block.js',
 		'dependencies' => 'mediawiki.legacy.wikibits',
diff --git a/skins/common/ajaxwatch.js b/resources/mediawiki.action/mediawiki.action.watch.js
similarity index 100%
rename from skins/common/ajaxwatch.js
rename to resources/mediawiki.action/mediawiki.action.watch.js
-- 
2.20.1