[MediaWiki-commits] [Gerrit] Preventing empty payloads from being created when using summary - change (mediawiki...Echo)

[EBernhardson (WMF) (Code Review)]

EBernhardson (WMF) has submitted this change and it was merged.

Change subject: Preventing empty payloads from being created when using summary
..


Preventing empty payloads from being created when using summary

Also making sure that footer has some amount of separation from
the notification title even if there is no payload.

Change-Id: I85a1a7989539044a0b0b53e76e70ddee9bb7165c
---
M formatters/BasicFormatter.php
M modules/base/ext.echo.base.css
2 files changed, 14 insertions(+), 8 deletions(-)

Approvals:
  EBernhardson (WMF): Verified; Looks good to me, approved



diff --git a/formatters/BasicFormatter.php b/formatters/BasicFormatter.php
index 662f943..53ffcf5 100644
--- a/formatters/BasicFormatter.php
+++ b/formatters/BasicFormatter.php
@@ -359,14 +359,19 @@
protected function formatPayload( $payload, $event, $user ) {
switch ( $payload ) {
case 'summary':
-   return Xml::tags(
-   'div',
-   array( 'class' = 
'mw-echo-edit-summary' ),
-   Xml::tags(
-   'span', array( 'class' = 
'comment' ),
-   htmlspecialchars( 
$this-getRevisionSnippet( $event, $user ) )
-   )
-   );
+   $revisionSnippet = $this-getRevisionSnippet( 
$event, $user );
+   if ( $revisionSnippet ) {
+   return Xml::tags(
+   'div',
+   array( 'class' = 
'mw-echo-edit-summary' ),
+   Xml::tags(
+   'span', array( 'class' 
= 'comment' ),
+   htmlspecialchars( 
$revisionSnippet )
+   )
+   );
+   } else {
+   return '';
+   }
break;
case 'comment-text':
return $this-formatCommentText( $event, $user 
);
diff --git a/modules/base/ext.echo.base.css b/modules/base/ext.echo.base.css
index ead7941..8138221 100644
--- a/modules/base/ext.echo.base.css
+++ b/modules/base/ext.echo.base.css
@@ -15,6 +15,7 @@
 .mw-echo-timestamp, .mw-echo-notification-footer {
color: #6D6D6D;
font-size: 9px;
+   margin-top: 0.2em;
 }
 .mw-echo-notifications {
background-color: #EE;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85a1a7989539044a0b0b53e76e70ddee9bb7165c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: EBernhardson (WMF) ebernhard...@wikimedia.org
Gerrit-Reviewer: Werdna agarr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Preventing empty payloads from being created when using summary - change (mediawiki...Echo)

[Kaldari (Code Review)]

Kaldari has uploaded a new change for review.

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


Change subject: Preventing empty payloads from being created when using summary
..

Preventing empty payloads from being created when using summary

Also making sure that footer has some amount of separation from
the notification title even if there is no payload.

Change-Id: I85a1a7989539044a0b0b53e76e70ddee9bb7165c
---
M formatters/BasicFormatter.php
M modules/base/ext.echo.base.css
2 files changed, 14 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/74/81874/1

diff --git a/formatters/BasicFormatter.php b/formatters/BasicFormatter.php
index 662f943..53ffcf5 100644
--- a/formatters/BasicFormatter.php
+++ b/formatters/BasicFormatter.php
@@ -359,14 +359,19 @@
protected function formatPayload( $payload, $event, $user ) {
switch ( $payload ) {
case 'summary':
-   return Xml::tags(
-   'div',
-   array( 'class' = 
'mw-echo-edit-summary' ),
-   Xml::tags(
-   'span', array( 'class' = 
'comment' ),
-   htmlspecialchars( 
$this-getRevisionSnippet( $event, $user ) )
-   )
-   );
+   $revisionSnippet = $this-getRevisionSnippet( 
$event, $user );
+   if ( $revisionSnippet ) {
+   return Xml::tags(
+   'div',
+   array( 'class' = 
'mw-echo-edit-summary' ),
+   Xml::tags(
+   'span', array( 'class' 
= 'comment' ),
+   htmlspecialchars( 
$revisionSnippet )
+   )
+   );
+   } else {
+   return '';
+   }
break;
case 'comment-text':
return $this-formatCommentText( $event, $user 
);
diff --git a/modules/base/ext.echo.base.css b/modules/base/ext.echo.base.css
index ead7941..8138221 100644
--- a/modules/base/ext.echo.base.css
+++ b/modules/base/ext.echo.base.css
@@ -15,6 +15,7 @@
 .mw-echo-timestamp, .mw-echo-notification-footer {
color: #6D6D6D;
font-size: 9px;
+   margin-top: 0.2em;
 }
 .mw-echo-notifications {
background-color: #EE;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85a1a7989539044a0b0b53e76e70ddee9bb7165c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org

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