mediawiki.page.watch: Remove obsolete CSS selectors

Change-Id: I4f80f1e6df5d77d9ad0ab2cc661c9bb5989c9aef

diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 163f3d5..c0e5556 100644 (file)
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -1027,7 +1027,9 @@ class SkinTemplate extends Skin {
                                         */
                                        $mode = $user->isWatched( $title ) ? 'unwatch' : 'watch';
                                        $content_navigation['actions'][$mode] = array(
-                                               'class' => $onPage && ( $action == 'watch' || $action == 'unwatch' ) ? 'selected' : false,
+                                               'class' => 'mw-watchlink ' . (
+                                                       $onPage && ( $action == 'watch' || $action == 'unwatch' ) ? 'selected' : ''
+                                               ),
                                                // uses 'watch' or 'unwatch' message
                                                'text' => $this->msg( $mode )->text(),
                                                'href' => $title->getLocalURL( array( 'action' => $mode ) )

diff --git a/resources/src/mediawiki/page/watch.js b/resources/src/mediawiki/page/watch.js
index a3197da..578c846 100644 (file)
--- a/resources/src/mediawiki/page/watch.js
+++ b/resources/src/mediawiki/page/watch.js
@@ -105,11 +105,8 @@
        };
 
        $( function () {
-               var $links = $( '.mw-watchlink a, a.mw-watchlink, ' +
-                       '#ca-watch a, #ca-unwatch a, #mw-unwatch-link1, ' +
-                       '#mw-unwatch-link2, #mw-watch-link2, #mw-watch-link1' );
-
-               // Allowing people to add inline animated links is a little scary
+               var $links = $( '.mw-watchlink a, a.mw-watchlink' );
+               // Restrict to core interfaces, ignore user-generated content
                $links = $links.filter( ':not( #bodyContent *, #content * )' );
 
                $links.click( function ( e ) {