Iniquity has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/384254 )
Change subject: Remove unusable global values: babel-cellpadding,
babel-cellspacing
......................................................................
Remove unusable global values: babel-cellpadding, babel-cellspacing
Bug: T178229
Change-Id: Ib9a8e0571e456436b95df1f313705bf71c3bf53f
---
M Babel.class.php
M BabelBox/LanguageBabelBox.php
M extension.json
M tests/phpunit/BabelTest.php
4 files changed, 9 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Babel
refs/changes/54/384254/2
diff --git a/Babel.class.php b/Babel.class.php
index 2ecbab6..5dcaabf 100644
--- a/Babel.class.php
+++ b/Babel.class.php
@@ -76,19 +76,9 @@
$showfooter = '! class="mw-babel-footer" | [[' .
$url->text() . '|' . $footer->text() . ']]';
}
- $spacing = self::mCssAttrib( 'border-spacing',
'babel-box-cellspacing', true );
- $padding = self::mCssAttrib( 'padding',
'babel-box-cellpadding', true );
-
- if ( $spacing === '' ) {
- $style = ( $padding === '' ) ? '' : ( 'style="' .
$padding . '"' );
- } else {
- $style = ( $padding === '' ) ?
- 'style="' . $spacing . '"' :
- 'style="' . $padding . ' ' . $spacing . '"';
- }
$tower = <<<EOT
-{|$style class="mw-babel-wrapper"
+{|class="mw-babel-wrapper"
$top
|-
| $content
diff --git a/BabelBox/LanguageBabelBox.php b/BabelBox/LanguageBabelBox.php
index 783062f..0c54446 100644
--- a/BabelBox/LanguageBabelBox.php
+++ b/BabelBox/LanguageBabelBox.php
@@ -85,22 +85,11 @@
$dir_current = Language::factory( $code )->getDir();
- $spacing = Babel::mCssAttrib( 'border-spacing',
'babel-cellspacing', true );
- $padding = Babel::mCssAttrib( 'padding', 'babel-cellpadding',
true );
-
- if ( $spacing === '' ) {
- $style = ( $padding === '' ) ? '' : ( 'style="' .
$padding . '"' );
- } else {
- $style = ( $padding === '' ) ?
- 'style="' . $spacing . '"' :
- 'style="' . $padding . ' ' . $spacing . '"';
- }
-
$dir_head = $this->title->getPageLanguage()->getDir();
$box = <<<EOT
<div class="mw-babel-box mw-babel-box-{$this->level}" dir="$dir_head">
-{|$style
+{|
! dir="$dir_head" | $header
| dir="$dir_current" lang="$code" | $text
|}
diff --git a/extension.json b/extension.json
index 0ffba95..9f407e2 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "Babel",
- "version": "1.10.1",
+ "version": "1.10.2",
"author": [
"Robert Leverington",
"Thiemo Mättig",
diff --git a/tests/phpunit/BabelTest.php b/tests/phpunit/BabelTest.php
index e2a694f..fb3453a 100644
--- a/tests/phpunit/BabelTest.php
+++ b/tests/phpunit/BabelTest.php
@@ -112,7 +112,7 @@
$parser = $this->getParser( $title );
$wikiText = Babel::Render( $parser, '' );
$this->assertSame(
- '{|style=" padding: (babel-box-cellpadding);
border-spacing: (babel-box-cellspacing);"'
+ '{|'
. ' class="mw-babel-wrapper"'
. "\n"
. '! class="mw-babel-header" | [[(babel-url)|(babel:
User-1)]]'
@@ -143,7 +143,7 @@
$this->assertContains(
'<div class="mw-babel-box mw-babel-box-N" dir="ltr">'
. "\n"
- . '{|style=" padding: (babel-cellpadding);
border-spacing: (babel-cellspacing);"'
+ . '{|'
. "\n"
. '! dir="ltr" | [[(babel-portal: en)|en]]<span
class="mw-babel-box-level-N">-N</span>'
. "\n"
@@ -170,7 +170,7 @@
$this->assertContains(
'<div class="mw-babel-box mw-babel-box-N" dir="ltr">'
. "\n"
- . '{|style=" padding: (babel-cellpadding);
border-spacing: (babel-cellspacing);"'
+ . '{|'
. "\n"
. '! dir="ltr" | [[(babel-portal: en)|en]]<span
class="mw-babel-box-level-N">-N</span>'
. "\n"
@@ -192,7 +192,7 @@
$this->assertContains(
'<div class="mw-babel-box mw-babel-box-1" dir="ltr">'
. "\n"
- . '{|style=" padding: (babel-cellpadding);
border-spacing: (babel-cellspacing);"'
+ . '{|'
. "\n"
. '! dir="ltr" | [[(babel-portal: en)|en]]<span
class="mw-babel-box-level-1">-1</span>'
. "\n"
@@ -209,7 +209,7 @@
$this->assertContains(
'<div class="mw-babel-box mw-babel-box-N" dir="ltr">'
. "\n"
- . '{|style=" padding: (babel-cellpadding);
border-spacing: (babel-cellspacing);"'
+ . '{|'
. "\n"
. '! dir="ltr" | [[(babel-portal: zh-Hant)|zh-Hant]]'
. '<span class="mw-babel-box-level-N">-N</span>'
@@ -231,7 +231,7 @@
$this->assertSame(
'<div class="mw-babel-box mw-babel-box-N" dir="ltr">'
. "\n"
- . '{|style=" padding: (babel-cellpadding);
border-spacing: (babel-cellspacing);"'
+ . '{|'
. "\n"
. '! dir="ltr" | [[(babel-portal: en)|en]]<span
class="mw-babel-box-level-N">-N</span>'
. "\n"
--
To view, visit https://gerrit.wikimedia.org/r/384254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9a8e0571e456436b95df1f313705bf71c3bf53f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Babel
Gerrit-Branch: master
Gerrit-Owner: Iniquity <inite...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
