mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-11-15 18:39:52 +00:00
Merge "Set sort keys on click-out too"
This commit is contained in:
commit
75d36e5b32
|
@ -23,6 +23,8 @@ ve.ui.MWCategoryPopupWidget = function VeUiMwCategoryPopupWidget ( config ) {
|
||||||
|
|
||||||
// Properties
|
// Properties
|
||||||
this.category = null;
|
this.category = null;
|
||||||
|
this.origSortkey = null;
|
||||||
|
this.removed = false;
|
||||||
this.$title = this.$$( '<label>' );
|
this.$title = this.$$( '<label>' );
|
||||||
this.$menu = this.$$( '<div>' );
|
this.$menu = this.$$( '<div>' );
|
||||||
this.removeButton = new ve.ui.IconButtonWidget( {
|
this.removeButton = new ve.ui.IconButtonWidget( {
|
||||||
|
@ -36,6 +38,7 @@ ve.ui.MWCategoryPopupWidget = function VeUiMwCategoryPopupWidget ( config ) {
|
||||||
.append( this.sortKeyLabel.$, this.sortKeyInput.$ );
|
.append( this.sortKeyLabel.$, this.sortKeyInput.$ );
|
||||||
|
|
||||||
// Events
|
// Events
|
||||||
|
this.connect( this, { 'hide': 'onHide' } );
|
||||||
this.removeButton.connect( this, { 'click': 'onRemoveCategory' } );
|
this.removeButton.connect( this, { 'click': 'onRemoveCategory' } );
|
||||||
this.$sortKeyForm.on( 'submit', ve.bind( this.onSortKeySubmit, this ) );
|
this.$sortKeyForm.on( 'submit', ve.bind( this.onSortKeySubmit, this ) );
|
||||||
|
|
||||||
|
@ -84,6 +87,7 @@ ve.inheritClass( ve.ui.MWCategoryPopupWidget, ve.ui.PopupWidget );
|
||||||
* @emits removeCategory
|
* @emits removeCategory
|
||||||
*/
|
*/
|
||||||
ve.ui.MWCategoryPopupWidget.prototype.onRemoveCategory = function () {
|
ve.ui.MWCategoryPopupWidget.prototype.onRemoveCategory = function () {
|
||||||
|
this.removed = true;
|
||||||
this.emit( 'removeCategory', this.category );
|
this.emit( 'removeCategory', this.category );
|
||||||
this.closePopup();
|
this.closePopup();
|
||||||
};
|
};
|
||||||
|
@ -96,7 +100,6 @@ ve.ui.MWCategoryPopupWidget.prototype.onRemoveCategory = function () {
|
||||||
* @emits updateSortkey
|
* @emits updateSortkey
|
||||||
*/
|
*/
|
||||||
ve.ui.MWCategoryPopupWidget.prototype.onSortKeySubmit = function () {
|
ve.ui.MWCategoryPopupWidget.prototype.onSortKeySubmit = function () {
|
||||||
this.emit( 'updateSortkey', this.category, this.sortKeyInput.$input.val() );
|
|
||||||
this.closePopup();
|
this.closePopup();
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
@ -122,6 +125,7 @@ ve.ui.MWCategoryPopupWidget.prototype.openPopup = function ( item ) {
|
||||||
* @param {ve.ui.MWCategoryItemWidget} item Category item
|
* @param {ve.ui.MWCategoryItemWidget} item Category item
|
||||||
*/
|
*/
|
||||||
ve.ui.MWCategoryPopupWidget.prototype.loadCategoryIntoPopup = function ( item ) {
|
ve.ui.MWCategoryPopupWidget.prototype.loadCategoryIntoPopup = function ( item ) {
|
||||||
|
this.origSortkey = item.sortkey;
|
||||||
this.sortKeyInput.$input.val( item.sortKey );
|
this.sortKeyInput.$input.val( item.sortKey );
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -160,3 +164,10 @@ ve.ui.MWCategoryPopupWidget.prototype.setPopup = function ( item ) {
|
||||||
this.$.css( { 'left': left, 'top': top } );
|
this.$.css( { 'left': left, 'top': top } );
|
||||||
this.display( left, top, width, height );
|
this.display( left, top, width, height );
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ve.ui.MWCategoryPopupWidget.prototype.onHide = function() {
|
||||||
|
var newSortkey = this.sortKeyInput.$input.val();
|
||||||
|
if ( !this.removed && newSortkey !== this.origSortkey ) {
|
||||||
|
this.emit( 'updateSortkey', this.category, this.sortKeyInput.$input.val() );
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
Loading…
Reference in a new issue