Merge "Rename mediawiki.action.history.diff to mediawiki.diff.styles"

diff --combined includes/diff/DifferenceEngine.php
index 4ebf7ad,6fada55..1537535
--- 1/includes/diff/DifferenceEngine.php
--- 2/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@@ -180,7 -180,7 +180,7 @@@ class DifferenceEngine extends ContextS
         */
        public function deletedLink( $id ) {
                if ( $this->getUser()->isAllowed( 'deletedhistory' ) ) {
 -                      $dbr = wfGetDB( DB_SLAVE );
 +                      $dbr = wfGetDB( DB_REPLICA );
                        $row = $dbr->selectRow( 'archive', '*',
                                [ 'ar_rev_id' => $id ],
                                __METHOD__ );
@@@ -528,7 -528,7 +528,7 @@@
                        RecentChange::isInRCLifespan( $this->mNewRev->getTimestamp(), 21600 )
                ) {
                        // Look for an unpatrolled change corresponding to this diff
 -                      $db = wfGetDB( DB_SLAVE );
 +                      $db = wfGetDB( DB_REPLICA );
                        $change = RecentChange::newFromConds(
                                [
                                        'rc_timestamp' => $db->timestamp( $this->mNewRev->getTimestamp() ),
@@@ -695,10 -695,10 +695,10 @@@
        }
  
        /**
-        * Add style sheets and supporting JS for diff display.
+        * Add style sheets for diff display.
         */
        public function showDiffStyle() {
-               $this->getOutput()->addModuleStyles( 'mediawiki.action.history.diff' );
+               $this->getOutput()->addModuleStyles( 'mediawiki.diff.styles' );
        }
  
        /**
@@@ -1338,7 -1338,7 +1338,7 @@@
                }
  
                // Load tags information for both revisions
 -              $dbr = wfGetDB( DB_SLAVE );
 +              $dbr = wfGetDB( DB_REPLICA );
                if ( $this->mOldid !== false ) {
                        $this->mOldTags = $dbr->selectField(
                                'tag_summary',

diff --combined resources/Resources.php
index 8ca7203,2d8d3a0..7055f36
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -571,7 -571,6 +571,7 @@@ return 
        ],
        'jquery.ui.position' => [
                'deprecated' => true,
 +              'targets' => [ 'mobile', 'desktop' ],
                'scripts' => 'resources/lib/jquery.ui/jquery.ui.position.js',
                'group' => 'jquery.ui',
        ],
@@@ -989,6 -988,16 +989,16 @@@
                // must be loaded on the bottom
                'position' => 'bottom',
        ],
+       'mediawiki.diff.styles' => [
+               'position' => 'top',
+               'styles' => [
+                       'resources/src/mediawiki/mediawiki.diff.styles.css',
+                       'resources/src/mediawiki/mediawiki.diff.styles.print.css' => [
+                               'media' => 'print'
+                       ],
+               ],
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
        'mediawiki.feedback' => [
                'scripts' => 'resources/src/mediawiki/mediawiki.feedback.js',
                'styles' => 'resources/src/mediawiki/mediawiki.feedback.css',
@@@ -1146,7 -1155,7 +1156,7 @@@
        'mediawiki.notification' => [
                'styles' => [
                        'resources/src/mediawiki/mediawiki.notification.common.css',
 -                      'resources/src/mediawiki/mediawiki.notification.hideForPrint.css'
 +                      'resources/src/mediawiki/mediawiki.notification.print.css'
                                => [ 'media' => 'print' ],
                ],
                'skinStyles' => [
@@@ -1484,7 -1493,7 +1494,7 @@@
                        'jquery.spinner',
                        'jquery.textSelection',
                        'mediawiki.api',
-                       'mediawiki.action.history.diff',
+                       'mediawiki.diff.styles',
                        'mediawiki.util',
                        'mediawiki.jqueryMsg',
                ],
@@@ -1511,11 -1520,12 +1521,12 @@@
                'position' => 'top',
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
        ],
+       // using this module is deprecated, for diff styles use mediawiki.diff.styles instead
        'mediawiki.action.history.diff' => [
                'position' => 'top',
                'styles' => [
-                       'resources/src/mediawiki.action/mediawiki.action.history.diff.css',
-                       'resources/src/mediawiki.action/mediawiki.action.history.diff.print.css' => [
+                       'resources/src/mediawiki/mediawiki.diff.styles.css',
+                       'resources/src/mediawiki/mediawiki.diff.styles.print.css' => [
                                'media' => 'print'
                        ],
                ],
@@@ -1695,7 -1705,7 +1706,7 @@@
        ],
        'mediawiki.page.gallery.styles' => [
                'styles' => [
 -                      'resources/src/mediawiki/page/gallery-print.css' => [ 'media' => 'print' ],
 +                      'resources/src/mediawiki/page/gallery.print.css' => [ 'media' => 'print' ],
                        'resources/src/mediawiki/page/gallery.css',
                ],
                'position' => 'top',