jenkins-bot has submitted this change and it was merged.
Change subject: Removed unnecessary nodes from "wb-statement" template
......................................................................
Removed unnecessary nodes from "wb-statement" template
Simplifying the statement node structure by removing nodes that have no actual
use.
This allows dropping the toolbarParentSelector option for statementview "edit"
toolbar
as wells as for the references "add" toolbar.
Change-Id: I0376ed6c2f885d4b2915a6db7a297d270d6c98ce
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/templates.php
M lib/resources/wikibase.css
M selenium/lib/modules/reference_module.rb
M selenium_cuc/features/support/modules/reference_module.rb
6 files changed, 34 insertions(+), 45 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index 148bcbf..2c04134 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -342,8 +342,7 @@
},
options: {
interactionWidgetName:
$.wikibase.statementview.prototype.widgetName,
- parentWidgetFullName: 'wikibase.claimlistview',
- toolbarParentSelector: '.wb-statement-claim'
+ parentWidgetFullName: 'wikibase.claimlistview'
}
} );
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index 8514adc..d9cfa07 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -70,7 +70,7 @@
if( this.value() ) {
var $listview = $( '<div/>' )
- .prependTo( this.$references )
+ .appendTo( this.$references )
.listview( {
listItemAdapter: new
$.wikibase.listview.ListItemAdapter( {
listItemWidget:
$.wikibase.referenceview,
@@ -98,7 +98,8 @@
.on( 'referenceviewafterstopediting', function( event,
dropValue ) {
if( dropValue ) {
// Re-order claims according to their
initial indices:
- var referenceListview =
self.$references.data( 'listview' ),
+ var $referenceListview =
self.$references.children( ':wikibase-listview' ),
+ referenceListview =
$referenceListview.data( 'listview' ),
$referenceviews =
referenceListview.items();
for( var i = 0; i <
$referenceviews.length; i++ ) {
@@ -135,14 +136,8 @@
}
} );
- // Forward query for listview reference.
- this.$references.data(
- 'listview',
- this.$references.children( '.wb-listview'
).data( 'listview' )
- );
-
// Collapse references if there is at least one.
- if ( this.$references.data( 'listview' ).items().length
> 0 ) {
+ if ( $listview.data( 'listview' ).items().length > 0 ) {
this.$references.css( 'display', 'none' );
}
@@ -201,7 +196,7 @@
* @param {wb.Reference} reference
*/
_addReference: function( reference ) {
- var lv = this.$references.children( '.wb-listview' ).data(
'listview' );
+ var lv = this.$references.children( ':wikibase-listview'
).data( 'listview' );
lv.addItem( reference );
},
@@ -212,15 +207,16 @@
*/
getReferences: function() {
var self = this,
+ listview = this.$references.children(
':wikibase-listview' ).data( 'listview' ),
references = [];
// If the statement is pending (not yet stored), the listview
widget for the references is
// not defined.
- if ( !this.$references.data( 'listview' ) ) {
+ if ( !listview ) {
return references;
}
- $.each( this.$references.data( 'listview' ).items(), function(
i, item ) {
+ $.each( listview.items(), function( i, item ) {
var referenceview = self._referenceviewLia.liInstance(
$( item ) );
references.push( referenceview.value() );
} );
@@ -233,7 +229,8 @@
* @since 0.5
*/
_updateReferenceIndices: function() {
- var $referenceviews = this.$references.data( 'listview'
).items();
+ var $referenceListview = this.$references.children(
':wikibase-listview' ),
+ $referenceviews = $referenceListview.data( 'listview'
).items();
for( var i = 0; i < $referenceviews.length; i++ ) {
var referenceview = this._referenceviewLia.liInstance(
$referenceviews.eq( i ) );
@@ -254,7 +251,8 @@
this._removeReferenceApiCall( referenceview.value() )
.done( function( pageInfo ) {
- self.$references.data( 'listview' ).removeItem(
referenceview.element );
+ var listview = self.$references.children(
':wikibase-listview' ).data( 'listview' );
+ listview.removeItem( referenceview.element );
self._trigger( 'afterremove' );
} ).fail( function( errorCode, details ) {
var error = wb.RepoApiError.newFromApiResponse(
errorCode, details, 'remove' );
@@ -319,7 +317,7 @@
* @since 0.4
*/
drawReferencesCounter: function() {
- var listView = this.$references.data( 'listview' ),
+ var listView = this.$references.children( ':wikibase-listview'
).data( 'listview' ),
numberOfValues = listView.nonEmptyItems().length,
numberOfPendingValues = listView.items().length -
numberOfValues;
@@ -338,15 +336,14 @@
// Register toolbars:
$.wikibase.toolbarcontroller.definition( 'addtoolbar', {
id: 'references',
- selector: '.wb-statement-references-container',
+ selector: '.wb-statement-references',
eventPrefix: 'listview',
baseClass: 'wb-snaklistview-listview',
options: {
- toolbarParentSelector: '.wb-statement-references',
customAction: function( event, $parent ) {
var statementView = $parent.closest(
'.wb-statementview' ).data( 'statementview' ),
- listview = statementView.$references.data(
'listview' );
- listview.enterNewItem();
+ $listview = statementView.$references.children(
':wikibase-listview' );
+ $listview.data( 'listview' ).enterNewItem();
},
eventPrefix:
$.wikibase.statementview.prototype.widgetEventPrefix,
addButtonLabel: mw.msg( 'wikibase-addreference' )
@@ -372,7 +369,8 @@
referenceview = $referenceview.data(
'referenceview' ),
$statementview = $referenceview.closest(
':wikibase-statementview' ),
statementview = $statementview.data(
'statementview' ),
- referencesListview =
statementview.$references.data( 'listview' );
+ $referencesListview =
statementview.$references.children( ':wikibase-listview' ),
+ referencesListview = $referencesListview.data(
'listview' );
if( !referenceview.value() ) {
// Prevent creating the toolbar for pending
values.
@@ -416,7 +414,8 @@
var $statementview = $referenceview.closest(
':wikibase-statementview' ),
statementview = $statementview.data(
'statementview' ),
- referencesListview =
statementview.$references.data( 'listview' ),
+ $referencesListview =
statementview.$references.children( ':wikibase-listview' ),
+ referencesListview = $referencesListview.data(
'listview' ),
action = ( event.type === 'movetoolbarup' ) ?
'moveUp' : 'moveDown',
referenceviewIndex =
referencesListview.indexOf( $referenceview ),
isLastListItem = ( referenceviewIndex !==
referencesListview.items().length - 1 );
diff --git a/lib/resources/templates.php b/lib/resources/templates.php
index 48c3d9b..20e8419 100644
--- a/lib/resources/templates.php
+++ b/lib/resources/templates.php
@@ -8,9 +8,6 @@
*
* @since 0.2
*
- * @file
- * @ingroup WikibaseLib
- *
* @licence GNU GPL v2+
* @author H. Snater <[email protected]>
*
@@ -106,18 +103,16 @@
$templates['wb-statement'] =
<<<HTML
<div class="wb-statement wb-statementview $1">
- <div class="wb-statement-claim">
- <div class="wb-claim wb-claim-$2">
- <div class="wb-claim-mainsnak" dir="auto">
- $3 <!-- wb-snak (Main Snak) -->
- </div>
- <div class="wb-claim-qualifiers
wb-statement-qualifiers">$4</div>
+ <div class="wb-claim wb-claim-$2">
+ <div class="wb-claim-mainsnak" dir="auto">
+ $3 <!-- wb-snak (Main Snak) -->
</div>
- $5
+ <div class="wb-claim-qualifiers
wb-statement-qualifiers">$4</div>
</div>
- <div class="wb-statement-references-container">
- <div class="wb-statement-references-heading">$6</div>
- <div class="wb-statement-references">$7 <!-- [0,*]
wb-referenceview --></div>
+ $5 <!-- wikibase-toolbar -->
+ <div class="wb-statement-references-heading">$6</div>
+ <div class="wb-statement-references">
+ $7 <!-- [0,*] wb-referenceview -->
</div>
</div>
HTML;
diff --git a/lib/resources/wikibase.css b/lib/resources/wikibase.css
index c79a111..1ffefd1 100644
--- a/lib/resources/wikibase.css
+++ b/lib/resources/wikibase.css
@@ -735,23 +735,19 @@
padding-bottom: 1em;
}
-div.wb-statement .wb-statement-claim > .wikibase-toolbar {
+.wb-statement > .wikibase-toolbar {
display: block;
}
-div.wb-statement .wb-editsection {
+.wb-statement .wb-editsection {
top: 10px; /* even out padding */
}
/***** REFERENCES *****/
-.wb-statement-references-container {
+.wb-statement-references-heading, .wb-statement-references {
padding-left: 17em;
clear: both;
-}
-
-.wb-statement-references-container .wb-statement-references-heading {
- font-size: 90%;
}
.wb-referenceview {
diff --git a/selenium/lib/modules/reference_module.rb
b/selenium/lib/modules/reference_module.rb
index 67ceea0..d48a88f 100644
--- a/selenium/lib/modules/reference_module.rb
+++ b/selenium/lib/modules/reference_module.rb
@@ -9,7 +9,7 @@
module ReferencePage
include PageObject
# references UI elements
- div(:referenceContainer, :class => "wb-statement-references-container")
+ div(:referenceContainer, :class => "wb-statement-references")
div(:referenceHeading, :class => "wb-statement-references-heading")
link(:referenceHeadingToggleLink, :css => ".wb-statement-references-heading
a")
div(:referenceEditHeading, :css => ".wb-referenceview
.wb-referenceview-heading")
diff --git a/selenium_cuc/features/support/modules/reference_module.rb
b/selenium_cuc/features/support/modules/reference_module.rb
index f2bbdf4..84c2ad1 100644
--- a/selenium_cuc/features/support/modules/reference_module.rb
+++ b/selenium_cuc/features/support/modules/reference_module.rb
@@ -9,7 +9,7 @@
module ReferencePage
include PageObject
# references UI elements
- div(:referenceContainer, :class => "wb-statement-references-container")
+ div(:referenceContainer, :class => "wb-statement-references")
div(:referenceHeading, :class => "wb-statement-references-heading")
link(:referenceHeadingToggleLink, :css => ".wb-statement-references-heading
a")
div(:referenceEditHeading, :xpath => "//div[contains(@class,
'wb-referenceview')]/div[contains(@class, 'wb-snaklistview-heading')]")
--
To view, visit https://gerrit.wikimedia.org/r/92651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0376ed6c2f885d4b2915a6db7a297d270d6c98ce
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
