Merge "Make sure that SQLite uses no prefix"

[lhc/web/wiklou.git] / resources / mediawiki.page / mediawiki.page.watch.ajax.js

diff --git a/resources/mediawiki.page/mediawiki.page.watch.ajax.js b/resources/mediawiki.page/mediawiki.page.watch.ajax.js
index d3f8433..3957493 100644 (file)
--- a/resources/mediawiki.page/mediawiki.page.watch.ajax.js
+++ b/resources/mediawiki.page/mediawiki.page.watch.ajax.js
@@ -2,16 +2,12 @@
  * Animate watch/unwatch links to use asynchronous API requests to
  * watch pages, rather than navigating to a different URI.
  */
-( function ( $, mw, undefined ) {
+( function ( mw, $ ) {
        /**
         * The name of the page to watch or unwatch.
         */
        var title = mw.config.get( 'wgRelevantPageName', mw.config.get( 'wgPageName' ) );
 
-       // Expose local methods
-       mw.page.watch = {
-               'updateWatchLink': updateWatchLink
-       };
        /**
         * Update the link text, link href attribute and (if applicable)
         * "loading" class.
@@ -28,13 +24,14 @@
                otherAction = action === 'watch' ? 'unwatch' : 'watch';
                accesskeyTip = $link.attr( 'title' ).match( mw.util.tooltipAccessKeyRegexp );
                $li = $link.closest( 'li' );
+
                /**
                 * Trigger a 'watchpage' event for this List item.
                 * Announce the otherAction value as the first param.
                 * Used to monitor the state of watch link.
                 * TODO: Revise when system wide hooks are implemented
                 */
-               if( state === undefined ) {
+               if ( state === undefined ) {
                        $li.trigger( 'watchpage.mw', otherAction );
                }
 
@@ -98,6 +95,11 @@
                return 'view';
        }
 
+       // Expose local methods
+       mw.page.watch = {
+               updateWatchLink: updateWatchLink
+       };
+
        $( document ).ready( function () {
                var $links = $( '.mw-watchlink a, a.mw-watchlink, ' +
                        '#ca-watch a, #ca-unwatch a, #mw-unwatch-link1, ' +
@@ -133,7 +135,9 @@
                                        otherAction = action === 'watch' ? 'unwatch' : 'watch';
                                        $li = $link.closest( 'li' );
 
-                                       mw.util.jsMessage( watchResponse.message, 'ajaxwatch' );
+                                       mw.notify( $.parseHTML( watchResponse.message ), {
+                                               tag: 'watch-self'
+                                       } );
 
                                        // Set link to opposite
                                        updateWatchLink( $link, otherAction );
@@ -143,12 +147,12 @@
                                        if ( watchResponse.watched !== undefined ) {
                                                $( '#wpWatchthis' ).prop( 'checked', true );
                                        } else {
-                                               $( '#wpWatchthis' ).removeProp( 'checked' );
+                                               $( '#wpWatchthis' ).prop( 'checked', false );
                                        }
                                },
                                // Error
                                function () {
-                                       var cleanTitle, html, link;
+                                       var cleanTitle, msg, link;
 
                                        // Reset link to non-loading mode
                                        updateWatchLink( $link, action );
@@ -161,14 +165,14 @@
                                                        title: cleanTitle
                                                }, cleanTitle
                                        );
-                                       html = mw.msg( 'watcherrortext', link );
+                                       msg = mw.messsage( 'watcherrortext', link );
 
                                        // Report to user about the error
-                                       mw.util.jsMessage( html, 'ajaxwatch' );
+                                       mw.notify( msg, { tag: 'watch-self' } );
 
                                }
                        );
-               });
-       });
+               } );
+       } );
 
-}( jQuery, mediaWiki ) );
+}( mediaWiki, jQuery ) );