jenkins-bot has submitted this change and it was merged.
Change subject: VisualEditor & ExtendedEditBar
......................................................................
VisualEditor & ExtendedEditBar
* Fixed racing condition bug in VisualEditor that resulted in an empty
icon in ExtendedEditbar
* Fixed styling issue with ExtendedEdtitBar
Change-Id: I91590895b43451f9c3a33be6338ffe390de22d43
---
M ExtendedEditBar/resources/bluespice.extendedEditBar.css
M VisualEditor/VisualEditor.class.php
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Mglaser: Looks good to me, approved
Tweichart: Checked; Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/ExtendedEditBar/resources/bluespice.extendedEditBar.css
b/ExtendedEditBar/resources/bluespice.extendedEditBar.css
index e0abb4b..724723d 100644
--- a/ExtendedEditBar/resources/bluespice.extendedEditBar.css
+++ b/ExtendedEditBar/resources/bluespice.extendedEditBar.css
@@ -22,6 +22,7 @@
#bs-extendededitbar {
background-color: #ebebeb;
border: 1px solid #9e9e9e;
+ line-height: 0;
}
#bs-extendededitbar div.group {
diff --git a/VisualEditor/VisualEditor.class.php
b/VisualEditor/VisualEditor.class.php
index 25aec9b..b143e52 100644
--- a/VisualEditor/VisualEditor.class.php
+++ b/VisualEditor/VisualEditor.class.php
@@ -243,7 +243,7 @@
}
public function onBSExtendedEditBarBeforeEditToolbar(&$aRows,
&$aButtonCfgs) {
- if ($this->bShowToolbarIcon == false) {
+ if ( !$this->checkContext( $this->getTitle() ) ) {
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/176636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91590895b43451f9c3a33be6338ffe390de22d43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pigpen <[email protected]>
Gerrit-Reviewer: Smuggli <[email protected]>
Gerrit-Reviewer: Tweichart <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
