Add diff patch (#105)

* removes diff from page moves * fix diff bg color when hovering * remove "close" button from diff page * indicates page review when banner closed
enterprisemediawiki · Mar 22, 2019 · f63d80b · f63d80b
1 parent de5e9d9
commit f63d80b
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 27 deletions.
diff --git a/includes/ReviewHandler.php b/includes/ReviewHandler.php
@@ -169,10 +169,14 @@ public function getTemplate() {
 
 		$diff = new DifferenceEngine( null, $lastSeenId, 0 );
 
-		$template =
-			"<div id='watch-analytics-review-handler'>
-				$unReviewLink $reviewLink
-				<p>$bannerText</p>";
+		$template = "<div id='watch-analytics-review-handler'> $unReviewLink";
+
+		// Don't show "close banner" button when viewing full diff page
+		if ( !( $this->isDiff ) ) {
+			$template .= $reviewLink;
+		}
+
+		$template .= "<p>$bannerText</p>";
 
 		global $egWatchAnalyticsShowUnreviewDiff;
 		if ( $egWatchAnalyticsShowUnreviewDiff ) {

diff --git a/modules/pendingreviews/ext.watchanalytics.pendingreviews.css b/modules/pendingreviews/ext.watchanalytics.pendingreviews.css
@@ -49,6 +49,10 @@ tr.pendingreviews-row-hover td {
 	background-color: #f9f9f9;
 }
 
+div.pending-review-diff td {
+	background-color: #fff;
+}
+
 .pendingreviews-legend {
 	float:right;
 	margin-bottom: 10px;

diff --git a/modules/reviewhandler/reviewhandler.js b/modules/reviewhandler/reviewhandler.js
@@ -41,6 +41,13 @@
 				rowLines.remove();
 			});
 
+			rowLines.css("background-color", "#00af89");
+			rowLines.html("<strong>Page reviewed!</strong>");
+
+			rowLines.fadeOut( 700, function() {
+				rowLines.remove();
+			});
+
 		});
 
 	});

diff --git a/specials/SpecialPendingReviews.php b/specials/SpecialPendingReviews.php
@@ -300,32 +300,33 @@ public function getStandardChangeRow( PendingReview $item, $rowCount ) {
 		$changes = $this->getPendingReviewChangesList( $combinedList );
 		$acceptChangesButton = null;
 
-		if ( count( $item->newRevisions ) ) {
-			$previousViewedChange = Revision::newFromRow( $item->newRevisions[0] )->getPrevious();
-			if ( $previousViewedChange ) {
-				$prevId = $previousViewedChange->getId();
-				$context = new DerivativeContext( RequestContext::getMain() );
-				$context->setTitle( $item->title );
-				$diff = new DifferenceEngine( $context, $prevId, 0 );
-				$diff->showDiffStyle();
-				$theDiff = $diff->getDiff( '<b>Last seen</b>', '<b>Current</b>' );
-
-				$numChars = strlen( $theDiff );
-				$numRows = substr_count( $theDiff, '<tr' );
-
-				if ( $numRows < $egPendingReviewMaxDiffRows && $numChars < $egPendingReviewMaxDiffChar ) {
-					$changes .= "<div class='pending-review-diff'>";
-					$changes .= $theDiff;
-					$changes .= '</div>';
-					$acceptChangesButton = $this->getAcceptChangeButton( $item );
-				}
-
-			}
-		}
-
 		if ( $item->title->isRedirect() ) {
 			$reviewButton = $this->getAcceptRedirectButton( $item );
 		} else {
+
+			if ( count( $item->newRevisions ) ) {
+				$previousViewedChange = Revision::newFromRow( $item->newRevisions[0] )->getPrevious();
+				if ( $previousViewedChange ) {
+					$prevId = $previousViewedChange->getId();
+					$context = new DerivativeContext( RequestContext::getMain() );
+					$context->setTitle( $item->title );
+					$diff = new DifferenceEngine( $context, $prevId, 0 );
+					$diff->showDiffStyle();
+					$theDiff = $diff->getDiff( '<b>Last seen</b>', '<b>Current</b>' );
+
+					$numChars = strlen( $theDiff );
+					$numRows = substr_count( $theDiff, '<tr' );
+
+					if ( $numRows < $egPendingReviewMaxDiffRows && $numChars < $egPendingReviewMaxDiffChar ) {
+						$changes .= "<div class='pending-review-diff'>";
+						$changes .= $theDiff;
+						$changes .= '</div>';
+						$acceptChangesButton = $this->getAcceptChangeButton( $item );
+					}
+
+				}
+			}
+
 			$reviewButton = $this->getReviewButton( $item );
 		}