jenkins-bot has submitted this change and it was merged. Change subject: Replace widgetBaseClass with widgetFullName ......................................................................
Replace widgetBaseClass with widgetFullName See http://bugs.jqueryui.com/ticket/8154 and http://bugs.jqueryui.com/ticket/8155. Change-Id: I8247d2bb6c0f4554b2c9feaf643fef860e1bf72a --- M lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js M lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js M lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js M lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js M lib/resources/jquery.wikibase/jquery.wikibase.listview.js M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js M lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js M lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js M lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js M lib/resources/jquery.wikibase/snakview/snakview.js M lib/resources/jquery.wikibase/toolbar/addtoolbar.js M lib/resources/jquery.wikibase/toolbar/edittoolbar.js M lib/resources/jquery.wikibase/toolbar/movetoolbar.js M lib/resources/jquery.wikibase/toolbar/removetoolbar.js M lib/resources/jquery.wikibase/toolbar/toolbar.js M lib/resources/jquery.wikibase/toolbar/toolbarbase.js M lib/resources/jquery.wikibase/toolbar/toolbarbutton.js M lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js M lib/resources/jquery.wikibase/toolbar/toolbarlabel.js 23 files changed, 57 insertions(+), 57 deletions(-) Approvals: Thiemo Mättig (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js b/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js index 0bf704a..c440fc1 100644 --- a/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js +++ b/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js @@ -93,7 +93,7 @@ // the element node will be preserved, no matter whether it is of the same kind as the // template's root node (it is assumed that the template has a root node) - this.element.addClass( this.widgetBaseClass ); + this.element.addClass( this.widgetFullName ); this.element.applyTemplate( this.option( 'template' ), templateParams ); }, @@ -125,7 +125,7 @@ destroy: function() { PARENT.prototype.destroy.call( this ); - this.element.removeClass( this.widgetBaseClass ); + this.element.removeClass( this.widgetFullName ); // nullify references to short-cut DOM nodes for( var shortCut in this.options.templateShortCuts ) { diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js index 84b7eb7..5dc009b 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js @@ -92,7 +92,7 @@ * @see jQuery.Widget.destroy */ destroy: function() { - if( $( '.' + this.widgetBaseClass ).length === 0 ) { + if( $( '.' + this.widgetFullName ).length === 0 ) { this._detachMenuEventListeners(); $menu.data( 'menu' ).destroy(); @@ -221,7 +221,7 @@ $menu = $( '<ul/>' ) .text( '...' ) - .addClass( this.widgetBaseClass + '-menu' ) + .addClass( this.widgetFullName + '-menu' ) .appendTo( 'body' ); return $menu.menu(); @@ -296,7 +296,7 @@ } $( '<li/>' ) - .addClass( self.widgetBaseClass + '-menuitem-' + itemId ) + .addClass( self.widgetFullName + '-menuitem-' + itemId ) .data( self.widgetName + '-menuitem-badge', itemId ) .append( $item .prepend( mw.template( 'wb-badge', diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js index 9f7672c..524e92b 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js @@ -532,6 +532,6 @@ // We have to override this here because $.widget sets it no matter what's in // the prototype -$.wikibase.claimgrouplistview.prototype.widgetBaseClass = 'wb-claimgrouplistview'; +$.wikibase.claimgrouplistview.prototype.widgetFullName = 'wb-claimgrouplistview'; }( wikibase, jQuery ) ); diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js index 11e8366..fbfad28 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js @@ -544,6 +544,6 @@ // We have to override this here because $.widget sets it no matter what's in // the prototype -$.wikibase.claimlistview.prototype.widgetBaseClass = 'wb-claimlistview'; +$.wikibase.claimlistview.prototype.widgetFullName = 'wb-claimlistview'; }( mediaWiki, wikibase, jQuery ) ); diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js index bde5e84..6103426 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js @@ -1128,6 +1128,6 @@ // We have to override this here because $.widget sets it no matter what's in // the prototype -$.wikibase.claimview.prototype.widgetBaseClass = 'wb-claimview'; +$.wikibase.claimview.prototype.widgetFullName = 'wb-claimview'; }( mediaWiki, wikibase, jQuery ) ); diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js b/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js index a453f4d..5848777 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js @@ -91,7 +91,7 @@ * @return String */ prefixedClass: function( name ) { - return this._liWidget.prototype.widgetBaseClass + ( name || '' ); + return this._liWidget.prototype.widgetFullName + ( name || '' ); }, liInstance: function( $node ) { diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.listview.js b/lib/resources/jquery.wikibase/jquery.wikibase.listview.js index 1fe9af7..b74bde1 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.listview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.listview.js @@ -113,7 +113,7 @@ * @see $.widget.destroy */ destroy: function() { - this.element.removeClass( this.widgetBaseClass ); + this.element.removeClass( this.widgetFullName ); $.Widget.prototype.destroy.call( this ); this._trigger( 'destroy' ); }, @@ -401,6 +401,6 @@ // We have to override this here because $.widget sets it no matter what's in // the prototype -$.wikibase.listview.prototype.widgetBaseClass = 'wb-listview'; +$.wikibase.listview.prototype.widgetFullName = 'wb-listview'; }( jQuery ) ); diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js index 343fa67..4ee50b5 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js @@ -274,8 +274,8 @@ this.element.removeClassByRegex( /wb-reference-.+/ ); this.element.addClass( 'wb-reference-' + refHash ); - this.element.removeClassByRegex( new RegExp( this.widgetBaseClass ) + '-.+' ); - this.element.addClass( this.widgetBaseClass + '-' + refHash ); + this.element.removeClassByRegex( new RegExp( this.widgetFullName ) + '-.+' ); + this.element.addClass( this.widgetFullName + '-' + refHash ); }, /** @@ -961,6 +961,6 @@ // We have to override this here because $.widget sets it no matter what's in // the prototype -$.wikibase.referenceview.prototype.widgetBaseClass = 'wb-referenceview'; +$.wikibase.referenceview.prototype.widgetFullName = 'wb-referenceview'; }( mediaWiki, wikibase, jQuery ) ); diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js b/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js index b6905bd..f5c4a62 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js @@ -555,6 +555,6 @@ // We have to override this here because $.widget sets it no matter what's in // the prototype -$.wikibase.snaklistview.prototype.widgetBaseClass = 'wb-snaklistview'; +$.wikibase.snaklistview.prototype.widgetFullName = 'wb-snaklistview'; }( mediaWiki, wikibase, jQuery ) ); diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js index 7f89e24..4a7dd80 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js @@ -30,7 +30,7 @@ */ $.wikibase.statementview.RankSelector = util.inherit( PARENT, { widgetName: 'wikibase-rankselector', - widgetBaseClass: 'wb-rankselector', + widgetFullName: 'wb-rankselector', /** * @type {Object} @@ -80,7 +80,7 @@ } this.element - .addClass( this.widgetBaseClass ) + .addClass( this.widgetFullName ) .on( 'mouseover.' + this.widgetName, function( event ) { if( !self.isDisabled() ) { self.element.addClass( 'ui-state-hover' ); @@ -125,14 +125,14 @@ * @see jQuery.Widget.destroy */ destroy: function() { - if( $( '.' + this.widgetBaseClass ).length === 0 ) { + if( $( '.' + this.widgetFullName ).length === 0 ) { $menu.data( 'menu' ).destroy(); $menu.remove(); $menu = null; } this.$icon.remove(); - this.element.removeClass( 'ui-state-default ui-state-hover ' + this.widgetBaseClass ); + this.element.removeClass( 'ui-state-default ui-state-hover ' + this.widgetFullName ); this._unbindGlobalEventListeners(); @@ -165,14 +165,14 @@ */ _buildMenu: function() { var self = this, - $menu = $( '<ul/>' ).addClass( this.widgetBaseClass + '-menu' ); + $menu = $( '<ul/>' ).addClass( this.widgetFullName + '-menu' ); $.each( wb.datamodel.Statement.RANK, function( rankId, i ) { rankId = rankId.toLowerCase(); $menu.append( $( '<li/>' ) - .addClass( self.widgetBaseClass + '-menuitem-' + rankId ) + .addClass( self.widgetFullName + '-menuitem-' + rankId ) .data( self.widgetName + '-menuitem-rank', i ) .append( $( '<a/>' ) @@ -227,7 +227,7 @@ _updateMenuCss: function() { $menu.children().removeClass( 'ui-state-active' ); $menu - .children( '.' + this.widgetBaseClass + '-menuitem-' + getRankString( this.rank() ) ) + .children( '.' + this.widgetFullName + '-menuitem-' + getRankString( this.rank() ) ) .addClass( 'ui-state-active' ); }, diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js index d3138c4..e59d267 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js @@ -611,6 +611,6 @@ // We have to override this here because $.widget sets it no matter what's in // the prototype -$.wikibase.statementview.prototype.widgetBaseClass = 'wb-statementview'; +$.wikibase.statementview.prototype.widgetFullName = 'wb-statementview'; }( mediaWiki, wikibase, jQuery ) ); diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js b/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js index b052b5c..5b10367 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js @@ -88,7 +88,7 @@ this._tipsy = this.element.data( 'tipsy' ); - this.element.addClass( this.widgetBaseClass ); + this.element.addClass( this.widgetFullName ); if( !this.options.permanent ) { this.element @@ -105,7 +105,7 @@ $( window ) .off( '.' + this.widgetName ) // Never need that event more than once. .on( 'resize.' + this.widgetName, function( event ) { - $( '.' + self.widgetBaseClass ).each( function( i, node ) { + $( '.' + self.widgetFullName ).each( function( i, node ) { var tooltip = $( node ).data( self.widgetName ); if( @@ -133,7 +133,7 @@ this._tipsy = null; // Detach window event handler if no widget instances are left: - if( $( '.' + this.widgetBaseClass ).length === 0 ) { + if( $( '.' + this.widgetFullName ).length === 0 ) { $( window ).off( '.' + this.widgetName ); } @@ -214,7 +214,7 @@ this._tipsy.show(); - this._tipsy.$tip.addClass( this.widgetBaseClass + '-tip' ); + this._tipsy.$tip.addClass( this.widgetFullName + '-tip' ); var offset = this._tipsy.$tip.offset(), height = this._tipsy.$tip.height(); @@ -284,7 +284,7 @@ */ _buildErrorTooltip: function() { var $message = $( '<div/>', { - 'class': 'wb-error ' + this.widgetBaseClass + '-error' + 'class': 'wb-error ' + this.widgetFullName + '-error' } ); var $mainMessage = $( '<div/>', { @@ -293,16 +293,16 @@ // Append detailed error message if given; hide it behind toggle: if( this.options.content.detailedMessage ) { - $mainMessage.addClass( this.widgetBaseClass + '-error-top-message' ); + $mainMessage.addClass( this.widgetFullName + '-error-top-message' ); var $detailedMessage = $( '<div/>', { - 'class': this.widgetBaseClass + '-error-details', + 'class': this.widgetFullName + '-error-details', html: this.options.content.detailedMessage } ) .hide(); var $toggler = $( '<a/>' ) - .addClass( this.widgetBaseClass + '-error-details-link' ) + .addClass( this.widgetFullName + '-error-details-link' ) .text( mw.msg( 'wikibase-tooltip-error-details' ) ) .toggler( { $subject: $detailedMessage, duration: 'fast' } ); diff --git a/lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js b/lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js index 1df67eb..4c92b00 100644 --- a/lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js +++ b/lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js @@ -65,7 +65,7 @@ // TODO: add a title message this.element - .addClass( 'ui-state-default ' + this.widgetBaseClass ) + .addClass( 'ui-state-default ' + this.widgetFullName ) .on( 'mouseover.' + widgetName, function( event ) { self.element.addClass( 'ui-state-hover' ); } ) @@ -131,7 +131,7 @@ this.$icon.remove(); - this.element.removeClass( 'ui-state-default ui-state-hover ' + this.widgetBaseClass ); + this.element.removeClass( 'ui-state-default ui-state-hover ' + this.widgetFullName ); // remove event listeners responsible for closing this instance's menu: this._unbindGlobalListenersFn(); @@ -174,8 +174,8 @@ * @return jQuery */ _buildMenu: function() { - var classPrefix = this.widgetBaseClass + '-menuitem-', - $menu = $( '<ul/>' ).addClass( this.widgetBaseClass + '-menu' ), + var classPrefix = this.widgetFullName + '-menuitem-', + $menu = $( '<ul/>' ).addClass( this.widgetFullName + '-menu' ), snakTypes = $.wikibase.snakview.variations.getCoveredSnakTypes(); $.each( snakTypes, function( i, type ) { @@ -230,7 +230,7 @@ if( snakType !== null ) { // set list item of new type active: - $menu.children( '.' + this.widgetBaseClass + '-menuitem-' + snakType ) + $menu.children( '.' + this.widgetFullName + '-menuitem-' + snakType ) .addClass( 'ui-state-active' ); } @@ -259,6 +259,6 @@ // We have to override this here because $.widget sets it no matter what's in // the prototype - $.wikibase.snakview.SnakTypeSelector.prototype.widgetBaseClass = 'wb-snaktypeselector'; + $.wikibase.snakview.SnakTypeSelector.prototype.widgetFullName = 'wb-snaktypeselector'; }( mediaWiki, jQuery ) ); diff --git a/lib/resources/jquery.wikibase/snakview/snakview.js b/lib/resources/jquery.wikibase/snakview/snakview.js index 3ebd418..e72c62a 100644 --- a/lib/resources/jquery.wikibase/snakview/snakview.js +++ b/lib/resources/jquery.wikibase/snakview/snakview.js @@ -841,7 +841,7 @@ // property ID selected but apparently no variation available to handle it this.$snakValue.append( $( '<span/>', { 'text': mw.msg( 'wikibase-snakview-choosesnaktype' ), - 'class': this.widgetBaseClass + '-unsupportedsnaktype' + 'class': this.widgetFullName + '-unsupportedsnaktype' } ) ); // NOTE: instead of doing this here and checking everywhere whether this._variation // is set, we could as well use variations for displaying system messages like @@ -910,7 +910,7 @@ // We have to override this here because $.widget sets it no matter what's in // the prototype -$.wikibase.snakview.prototype.widgetBaseClass = 'wb-snakview'; +$.wikibase.snakview.prototype.widgetFullName = 'wb-snakview'; $.extend( $.wikibase.snakview, existingSnakview ); diff --git a/lib/resources/jquery.wikibase/toolbar/addtoolbar.js b/lib/resources/jquery.wikibase/toolbar/addtoolbar.js index d2f94b9..31bef08 100644 --- a/lib/resources/jquery.wikibase/toolbar/addtoolbar.js +++ b/lib/resources/jquery.wikibase/toolbar/addtoolbar.js @@ -47,7 +47,7 @@ this.options.addButtonLabel, 'javascript:void(0);' ).toolbarbutton(); - this.toolbar.$btnAdd.addClass( this.widgetBaseClass + '-addbutton' ); + this.toolbar.$btnAdd.addClass( this.widgetFullName + '-addbutton' ); this.toolbar.$innerGroup.data( 'toolbar' ).addElement( this.toolbar.$btnAdd ); this.toolbar.addElement( this.toolbar.$innerGroup ); @@ -64,6 +64,6 @@ // We have to override this here because $.widget sets it no matter what's in // the prototype - $.wikibase.addtoolbar.prototype.widgetBaseClass = 'wb-addtoolbar'; + $.wikibase.addtoolbar.prototype.widgetFullName = 'wb-addtoolbar'; }( mediaWiki, jQuery ) ); diff --git a/lib/resources/jquery.wikibase/toolbar/edittoolbar.js b/lib/resources/jquery.wikibase/toolbar/edittoolbar.js index 5775cf1..3e4b295 100644 --- a/lib/resources/jquery.wikibase/toolbar/edittoolbar.js +++ b/lib/resources/jquery.wikibase/toolbar/edittoolbar.js @@ -246,7 +246,7 @@ */ toggleActionMessage: function( options, callback ) { var self = this, - actionMessageClass = this.widgetBaseClass + '-actionmsg', + actionMessageClass = this.widgetFullName + '-actionmsg', actionMsg = this.$toolbarParent.find( '.' + actionMessageClass ); if ( options === undefined || $.isFunction( options ) ) { @@ -336,6 +336,6 @@ // We have to override this here because $.widget sets it no matter what's in // the prototype - $.wikibase.edittoolbar.prototype.widgetBaseClass = 'wb-edittoolbar'; + $.wikibase.edittoolbar.prototype.widgetFullName = 'wb-edittoolbar'; }( mediaWiki, wikibase, jQuery ) ); diff --git a/lib/resources/jquery.wikibase/toolbar/movetoolbar.js b/lib/resources/jquery.wikibase/toolbar/movetoolbar.js index 39e62d8..f424114 100644 --- a/lib/resources/jquery.wikibase/toolbar/movetoolbar.js +++ b/lib/resources/jquery.wikibase/toolbar/movetoolbar.js @@ -118,6 +118,6 @@ // We have to override this here because $.widget sets it no matter what's in // the prototype - $.wikibase.movetoolbar.prototype.widgetBaseClass = 'wb-movetoolbar'; + $.wikibase.movetoolbar.prototype.widgetFullName = 'wb-movetoolbar'; }( mediaWiki, jQuery ) ); diff --git a/lib/resources/jquery.wikibase/toolbar/removetoolbar.js b/lib/resources/jquery.wikibase/toolbar/removetoolbar.js index 0ea11cc..7a7b860 100644 --- a/lib/resources/jquery.wikibase/toolbar/removetoolbar.js +++ b/lib/resources/jquery.wikibase/toolbar/removetoolbar.js @@ -67,7 +67,7 @@ this.options.label, 'javascript:void(0);' ).toolbarbutton(); - toolbar.$btnRemove.addClass( this.widgetBaseClass + '-removebutton' ); + toolbar.$btnRemove.addClass( this.widgetFullName + '-removebutton' ); toolbar.$innerGroup.data( 'toolbar' ).addElement( toolbar.$btnRemove ); toolbar.addElement( toolbar.$innerGroup ); @@ -83,6 +83,6 @@ // We have to override this here because $.widget sets it no matter what's in // the prototype - $.wikibase.removetoolbar.prototype.widgetBaseClass = 'wb-removetoolbar'; + $.wikibase.removetoolbar.prototype.widgetFullName = 'wb-removetoolbar'; }( mediaWiki, jQuery ) ); diff --git a/lib/resources/jquery.wikibase/toolbar/toolbar.js b/lib/resources/jquery.wikibase/toolbar/toolbar.js index 9475129..a8b9b53 100644 --- a/lib/resources/jquery.wikibase/toolbar/toolbar.js +++ b/lib/resources/jquery.wikibase/toolbar/toolbar.js @@ -52,7 +52,7 @@ PARENT.prototype._create.call( this ); this.element - .addClass( this.widgetBaseClass ) + .addClass( this.widgetFullName ) .data( 'wikibase-toolbaritem', this ); this._items = []; @@ -71,7 +71,7 @@ } this.element - .removeClass( this.widgetBaseClass ) + .removeClass( this.widgetFullName ) .removeData( 'wikibase-toolbaritem' ) .empty(); diff --git a/lib/resources/jquery.wikibase/toolbar/toolbarbase.js b/lib/resources/jquery.wikibase/toolbar/toolbarbase.js index aad61fa..6be6971 100644 --- a/lib/resources/jquery.wikibase/toolbar/toolbarbase.js +++ b/lib/resources/jquery.wikibase/toolbar/toolbarbase.js @@ -39,9 +39,9 @@ * @see jQuery.Widget._create */ _create: function() { - var $toolbarDom = this.element.children( '.' + this.widgetBaseClass ); + var $toolbarDom = this.element.children( '.' + this.widgetFullName ); if( $toolbarDom.length === 0 ) { - $toolbarDom = mw.template( 'wikibase-toolbar', this.widgetBaseClass, '' ); + $toolbarDom = mw.template( 'wikibase-toolbar', this.widgetFullName, '' ); $toolbarDom.appendTo( this.option( '$container' ) || this.element ); } this.$toolbarParent = $toolbarDom; diff --git a/lib/resources/jquery.wikibase/toolbar/toolbarbutton.js b/lib/resources/jquery.wikibase/toolbar/toolbarbutton.js index 7203b00..bd4fd64 100644 --- a/lib/resources/jquery.wikibase/toolbar/toolbarbutton.js +++ b/lib/resources/jquery.wikibase/toolbar/toolbarbutton.js @@ -24,7 +24,7 @@ _create: function() { PARENT.prototype._create.call( this ); - this.element.addClass( this.widgetBaseClass ); + this.element.addClass( this.widgetFullName ); this._attachEventHandlers(); }, diff --git a/lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js b/lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js index f851861..69e6357 100644 --- a/lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js +++ b/lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js @@ -235,8 +235,8 @@ this.addElement( this.$tooltipAnchor, 1 ); // Insert tooltip after interaction links. this.element - .removeClass( this.widgetBaseClass + '-innoneditmode' ) - .addClass( this.widgetBaseClass + '-ineditmode' ); + .removeClass( this.widgetFullName + '-innoneditmode' ) + .addClass( this.widgetFullName + '-ineditmode' ); this.draw(); }, @@ -265,8 +265,8 @@ this.innerGroup.addElement( this.getButton( 'edit' ) ); this.element - .removeClass( this.widgetBaseClass + '-ineditmode' ) - .addClass( this.widgetBaseClass + '-innoneditmode' ); + .removeClass( this.widgetFullName + '-ineditmode' ) + .addClass( this.widgetFullName + '-innoneditmode' ); this.draw(); }, @@ -299,7 +299,7 @@ buttonCharacteristics.href ) .toolbarbutton() - .addClass( this.widgetBaseClass + '-' + buttonCharacteristics.cssClassExt ); + .addClass( this.widgetFullName + '-' + buttonCharacteristics.cssClassExt ); if( buttonCharacteristics.disabled ) { this._buttons[buttonName].data( 'toolbarbutton' ).disable(); diff --git a/lib/resources/jquery.wikibase/toolbar/toolbarlabel.js b/lib/resources/jquery.wikibase/toolbar/toolbarlabel.js index 9937923..1cfe3dc 100644 --- a/lib/resources/jquery.wikibase/toolbar/toolbarlabel.js +++ b/lib/resources/jquery.wikibase/toolbar/toolbarlabel.js @@ -23,7 +23,7 @@ PARENT.prototype._create.call( this ); this.element - .addClass( this.widgetBaseClass ) + .addClass( this.widgetFullName ) .data( 'wikibase-toolbaritem', this ); }, -- To view, visit https://gerrit.wikimedia.org/r/164064 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8247d2bb6c0f4554b2c9feaf643fef860e1bf72a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang <adrian.l...@wikimedia.de> Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
