Merge "jquery.textSelection: Rewrite 'scrollToCaretPosition'"

[lhc/web/wiklou.git] / resources / src / mediawiki.special / mediawiki.special.apisandbox.js

diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
index 35d82b2..0df51f4 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
+++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
@@ -121,9 +121,9 @@
                        }
                },
 
-               capsuleWidget: {
+               tagWidget: {
                        getApiValue: function () {
-                               var items = this.getItemsData();
+                               var items = this.getValue();
                                if ( items.join( '' ).indexOf( '|' ) === -1 ) {
                                        return items.join( '|' );
                                } else {
@@ -132,13 +132,13 @@
                        },
                        setApiValue: function ( v ) {
                                if ( v === undefined || v === '' || v === '\x1f' ) {
-                                       this.setItemsFromData( [] );
+                                       this.setValue( [] );
                                } else {
                                        v = String( v );
                                        if ( v.indexOf( '\x1f' ) !== 0 ) {
-                                               this.setItemsFromData( v.split( '|' ) );
+                                               this.setValue( v.split( '|' ) );
                                        } else {
-                                               this.setItemsFromData( v.substr( 1 ).split( '\x1f' ) );
+                                               this.setValue( v.substr( 1 ).split( '\x1f' ) );
                                        }
                                }
                        },
@@ -149,8 +149,8 @@
                                if ( !suppressErrors ) {
                                        ok = this.getApiValue() !== undefined && !(
                                                pi.allspecifier !== undefined &&
-                                               this.getItemsData().length > 1 &&
-                                               this.getItemsData().indexOf( pi.allspecifier ) !== -1
+                                               this.getValue().length > 1 &&
+                                               this.getValue().indexOf( pi.allspecifier ) !== -1
                                        );
                                }
 
@@ -158,8 +158,8 @@
                                this.setIconTitle( ok ? '' : mw.message( 'apisandbox-alert-field' ).plain() );
                                return $.Deferred().resolve( ok ).promise();
                        },
-                       createItemWidget: function ( data, label ) {
-                               var item = OO.ui.CapsuleMultiselectWidget.prototype.createItemWidget.call( this, data, label );
+                       createTagItemWidget: function ( data, label ) {
+                               var item = OO.ui.TagMultiselectWidget.prototype.createTagItemWidget.call( this, data, label );
                                if ( this.paramInfo.deprecatedvalues &&
                                        this.paramInfo.deprecatedvalues.indexOf( data ) >= 0
                                ) {
@@ -336,13 +336,13 @@
                                case 'string':
                                case 'user':
                                        if ( Util.apiBool( pi.multi ) ) {
-                                               widget = new OO.ui.CapsuleMultiselectWidget( {
+                                               widget = new OO.ui.TagMultiselectWidget( {
                                                        allowArbitrary: true,
                                                        allowDuplicates: Util.apiBool( pi.allowsduplicates ),
-                                                       $overlay: $( '#mw-apisandbox-ui' )
+                                                       $overlay: true
                                                } );
                                                widget.paramInfo = pi;
-                                               $.extend( widget, WidgetMethods.capsuleWidget );
+                                               $.extend( widget, WidgetMethods.tagWidget );
                                        } else {
                                                widget = new OO.ui.TextInputWidget( {
                                                        required: Util.apiBool( pi.required )
@@ -457,16 +457,16 @@
                                                        } ) );
                                                }
 
-                                               widget = new OO.ui.CapsuleMultiselectWidget( {
+                                               widget = new OO.ui.MenuTagMultiselectWidget( {
                                                        menu: { items: items },
-                                                       $overlay: $( '#mw-apisandbox-ui' )
+                                                       $overlay: true
                                                } );
                                                widget.paramInfo = pi;
-                                               $.extend( widget, WidgetMethods.capsuleWidget );
+                                               $.extend( widget, WidgetMethods.tagWidget );
                                        } else {
                                                widget = new OO.ui.DropdownWidget( {
                                                        menu: { items: items },
-                                                       $overlay: $( '#mw-apisandbox-ui' )
+                                                       $overlay: true
                                                } );
                                                widget.paramInfo = pi;
                                                $.extend( widget, WidgetMethods.dropdownWidget );
@@ -497,12 +497,12 @@
                                                        } ) );
                                                }
 
-                                               widget = new OO.ui.CapsuleMultiselectWidget( {
+                                               widget = new OO.ui.MenuTagMultiselectWidget( {
                                                        menu: { items: items },
-                                                       $overlay: $( '#mw-apisandbox-ui' )
+                                                       $overlay: true
                                                } );
                                                widget.paramInfo = pi;
-                                               $.extend( widget, WidgetMethods.capsuleWidget );
+                                               $.extend( widget, WidgetMethods.tagWidget );
                                                if ( Util.apiBool( pi.submodules ) ) {
                                                        widget.getSubmodules = WidgetMethods.submoduleWidget.multi;
                                                        widget.on( 'change', ApiSandbox.updateUI );
@@ -510,7 +510,7 @@
                                        } else {
                                                widget = new OO.ui.DropdownWidget( {
                                                        menu: { items: items },
-                                                       $overlay: $( '#mw-apisandbox-ui' )
+                                                       $overlay: true
                                                } );
                                                widget.paramInfo = pi;
                                                $.extend( widget, WidgetMethods.dropdownWidget );
@@ -551,23 +551,23 @@
                                                throw new Error( 'Unknown multiMode "' + multiMode + '"' );
                                }
 
-                               widget = new OO.ui.CapsuleMultiselectWidget( {
+                               widget = new OO.ui.PopupTagMultiselectWidget( {
                                        allowArbitrary: true,
                                        allowDuplicates: Util.apiBool( pi.allowsduplicates ),
-                                       $overlay: $( '#mw-apisandbox-ui' ),
+                                       $overlay: true,
                                        popup: {
                                                classes: [ 'mw-apisandbox-popup' ],
                                                $content: $content
                                        }
                                } );
                                widget.paramInfo = pi;
-                               $.extend( widget, WidgetMethods.capsuleWidget );
+                               $.extend( widget, WidgetMethods.tagWidget );
 
                                func = function () {
                                        if ( !innerWidget.isDisabled() ) {
                                                innerWidget.apiCheckValid().done( function ( ok ) {
                                                        if ( ok ) {
-                                                               widget.addItemsFromData( [ innerWidget.getApiValue() ] );
+                                                               widget.addTag( innerWidget.getApiValue() );
                                                                innerWidget.setApiValue( undefined );
                                                        }
                                                } );
@@ -817,7 +817,7 @@
                        if ( ApiSandbox.isFullscreen ) {
                                fullscreenButton.setLabel( mw.message( 'apisandbox-unfullscreen' ).text() );
                                fullscreenButton.setTitle( mw.message( 'apisandbox-unfullscreen-tooltip' ).text() );
-                               $body.append( $ui );
+                               OO.ui.getDefaultOverlay().prepend( $ui );
                        } else {
                                fullscreenButton.setLabel( mw.message( 'apisandbox-fullscreen' ).text() );
                                fullscreenButton.setTitle( mw.message( 'apisandbox-fullscreen-tooltip' ).text() );
@@ -1051,7 +1051,7 @@
                                if ( !formatDropdown ) {
                                        formatDropdown = new OO.ui.DropdownWidget( {
                                                menu: { items: [] },
-                                               $overlay: $( '#mw-apisandbox-ui' )
+                                               $overlay: true
                                        } );
                                        formatDropdown.getMenu().on( 'select', Util.onFormatDropdownChange );
                                }
@@ -1176,7 +1176,7 @@
                                                                                booklet.setPage( '|results|' );
                                                                        } ).setDisabled( !paramsAreForced ) ).$element,
                                                                        new OO.ui.PopupButtonWidget( {
-                                                                               $overlay: $( '#mw-apisandbox-ui' ),
+                                                                               $overlay: true,
                                                                                framed: false,
                                                                                icon: 'info',
                                                                                popup: {
@@ -1445,7 +1445,7 @@
 
                                if ( pi.helpurls.length ) {
                                        buttons.push( new OO.ui.PopupButtonWidget( {
-                                               $overlay: $( '#mw-apisandbox-ui' ),
+                                               $overlay: true,
                                                label: mw.message( 'apisandbox-helpurls' ).text(),
                                                icon: 'help',
                                                popup: {
@@ -1463,7 +1463,7 @@
 
                                if ( pi.examples.length ) {
                                        buttons.push( new OO.ui.PopupButtonWidget( {
-                                               $overlay: $( '#mw-apisandbox-ui' ),
+                                               $overlay: true,
                                                label: mw.message( 'apisandbox-examples' ).text(),
                                                icon: 'code',
                                                popup: {
@@ -1577,10 +1577,10 @@
                                                }
                                                if ( Util.apiBool( pi.parameters[ i ].multi ) ) {
                                                        tmp = [];
-                                                       if ( flag && !( widget instanceof OO.ui.CapsuleMultiselectWidget ) &&
+                                                       if ( flag && !( widget instanceof OO.ui.TagMultiselectWidget ) &&
                                                                !(
                                                                        widget instanceof OptionalWidget &&
-                                                                       widget.widget instanceof OO.ui.CapsuleMultiselectWidget
+                                                                       widget.widget instanceof OO.ui.TagMultiselectWidget
                                                                )
                                                        ) {
                                                                tmp.push( mw.message( 'api-help-param-multi-separate' ).parse() );
@@ -1844,8 +1844,8 @@
                config = config || {};
 
                this.widget = widget;
-               this.$overlay = config.$overlay ||
-                       $( '<div>' ).addClass( 'mw-apisandbox-optionalWidget-overlay' );
+               this.$cover = config.$cover ||
+                       $( '<div>' ).addClass( 'mw-apisandbox-optionalWidget-cover' );
                this.checkbox = new OO.ui.CheckboxInputWidget( config.checkbox )
                        .on( 'change', this.onCheckboxChange, [], this );
 
@@ -1858,12 +1858,12 @@
                        }
                }
 
-               this.$overlay.on( 'click', this.onOverlayClick.bind( this ) );
+               this.$cover.on( 'click', this.onOverlayClick.bind( this ) );
 
                this.$element
                        .addClass( 'mw-apisandbox-optionalWidget' )
                        .append(
-                               this.$overlay,
+                               this.$cover,
                                $( '<div>' ).addClass( 'mw-apisandbox-optionalWidget-fields' ).append(
                                        $( '<div>' ).addClass( 'mw-apisandbox-optionalWidget-widget' ).append(
                                                widget.$element
@@ -1890,7 +1890,7 @@
                OptionalWidget[ 'super' ].prototype.setDisabled.call( this, disabled );
                this.widget.setDisabled( this.isDisabled() );
                this.checkbox.setSelected( !this.isDisabled() );
-               this.$overlay.toggle( this.isDisabled() );
+               this.$cover.toggle( this.isDisabled() );
                return this;
        };