Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/298337
Change subject: Make use of jQuery.toggleClass
......................................................................
Make use of jQuery.toggleClass
Change-Id: Ic2166230d1b9bcdfdcb97eaaee0eea04376fba0e
---
M view/resources/jquery/ui/jquery.ui.tagadata.js
M view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
M view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
M view/resources/jquery/wikibase/jquery.wikibase.statementview.RankSelector.js
M view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
5 files changed, 20 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/37/298337/1
diff --git a/view/resources/jquery/ui/jquery.ui.tagadata.js
b/view/resources/jquery/ui/jquery.ui.tagadata.js
index afe8117..4152d2b 100644
--- a/view/resources/jquery/ui/jquery.ui.tagadata.js
+++ b/view/resources/jquery/ui/jquery.ui.tagadata.js
@@ -116,8 +116,7 @@
this._initialTagLabels = [];
this._$tagList
- .addClass( 'tagadata' )
- .addClass( 'ui-widget ui-widget-content ui-corner-all' )
+ .addClass( 'tagadata ui-widget ui-widget-content ui-corner-all'
)
.on( 'click.tagadata', function( event ) {
var target = $( event.target );
if ( target.hasClass( 'tagadata-label' ) ) {
@@ -449,11 +448,10 @@
}
// Check whether the tag is modified/new
compared to initial state:
- if ( $.inArray( tagLabel,
self._initialTagLabels ) === -1 ) {
- $tag.addClass(
'tagadata-choice-modified' );
- } else {
- $tag.removeClass(
'tagadata-choice-modified' );
- }
+ $tag.toggleClass(
+ 'tagadata-choice-modified',
+ $.inArray( tagLabel,
self._initialTagLabels ) === -1
+ );
}
);
},
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
index 43327ec..2f1903c 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
@@ -180,11 +180,10 @@
this._createBadgeSelector();
}
+ this.element.toggleClass( 'wb-edit', this._isInEditMode );
+
if ( this._isInEditMode ) {
- this.element.addClass( 'wb-edit' );
this._drawEditMode();
- } else {
- this.element.removeClass( 'wb-edit' );
}
},
@@ -547,11 +546,11 @@
* @param {Error} [error]
*/
setError: function( error ) {
+ this.element.toggleClass( 'wb-error', !!error );
+
if ( error ) {
- this.element.addClass( 'wb-error' );
this._trigger( 'toggleerror', null, [error] );
} else if ( this.element.hasClass( 'wb-error' ) ) {
- this.element.removeClass( 'wb-error' );
this._trigger( 'toggleerror' );
}
}
diff --git
a/view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
index 2e7d8f9..b7729ec 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
@@ -125,14 +125,14 @@
self.$property.toggleClass( 'wb-error', Boolean( error
) );
} )
.on( prefix + 'afterstopediting.' + this.widgetName, function(
event, dropValue ) {
- self.$property.removeClass( 'wb-error' ).removeClass(
'wb-edit' );
+ self.$property.removeClass( 'wb-error wb-edit' );
self._trigger( 'afterstopediting', null, [dropValue] );
} )
.on( prefix + 'afterstartediting.' + this.widgetName, function(
event ) {
self.$property.addClass( 'wb-edit' );
} )
.on( prefix + 'afterremove.' + this.widgetName, function( event
) {
- self.$property.removeClass( 'wb-error' ).removeClass(
'wb-edit' );
+ self.$property.removeClass( 'wb-error wb-edit' );
self._trigger( 'afterremove' );
} );
},
diff --git
a/view/resources/jquery/wikibase/jquery.wikibase.statementview.RankSelector.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.RankSelector.js
index f0e33ff..d0fa9df 100644
---
a/view/resources/jquery/wikibase/jquery.wikibase.statementview.RankSelector.js
+++
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.RankSelector.js
@@ -271,14 +271,13 @@
*/
_updateIcon: function() {
for ( var rankId in wb.datamodel.Statement.RANK ) {
- var rankName = rankId.toLowerCase();
+ var rankName = rankId.toLowerCase(),
+ selected = this._rank ===
wb.datamodel.Statement.RANK[rankId];
- if ( this._rank ===
wb.datamodel.Statement.RANK[rankId] ) {
- this.$icon
- .addClass( this.widgetFullName + '-' +
rankName )
- .attr( 'title', mw.msg(
'wikibase-statementview-rank-' + rankName ) );
- } else {
- this.$icon.removeClass(
this.widgetFullName + '-' + rankName );
+ this.$icon.toggleClass( this.widgetFullName +
'-' + rankName, selected );
+
+ if ( selected ) {
+ this.$icon.attr( 'title', mw.msg(
'wikibase-statementview-rank-' + rankName ) );
}
}
},
diff --git a/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
b/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
index d6c4a7f..5c94f10 100755
--- a/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
+++ b/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
@@ -43,8 +43,7 @@
}
this.getContainer()
- .addClass( this.widgetBaseClass + '-container' )
- .addClass( 'wikibase-toolbar-container' );
+ .addClass( this.widgetBaseClass + '-container
wikibase-toolbar-container' );
},
/**
@@ -60,9 +59,8 @@
var $container = this.getContainer();
$container
- .removeClass( this.widgetBaseClass + '-container' )
- .removeClass( 'wikibase-toolbar-container' )
- .removeClass( 'ui-state-disabled' )
+ .removeClass( this.widgetBaseClass
+ + '-container wikibase-toolbar-container
ui-state-disabled' )
.off( '.' + this.widgetName );
if ( $container.get( 0 ) !== this.element.get( 0 ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/298337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2166230d1b9bcdfdcb97eaaee0eea04376fba0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
