TheDJ has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/218275

Change subject: Add a wikipage.diff hook
......................................................................

Add a wikipage.diff hook

Bug: T53583
Change-Id: Iba54f26537e0a7ffaaf9465e2f44de2e4367abdb
---
M includes/diff/DifferenceEngine.php
M resources/Resources.php
A resources/src/mediawiki.action/mediawiki.action.diff.js
M resources/src/mediawiki.action/mediawiki.action.edit.preview.js
4 files changed, 27 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/75/218275/1

diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index 07a0522..e7cc7a1 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -647,6 +647,7 @@
         */
        public function showDiffStyle() {
                $this->getOutput()->addModuleStyles( 
'mediawiki.action.history.diff' );
+               $this->getOutput()->addModules( 'mediawiki.action.diff' );
        }
 
        /**
diff --git a/resources/Resources.php b/resources/Resources.php
index 6c27735..1472838 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1104,6 +1104,9 @@
 
        /* MediaWiki Action */
 
+       'mediawiki.action.diff' => array(
+               'scripts' => 
'resources/src/mediawiki.action/mediawiki.action.diff.js',
+       ),
        'mediawiki.action.edit' => array(
                'scripts' => 
'resources/src/mediawiki.action/mediawiki.action.edit.js',
                'styles' => 
'resources/src/mediawiki.action/mediawiki.action.edit.css',
diff --git a/resources/src/mediawiki.action/mediawiki.action.diff.js 
b/resources/src/mediawiki.action/mediawiki.action.diff.js
new file mode 100644
index 0000000..0fc5be1
--- /dev/null
+++ b/resources/src/mediawiki.action/mediawiki.action.diff.js
@@ -0,0 +1,22 @@
+/*!
+ * Scripts for diff pages at ready
+ */
+( function ( mw, $ ) {
+       'use strict';
+
+       /**
+        * Fired when the diff is added to a page containing a diff
+        *
+        * Similar to the {@link mw.hook#event-wikipage_content 
wikipage.content hook}
+        * $diff can still be detached when this hook is fired.
+        *
+        * @event wikipage_diff
+        * @member mw.hook
+        * @param {jQuery} $diff The most appropriate element containing the
+        *  diff, usually .diff.
+        */
+
+       $( function () {
+               mw.hook( 'wikipage.diff' ).fire( $( '.diff' ) );
+       } );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js 
b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
index 6026a8c..51dff52 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@ -113,6 +113,7 @@
                                                // "result.blah is undefined" 
error, ignore
                                                mw.log.warn( e );
                                        }
+                                       mw.hook( 'wikipage.diff' ).fire( 
$wikiDiff.find( '.diff' ) );
                                        $wikiDiff.show();
                                } );
                        } );

-- 
To view, visit https://gerrit.wikimedia.org/r/218275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba54f26537e0a7ffaaf9465e2f44de2e4367abdb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ <hartman.w...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to