jenkins-bot has submitted this change and it was merged.
Change subject: Get rid of references to the no longer existing
.flow-icon-permalink
......................................................................
Get rid of references to the no longer existing .flow-icon-permalink
Change-Id: Ie361b8419fe459d4cc1491080c2c65ce8378a6df
---
M modules/discussion/styles/post.less
M modules/discussion/styles/topic.less
M modules/discussion/ui.js
3 files changed, 1 insertion(+), 28 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/discussion/styles/post.less
b/modules/discussion/styles/post.less
index 5c9d349..8995613 100644
--- a/modules/discussion/styles/post.less
+++ b/modules/discussion/styles/post.less
@@ -109,13 +109,6 @@
padding-right: 22px;
}
- .flow-icon-permalink {
- background-position: center;
- background-size: 20px auto;
- background-repeat: no-repeat;
- .background-image-svg( ~"@{icon-path}permalink_hover_ltr.svg",
~"@{icon-path}permalink_hover_ltr.png" );
- }
-
.flow-post-interaction {
padding-top: 11px;
diff --git a/modules/discussion/styles/topic.less
b/modules/discussion/styles/topic.less
index 03f79e9..442eff3 100644
--- a/modules/discussion/styles/topic.less
+++ b/modules/discussion/styles/topic.less
@@ -214,13 +214,6 @@
.background-image-svg(
~"@{icon-path}edit_hover_ltr.svg", ~"@{icon-path}edit_hover_ltr.png" );
}
- .flow-icon-permalink {
- background-position: center;
- background-size: 20px auto;
- background-repeat: no-repeat;
- .background-image-svg(
~"@{icon-path}permalink_hover_ltr.svg", ~"@{icon-path}permalink_hover_ltr.png"
);
- }
-
.flow-icon-watchlist {
background-position: center;
background-size: 20px auto;
diff --git a/modules/discussion/ui.js b/modules/discussion/ui.js
index bd084a2..4944fc5 100644
--- a/modules/discussion/ui.js
+++ b/modules/discussion/ui.js
@@ -151,10 +151,8 @@
.off( '.mw-flow-discussion' )
// On topic titlebar click, trigger
collapse/expand event
.on( 'click.mw-flow-discussion',
'.flow-titlebar', mw.flow.action.ui.titlebarClick )
- // On permalink click, go to topic or post and
highlight it
- .on( 'click.mw-flow-discussion',
'.flow-icon-permalink', mw.flow.action.ui.permalinkClick)
// On topic collapser click, choose a different
collapsing level
- .on( 'click.mw-flow-discussion',
'.topic-collapser li', mw.flow.action.ui.topicCollapserClick);
+ .on( 'click.mw-flow-discussion',
'.topic-collapser li', mw.flow.action.ui.topicCollapserClick );
},
/**
@@ -301,7 +299,6 @@
var ignore = [
'.flow-edit-title-form',
'.flow-actions',
- '.flow-icon-permalink',
'.flow-icon-watchlist',
'.flow-topic-comments-link'
].join( ',' ),
@@ -320,16 +317,6 @@
// Otherwise, collapse
mw.flow.discussion.topicCollapse(
$topicContainerChildren );
}
- },
-
- /**
- * onclick handler for permalink anchors; triggers
highlightElement on the target post or topic.
- * @param {Event} event
- */
- permalinkClick: function ( event ) {
- event.preventDefault();
-
- mw.flow.discussion.highlightElement( $( this.hash ), 0
);
}
};
--
To view, visit https://gerrit.wikimedia.org/r/114990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie361b8419fe459d4cc1491080c2c65ce8378a6df
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
