jenkins-bot has submitted this change and it was merged.
Change subject: Correct 'primaryLink' to 'primaryUrl' everywhere
......................................................................
Correct 'primaryLink' to 'primaryUrl' everywhere
Change-Id: Id42940460f7825541f9bc6e65ff864035591f47e
---
M modules/ooui/mw.echo.ui.NotificationOptionWidget.js
M modules/ooui/mw.echo.ui.NotificationsWidget.js
M modules/viewmodel/mw.echo.dm.NotificationsModel.js
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
Catrope: Looks good to me, approved
Mooeypoo: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ooui/mw.echo.ui.NotificationOptionWidget.js
b/modules/ooui/mw.echo.ui.NotificationOptionWidget.js
index 238556d..275ef0c 100644
--- a/modules/ooui/mw.echo.ui.NotificationOptionWidget.js
+++ b/modules/ooui/mw.echo.ui.NotificationOptionWidget.js
@@ -110,8 +110,8 @@
*
* @return {string} Notification link
*/
- mw.echo.ui.NotificationOptionWidget.prototype.getPrimaryLink = function
() {
- return this.model.getPrimaryLink();
+ mw.echo.ui.NotificationOptionWidget.prototype.getPrimaryUrl = function
() {
+ return this.model.getPrimaryUrl();
};
/**
diff --git a/modules/ooui/mw.echo.ui.NotificationsWidget.js
b/modules/ooui/mw.echo.ui.NotificationsWidget.js
index 054ccfe..ca00b5f 100644
--- a/modules/ooui/mw.echo.ui.NotificationsWidget.js
+++ b/modules/ooui/mw.echo.ui.NotificationsWidget.js
@@ -141,7 +141,7 @@
return;
}
- link = item.getPrimaryLink();
+ link = item.getPrimaryUrl();
if ( link ) {
// Log the clickthrough
mw.echo.logger.logInteraction(
'notification-link-click', item.getData(), this.type );
diff --git a/modules/viewmodel/mw.echo.dm.NotificationsModel.js
b/modules/viewmodel/mw.echo.dm.NotificationsModel.js
index f7c8419..7e53b9c 100644
--- a/modules/viewmodel/mw.echo.dm.NotificationsModel.js
+++ b/modules/viewmodel/mw.echo.dm.NotificationsModel.js
@@ -283,7 +283,7 @@
category:
notifData.category,
content:
$content,
// Hack: Get
the primary link from the $content
- primaryLink:
$content.find( '.mw-echo-notification-primary-link' ).attr( 'href' )
+ primaryUrl:
$content.find( '.mw-echo-notification-primary-link' ).attr( 'href' )
}
);
--
To view, visit https://gerrit.wikimedia.org/r/235643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id42940460f7825541f9bc6e65ff864035591f47e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
