Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/186773
Change subject: Renamed wb-snakview/wb-snak to wikibase-snakview
......................................................................
Renamed wb-snakview/wb-snak to wikibase-snakview
In compliance with common widget naming schema.
Change-Id: I304affdb3fabb96cae2b0f984c53dce5528b8fb5
---
M lib/resources/jquery.wikibase/jquery.wikibase.statementgrouplabelscroll.js
M lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js
M lib/resources/jquery.wikibase/snakview/snakview.js
M lib/resources/jquery.wikibase/snakview/snakview.variations.js
M
lib/resources/jquery.wikibase/snakview/themes/default/snakview.SnakTypeSelector.css
M
lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js
M lib/resources/wikibase.css
M repo/includes/View/SnakHtmlGenerator.php
M repo/resources/templates.php
M repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
M repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
11 files changed, 68 insertions(+), 79 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/73/186773/1
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.statementgrouplabelscroll.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementgrouplabelscroll.js
index 9246d20..fe2fd20 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementgrouplabelscroll.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementgrouplabelscroll.js
@@ -212,11 +212,12 @@
function findFirstVisibleMainSnakElement( $searchRange ) {
var result = null;
- // Caring about the visibility of ".wb-snak-value-container" is
better than about
+ // Caring about the visibility of
".wikibase-snakview-value-container" is better than about
// ".wikibase-statementview" or
".wikibase-statementview-mainsnak" since the label will
- // align with the .wb-snak-value-container.
- var $mainSnaks
- = $searchRange.find( '.wikibase-statementview-mainsnak
.wb-snak-value-container' );
+ // align with the .wikibase-snakview-value-container.
+ var $mainSnaks = $searchRange.find(
+ '.wikibase-statementview-mainsnak
.wikibase-snakview-value-container'
+ );
$mainSnaks.each( function( i, mainSnakNode ) {
// Take first Main Snak value in viewport. If value is
not fully visible in viewport,
diff --git
a/lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js
b/lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js
index 95125a3..2647292 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js
@@ -244,8 +244,4 @@
$.wikibase.snakview.SnakTypeSelector = $.wikibase.SnakTypeSelector;
- // We have to override this here because $.widget sets it no matter
what's in
- // the prototype
- $.wikibase.snakview.SnakTypeSelector.prototype.widgetBaseClass =
'wb-snaktypeselector';
-
}( mediaWiki, jQuery ) );
diff --git a/lib/resources/jquery.wikibase/snakview/snakview.js
b/lib/resources/jquery.wikibase/snakview/snakview.js
index 6aec8d6..0771b69 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.js
@@ -75,12 +75,12 @@
* @protected
*/
options: {
- template: 'wb-snak',
+ template: 'wikibase-snakview',
templateParams: [ '', '', '' ],
templateShortCuts: {
- '$property': '.wb-snak-property',
- '$snakValue': '.wb-snak-value',
- '$snakTypeSelector': '.wb-snak-typeselector'
+ '$property': '.wikibase-snakview-property',
+ '$snakValue': '.wikibase-snakview-value',
+ '$snakTypeSelector': '.wikibase-snakview-typeselector'
},
value: {
property: null,
@@ -932,10 +932,6 @@
return this.$property.is( ':visible' );
}
} );
-
-// We have to override this here because $.widget sets it no matter what's in
-// the prototype
-$.wikibase.snakview.prototype.widgetBaseClass = 'wb-snakview';
$.extend( $.wikibase.snakview, existingSnakview );
diff --git a/lib/resources/jquery.wikibase/snakview/snakview.variations.js
b/lib/resources/jquery.wikibase/snakview/snakview.variations.js
index 40391bc..e397514 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.variations.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.variations.js
@@ -53,7 +53,7 @@
variationName = 'WbSnakviewVariations_' +
snakType; // name for constructor
var Variation = util.inherit( variationName, base,
$.extend(
- { variationBaseClass: 'wb-snakview-variation-'
+ snakType + 'snak' },
+ { variationBaseClass:
'wikibase-snakview-variation-' + snakType + 'snak' },
variationDefinition,
{ // we don't want to allow to overwrite this
one via the definition
variationSnakConstructor:
snakConstructor
diff --git
a/lib/resources/jquery.wikibase/snakview/themes/default/snakview.SnakTypeSelector.css
b/lib/resources/jquery.wikibase/snakview/themes/default/snakview.SnakTypeSelector.css
index f4e8d46..46c37ea 100644
---
a/lib/resources/jquery.wikibase/snakview/themes/default/snakview.SnakTypeSelector.css
+++
b/lib/resources/jquery.wikibase/snakview/themes/default/snakview.SnakTypeSelector.css
@@ -1,4 +1,4 @@
-.wb-snak-typeselector .wb-snaktypeselector {
+.wikibase-snakview-typeselector .wikibase-snaktypeselector {
border: none;
}
@@ -17,7 +17,7 @@
background-image: url(images/ui-icon_snaktypeselector_666666.png);
}
-.wb-snaktypeselector-menu {
+.wikibase-snaktypeselector-menu {
position: absolute;
z-index: 2; /* Monobook #content has 2 */
}
diff --git
a/lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js
b/lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js
index 4307255..89d1239 100644
---
a/lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js
+++
b/lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js
@@ -41,7 +41,7 @@
function( event, toolbarcontroller ) {
// Destroy the snakview
toolbars:
var $referenceviewNode = $(
event.target );
- $.each(
$referenceviewNode.find( '.wb-snakview' ), function( i, snakviewNode ) {
+ $.each(
$referenceviewNode.find( '.wikibase-snakview' ), function( i, snakviewNode ) {
toolbarcontroller.destroyToolbar( $( snakviewNode ).data( 'removetoolbar' ) );
} );
}
diff --git a/lib/resources/wikibase.css b/lib/resources/wikibase.css
index b7c380b..0f412e5 100644
--- a/lib/resources/wikibase.css
+++ b/lib/resources/wikibase.css
@@ -248,10 +248,10 @@
word-wrap: break-word;
}
-div.wikibase-statementview-mainsnak .wb-snak-property-container {
+div.wikibase-statementview-mainsnak .wikibase-snakview-property-container {
display: none;
}
-.wikibase-statementview.wb-new .wikibase-statementview-mainsnak
.wb-snak-property-container {
+.wikibase-statementview.wb-new .wikibase-statementview-mainsnak
.wikibase-snakview-property-container {
position: absolute;
top: 0;
bottom: 0;
@@ -260,16 +260,16 @@
display: block;
}
-div.wb-snak {
+div.wikibase-snakview {
padding: 10px;
}
-div.wb-snak .wb-snak-value-container {
+div.wikibase-snakview .wikibase-snakview-value-container {
margin-left: 16px;
min-height: .8em; /* reduces jumping when clicking edit */
}
-div .wb-snak-value span.error.wb-format-error {
+div .wikibase-snakview-value span.error.wb-format-error {
display: block;
color: red;
font-size: inherit;
@@ -315,12 +315,12 @@
}
.wikibase-statementgrouplistview .wikibase-statementgroupview-property.wb-edit,
-.wikibase-statementlistview-listview .wb-edit .wb-snak-property-container {
+.wikibase-statementlistview-listview .wb-edit
.wikibase-snakview-property-container {
background-color: #C0DAE5;
}
.wikibase-statementgrouplistview
.wikibase-statementgroupview-property.wb-error,
-.wb-error div.wb-claim-new .wb-snak-property-container {
+.wb-error div.wb-claim-new .wikibase-snakview-property-container {
background-color: #E5C8B5;
}
@@ -352,50 +352,50 @@
margin: 0 18em 0 15em;
}
-.wikibase-statementgrouplistview .wb-new .wb-snak-property {
+.wikibase-statementgrouplistview .wb-new .wikibase-snakview-property {
padding: 10px;
}
-.wikibase-statementgrouplistview .wb-new .wb-snak-property input {
+.wikibase-statementgrouplistview .wb-new .wikibase-snakview-property input {
width: 100%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
-.wikibase-statementgrouplistview .wb-new .wb-snak-value {
+.wikibase-statementgrouplistview .wb-new .wikibase-snakview-value {
min-height: 1.5em;
max-width: 32em;
}
-.wb-snak-typeselector {
+.wikibase-snakview-typeselector {
position: absolute;
left: 10px;
width: 16px;
cursor: pointer;
}
-.wb-snakview-unsupportedsnaktype,
-.wb-snakview-variation-valuesnak-unsupporteddatavalue,
-.wb-snakview-variation-valuesnak-datavaluetypemismatch,
-.wb-snakview-variation-valuesnak-nonewvaluefordeletedproperty,
-.wb-snakview-variation-somevaluesnak,
-.wb-snakview-variation-novaluesnak {
+.wikibase-snakview-unsupportedsnaktype,
+.wikibase-snakview-variation-valuesnak-unsupporteddatavalue,
+.wikibase-snakview-variation-valuesnak-datavaluetypemismatch,
+.wikibase-snakview-variation-valuesnak-nonewvaluefordeletedproperty,
+.wikibase-snakview-variation-somevaluesnak,
+.wikibase-snakview-variation-novaluesnak {
color: #565656;
font-style: italic;
line-height: 1.2;
}
-.wb-snakview-variation-valuesnak-datavaluetypemismatch,
-.wb-snakview-variation-valuesnak-nonewvaluefordeletedproperty {
+.wikibase-snakview-variation-valuesnak-datavaluetypemismatch,
+.wikibase-snakview-variation-valuesnak-nonewvaluefordeletedproperty {
color: red;
}
-.wb-snakview-variation-valuesnak-datavaluetypemismatch-message div {
+.wikibase-snakview-variation-valuesnak-datavaluetypemismatch-message div {
font-size: 84%;
margin-top: 0.4em;
}
-.wb-snakview-variation-valuesnak textarea {
+.wikibase-snakview-variation-valuesnak textarea {
width: 100%;
}
@@ -417,45 +417,45 @@
border-color: #C0DAE5;
}
-.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wb-snak-property {
+.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wikibase-snakview-property {
width: 12em;
position: absolute;
font-size: 90%;
}
-.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wb-snak-property input {
+.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wikibase-snakview-property input {
width: 100%;
font-size: 100%;
top: 0;
position: absolute;
}
-.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wb-snak-value-container {
+.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wikibase-snakview-value-container {
margin-left: 12em;
position: relative;
}
-.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wb-snak-value-container .wb-snak-value {
+.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wikibase-snakview-value-container
.wikibase-snakview-value {
margin-left: 16px;
margin-right: 18em;
word-wrap: break-word;
}
-.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wb-snak-value-container .wb-snak-value
.valueview-value {
+.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wikibase-snakview-value-container
.wikibase-snakview-value .valueview-value {
font-size: 90%;
}
-.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wb-snak-value-container .wb-snak-typeselector {
+.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wikibase-snakview-value-container
.wikibase-snakview-typeselector {
left: 0;
}
-.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wb-snak-value-container .wb-snak-value
.valueview-value textarea {
+.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wikibase-snakview-value-container
.wikibase-snakview-value .valueview-value textarea {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
-.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wb-snakview {
+.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wikibase-snakview {
position: relative;
min-height: 1.8em;
padding-top: 4px;
@@ -463,7 +463,7 @@
}
/* "remove" link at each reference's snak */
-.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wb-snakview > .wikibase-toolbar-container {
+.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wikibase-snakview >
.wikibase-toolbar-container {
top: 5px;
}
@@ -569,45 +569,45 @@
border-color: #C0DAE5;
}
-.wb-referenceview .wikibase-snaklistview-listview .wb-snak-property {
+.wb-referenceview .wikibase-snaklistview-listview .wikibase-snakview-property {
width: 12em;
position: absolute;
font-size: 90%;
}
-.wb-referenceview .wikibase-snaklistview-listview .wb-snak-property input {
+.wb-referenceview .wikibase-snaklistview-listview .wikibase-snakview-property
input {
width: 100%;
font-size: 100%;
top: 0;
position: absolute;
}
-.wb-referenceview .wikibase-snaklistview-listview .wb-snak-value-container {
+.wb-referenceview .wikibase-snaklistview-listview
.wikibase-snakview-value-container {
margin-left: 12em;
position: relative;
}
-.wb-referenceview .wikibase-snaklistview-listview .wb-snak-value-container
.wb-snak-value {
+.wb-referenceview .wikibase-snaklistview-listview
.wikibase-snakview-value-container .wikibase-snakview-value {
margin-left: 16px;
margin-right: 18em;
word-wrap: break-word;
}
-.wb-referenceview .wikibase-snaklistview-listview .wb-snak-value-container
.wb-snak-value .valueview-value {
+.wb-referenceview .wikibase-snaklistview-listview
.wikibase-snakview-value-container .wikibase-snakview-value .valueview-value {
font-size: 90%;
}
-.wb-referenceview .wikibase-snaklistview-listview .wb-snak-value-container
.wb-snak-typeselector {
+.wb-referenceview .wikibase-snaklistview-listview
.wikibase-snakview-value-container .wikibase-snakview-typeselector {
left: 0;
}
-.wb-referenceview .wikibase-snaklistview-listview .wb-snak-value-container
.wb-snak-value .valueview-value textarea {
+.wb-referenceview .wikibase-snaklistview-listview
.wikibase-snakview-value-container .wikibase-snakview-value .valueview-value
textarea {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
-.wb-referenceview .wikibase-snaklistview-listview .wb-snakview {
+.wb-referenceview .wikibase-snaklistview-listview .wikibase-snakview {
position: relative;
min-height: 1.8em;
padding-top: 4px;
@@ -625,7 +625,7 @@
}
/* "remove" link at each reference's snak */
-.wb-referenceview .wikibase-snaklistview-listview .wb-snakview >
.wb-removetoolbar {
+.wb-referenceview .wikibase-snaklistview-listview .wikibase-snakview >
.wb-removetoolbar {
position: absolute;
top: 5px;
right: 0;
diff --git a/repo/includes/View/SnakHtmlGenerator.php
b/repo/includes/View/SnakHtmlGenerator.php
index 631b4ac..0acc8cf 100644
--- a/repo/includes/View/SnakHtmlGenerator.php
+++ b/repo/includes/View/SnakHtmlGenerator.php
@@ -74,7 +74,7 @@
*/
public function getSnakHtml( Snak $snak, $showPropertyLink = false ) {
$snakViewVariation = $this->getSnakViewVariation( $snak );
- $snakViewCssClass = 'wb-snakview-variation-' .
$snakViewVariation;
+ $snakViewCssClass = 'wikibase-snakview-variation-' .
$snakViewVariation;
$formattedValue = $this->getFormattedSnakValue( $snak );
@@ -84,7 +84,7 @@
$propertyLink = $showPropertyLink ? $this->makePropertyLink(
$snak ) : '';
- $html = $this->templateFactory->render( 'wb-snak',
+ $html = $this->templateFactory->render( 'wikibase-snakview',
// Display property link only once for snaks featuring
the same property:
$propertyLink,
$snakViewCssClass,
diff --git a/repo/resources/templates.php b/repo/resources/templates.php
index 5eae67e..34e698d 100644
--- a/repo/resources/templates.php
+++ b/repo/resources/templates.php
@@ -81,19 +81,15 @@
</div>
HTML;
- // TODO: .wb-snakview should not be part of the template; check uses of
that class and move them
- // to .wb-snak
- $templates['wb-snak'] =
-// This template is not only used for PropertyValueSnak Snaks but also for
other Snaks without a
-// value which may display some message in the value node.
+ $templates['wikibase-snakview'] =
<<<HTML
-<div class="wb-snak wb-snakview">
- <div class="wb-snak-property-container">
- <div class="wb-snak-property" dir="auto">$1</div>
+<div class="wikibase-snakview">
+ <div class="wikibase-snakview-property-container">
+ <div class="wikibase-snakview-property" dir="auto">$1</div>
</div>
- <div class="wb-snak-value-container" dir="auto">
- <div class="wb-snak-typeselector"></div>
- <div class="wb-snak-value $2">$3</div>
+ <div class="wikibase-snakview-value-container" dir="auto">
+ <div class="wikibase-snakview-typeselector"></div>
+ <div class="wikibase-snakview-value $2">$3</div>
</div>
</div>
HTML;
@@ -103,7 +99,7 @@
<div class="wikibase-statementview wikibase-statement-$1">
<div class="wikibase-statementview-rankselector">$2</div>
<div class="wikibase-statementview-mainsnak-container">
- <div class="wikibase-statementview-mainsnak" dir="auto"><!--
wb-snak -->$3</div>
+ <div class="wikibase-statementview-mainsnak" dir="auto"><!--
wikibase-snakview -->$3</div>
<div class="wikibase-statementview-qualifiers"><!--
wikibase-listview -->$4</div>
</div>
<!-- wikibase-toolbar -->$5
diff --git a/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
b/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
index 55344aa..94be44a 100644
--- a/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
+++ b/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
@@ -121,7 +121,7 @@
$propertyIdFormatterMock,
new Claim( new PropertySomeValueSnak( 42 ) ),
array(
- 'snak variation css' =>
'/wb-snakview-variation-somevalue/',
+ 'snak variation css' =>
'/wikibase-snakview-variation-somevalue/',
'formatted snak' => '/a snak!/'
)
);
@@ -136,7 +136,7 @@
) )
),
array(
- 'snak variation css' =>
'/wb-snakview-variation-somevalue/',
+ 'snak variation css' =>
'/wikibase-snakview-variation-somevalue/',
'formatted snak' => '/a snak!.*a snak!/s'
)
);
@@ -154,7 +154,7 @@
) ) ) ) )
),
array(
- 'snak variation css' =>
'/wb-snakview-variation-value/',
+ 'snak variation css' =>
'/wikibase-snakview-variation-value/',
'formatted snak' => '/a snak!.*a snak!/s'
)
);
diff --git a/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
b/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
index 313f000..86e6640 100644
--- a/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
+++ b/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
@@ -59,7 +59,7 @@
$propertyIdFormatterMock,
new PropertySomeValueSnak( 42 ),
array(
- 'snak variation css' =>
'/wb-snakview-variation-somevalue/',
+ 'snak variation css' =>
'/wikibase-snakview-variation-somevalue/',
'formatted snak' => '/a snak!/'
)
);
@@ -69,7 +69,7 @@
$propertyIdFormatterMock,
new PropertySomeValueSnak( 42 ),
array(
- 'snak variation css' =>
'/wb-snakview-variation-somevalue/',
+ 'snak variation css' =>
'/wikibase-snakview-variation-somevalue/',
'formatted snak' => '/a snak!/s'
)
);
@@ -79,7 +79,7 @@
$propertyIdFormatterMock,
new PropertyValueSnak( 50, new StringValue(
'chocolate!' ) ),
array(
- 'snak variation css' =>
'/wb-snakview-variation-value/',
+ 'snak variation css' =>
'/wikibase-snakview-variation-value/',
'formatted snak' => '/a snak!/s'
)
);
--
To view, visit https://gerrit.wikimedia.org/r/186773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I304affdb3fabb96cae2b0f984c53dce5528b8fb5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <henning.sna...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
