jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339473 )
Change subject: demos: Extract CapsuleNumberPopupMultiselectWidget from the demo code ...................................................................... demos: Extract CapsuleNumberPopupMultiselectWidget from the demo code Bug: T158592 Change-Id: If6a2229ca9ffa1b67a9b705c2b08562f6afad281 --- A demos/classes/CapsuleNumberPopupMultiselectWidget.js M demos/index.html M demos/pages/widgets.js 3 files changed, 26 insertions(+), 19 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/demos/classes/CapsuleNumberPopupMultiselectWidget.js b/demos/classes/CapsuleNumberPopupMultiselectWidget.js new file mode 100644 index 0000000..ca8a533 --- /dev/null +++ b/demos/classes/CapsuleNumberPopupMultiselectWidget.js @@ -0,0 +1,24 @@ +Demo.CapsuleNumberPopupMultiselectWidget = function DemoCapsuleNumberPopupMultiselectWidget( config ) { + // Properties + this.capsulePopupWidget = new OO.ui.NumberInputWidget( { + isInteger: true + } ); + + // Parent constructor + Demo.CapsuleNumberPopupMultiselectWidget.parent.call( this, $.extend( {}, config, { + allowArbitrary: true, + popup: { $content: this.capsulePopupWidget.$element } + } ) ); + + // Events + this.capsulePopupWidget.connect( this, { enter: 'onPopupEnter' } ); +}; + +OO.inheritClass( Demo.CapsuleNumberPopupMultiselectWidget, OO.ui.CapsuleMultiselectWidget ); + +Demo.CapsuleNumberPopupMultiselectWidget.prototype.onPopupEnter = function () { + if ( !isNaN( this.capsulePopupWidget.getNumericValue() ) ) { + this.addItemsFromData( [ this.capsulePopupWidget.getNumericValue() ] ); + this.capsulePopupWidget.setValue( '' ); + } +}; diff --git a/demos/index.html b/demos/index.html index 567f606..f5bd319 100644 --- a/demos/index.html +++ b/demos/index.html @@ -16,6 +16,7 @@ <script src="dist/oojs-ui-mediawiki.js"></script> <script src="demo.js"></script> <script src="classes/ButtonStyleShowcaseWidget.js"></script> + <script src="classes/CapsuleNumberPopupMultiselectWidget.js"></script> <script src="pages/dialogs.js"></script> <script src="pages/icons.js"></script> <script src="pages/widgets.js"></script> diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js index 56ebbdf..2ecec45 100644 --- a/demos/pages/widgets.js +++ b/demos/pages/widgets.js @@ -2,7 +2,6 @@ var i, fieldsets, loremIpsum = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, ' + 'sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\u200E', - capsuleWithPopup, capsulePopupWidget, textInputForLabel, labelForTextInput, horizontalDragItems = [], verticalDragItems = [], @@ -169,23 +168,6 @@ UnsupportedSelectFileWidget.static.isSupported = function () { return false; }; - - capsulePopupWidget = new OO.ui.NumberInputWidget( { - isInteger: true - } ); - capsulePopupWidget.connect( capsulePopupWidget, { - enter: function () { - if ( !isNaN( this.getNumericValue() ) ) { - capsuleWithPopup.addItemsFromData( [ this.getNumericValue() ] ); - this.setValue( '' ); - } - return false; - } - } ); - capsuleWithPopup = new OO.ui.CapsuleMultiselectWidget( { - allowArbitrary: true, - popup: { $content: capsulePopupWidget.$element } - } ); textInputForLabel = new OO.ui.TextInputWidget( { value: 'Input for label above' } ); labelForTextInput = new OO.ui.LabelWidget( { @@ -1527,7 +1509,7 @@ } ), new OO.ui.FieldLayout( - capsuleWithPopup, + new Demo.CapsuleNumberPopupMultiselectWidget(), { label: 'CapsuleMultiselectWidget with NumberInputWidget popup\u200E', align: 'top' -- To view, visit https://gerrit.wikimedia.org/r/339473 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If6a2229ca9ffa1b67a9b705c2b08562f6afad281 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Bartosz DziewoĆski <matma....@gmail.com> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits