Merge "Use Devanagari digits for list items on mai.wikipedia"

diff --git a/includes/db/CloneDatabase.php b/includes/db/CloneDatabase.php
index 809b660..6d18444 100644 (file)
--- a/includes/db/CloneDatabase.php
+++ b/includes/db/CloneDatabase.php
@@ -93,8 +93,10 @@ class CloneDatabase {
                        self::changePrefix( $this->newTablePrefix );
                        $newTableName = $this->db->tableName( $tbl, 'raw' );
 
+                       // Postgres: Temp tables are automatically deleted upon end of session
+                       //           Same Temp table name hides existing table for current session
                        if ( $this->dropCurrentTables
-                               && !in_array( $this->db->getType(), [ 'postgres', 'oracle' ] )
+                               && !in_array( $this->db->getType(), [ 'oracle' ] )
                        ) {
                                if ( $oldTableName === $newTableName ) {
                                        // Last ditch check to avoid data loss

diff --git a/includes/user/User.php b/includes/user/User.php
index 52c14f7..a1119fa 100644 (file)
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -4957,7 +4957,8 @@ class User implements IDBAccessObject {
                }
                $title = UserGroupMembership::getGroupPage( $group );
                if ( $title ) {
-                       return Linker::link( $title, htmlspecialchars( $text ) );
+                       return MediaWikiServices::getInstance()
+                               ->getLinkRenderer()->makeLink( $title, $text );
                } else {
                        return htmlspecialchars( $text );
                }

diff --git a/resources/Resources.php b/resources/Resources.php
index 66ea2a9..dc05387 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1418,6 +1418,7 @@ return [
                        'jquery.accessKeyLabel',
                        'jquery.textSelection',
                        'jquery.byteLimit',
+                       'mediawiki.widgets.visibleByteLimit',
                        'mediawiki.api',
                ],
        ],
@@ -2013,7 +2014,7 @@ return [
        'mediawiki.special.movePage' => [
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.movePage.js',
                'dependencies' => [
-                       'jquery.byteLimit',
+                       'mediawiki.widgets.visibleByteLimit',
                        'mediawiki.widgets',
                ],
        ],
@@ -2373,6 +2374,16 @@ return [
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
+       'mediawiki.widgets.visibleByteLimit' => [
+               'scripts' => [
+                       'resources/src/mediawiki.widgets.visibleByteLimit/mediawiki.widgets.visibleByteLimit.js'
+               ],
+               'dependencies' => [
+                       'oojs-ui-core',
+                       'jquery.byteLimit'
+               ],
+               'targets' => [ 'desktop', 'mobile' ]
+       ],
        'mediawiki.widgets.datetime' => [
                'scripts' => [
                        'resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.js',

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.js b/resources/src/mediawiki.action/mediawiki.action.edit.js
index 8cde703..5b81017 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.js
@@ -27,18 +27,10 @@
                                // TODO: This should be an OOjs UI feature, or somehow happen automatically after infusing.
                                wpSummary.$input.updateTooltipAccessKeys();
 
-                               // Make sure edit summary does not exceed byte limit
-                               wpSummary.$input.byteLimit( 255 );
-
                                // Show a byte-counter to users with how many bytes are left for their edit summary.
                                // TODO: This looks a bit weird, as there is no unit in the UI, just numbers; showing
                                // 'bytes' confused users in testing, and showing 'chars' would be a lie. See T42035.
-                               function updateSummaryLabelCount() {
-                                       wpSummary.setLabel( String( 255 - $.byteLength( wpSummary.getValue() ) ) );
-                               }
-                               wpSummary.on( 'change', updateSummaryLabelCount );
-                               // Initialise value
-                               updateSummaryLabelCount();
+                               mw.widgets.visibleByteLimit( wpSummary, 255 );
                        } );
                } else {
                        // Make sure edit summary does not exceed byte limit

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js
index 1a68b49..fc0f302 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js
@@ -71,8 +71,7 @@
 
                // Events
                this.popup.connect( this, {
-                       ready: 'onPopupReady',
-                       toggle: 'onPopupToggle'
+                       ready: 'onPopupReady'
                } );
                this.input.connect( this, { enter: 'onInputEnter' } );
                this.input.$input.on( {

diff --git a/resources/src/mediawiki.special/mediawiki.special.movePage.js b/resources/src/mediawiki.special/mediawiki.special.movePage.js
index bce512c..2e980ac 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.movePage.js
+++ b/resources/src/mediawiki.special/mediawiki.special.movePage.js
@@ -1,13 +1,15 @@
 /*!
  * JavaScript for Special:MovePage
  */
-jQuery( function ( $ ) {
-       // Infuse for pretty dropdown
-       OO.ui.infuse( 'wpNewTitle' );
-       // Limit to 255 bytes, not characters
-       OO.ui.infuse( 'wpReason' ).$input.byteLimit();
-       // Infuse for nicer "help" popup
-       if ( $( '#wpMovetalk-field' ).length ) {
-               OO.ui.infuse( 'wpMovetalk-field' );
-       }
-} );
+( function ( mw, $ ) {
+       $( function () {
+               // Infuse for pretty dropdown
+               OO.ui.infuse( $( '#wpNewTitle' ) );
+               // Limit to bytes, not characters
+               mw.widgets.visibleByteLimit( OO.ui.infuse( $( '#wpReason' ) ) );
+               // Infuse for nicer "help" popup
+               if ( $( '#wpMovetalk-field' ).length ) {
+                       OO.ui.infuse( $( '#wpMovetalk-field' ) );
+               }
+       } );
+}( mediaWiki, jQuery ) );

diff --git a/resources/src/mediawiki.widgets.visibleByteLimit/mediawiki.widgets.visibleByteLimit.js b/resources/src/mediawiki.widgets.visibleByteLimit/mediawiki.widgets.visibleByteLimit.js
new file mode 100644 (file)
index 0000000..5678a80
--- /dev/null
+++ b/resources/src/mediawiki.widgets.visibleByteLimit/mediawiki.widgets.visibleByteLimit.js
@@ -0,0 +1,21 @@
+/**
+ * Add a visible byte limit label to a TextInputWidget
+ *
+ * Uses jQuery.byteLimit to enforce the limit.
+
+ * @param {OO.ui.TextInputWidget} textInputWidget Text input widget
+ * @param {number} [limit] Byte limit, defaults to $input's maxlength
+ */
+mediaWiki.widgets.visibleByteLimit = function ( textInputWidget, limit ) {
+       limit = limit || +textInputWidget.$input.attr( 'maxlength' );
+
+       function updateCount() {
+               textInputWidget.setLabel( ( limit - $.byteLength( textInputWidget.getValue() ) ).toString() );
+       }
+       textInputWidget.on( 'change', updateCount );
+       // Initialise value
+       updateCount();
+
+       // Actually enforce limit
+       textInputWidget.$input.byteLimit( limit );
+};