From 777336288bc807a4e8ec1a391c00ff470f7849b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Thu, 8 Feb 2018 22:22:34 +0100 Subject: [PATCH] =?utf8?q?Rename=20jquery.byteLimit=E2=86=92lengthLimit,?= =?utf8?q?=20mediawiki.widgets.visibleByteLimit=E2=86=92visibleLengthLimit?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In change Ia1269fd898dabbcf1582618eab46cef97e10a3b1 I want to add functions that deal with codepoints instead of bytes to these modules, after which the names wouldn't make sense. Doing this in a separate commit to make the diffs clearer. Change-Id: Ia554eb2265248e72b04fce69a662a9db1a5f1275 --- jsduck.json | 4 +-- resources/Resources.php | 26 +++++++++++++------ ...ery.byteLimit.js => jquery.lengthLimit.js} | 20 +++++++------- .../mediawiki.widgets.visibleLengthLimit.js} | 0 tests/qunit/QUnitTestResources.php | 4 +-- ...mit.test.js => jquery.lengthLimit.test.js} | 2 +- 6 files changed, 33 insertions(+), 23 deletions(-) rename resources/src/jquery/{jquery.byteLimit.js => jquery.lengthLimit.js} (96%) rename resources/src/{mediawiki.widgets.visibleByteLimit/mediawiki.widgets.visibleByteLimit.js => mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js} (100%) rename tests/qunit/suites/resources/jquery/{jquery.byteLimit.test.js => jquery.lengthLimit.test.js} (99%) diff --git a/jsduck.json b/jsduck.json index 6966832c95..6fb4544290 100644 --- a/jsduck.json +++ b/jsduck.json @@ -20,16 +20,16 @@ "resources/src/mediawiki.special", "resources/src/mediawiki.toolbar", "resources/src/mediawiki.widgets", - "resources/src/mediawiki.widgets.visibleByteLimit", + "resources/src/mediawiki.widgets.visibleLengthLimit", "resources/src/jquery/jquery.accessKeyLabel.js", "resources/src/jquery/jquery.byteLength.js", - "resources/src/jquery/jquery.byteLimit.js", "resources/src/jquery/jquery.checkboxShiftClick.js", "resources/src/jquery/jquery.colorUtil.js", "resources/src/jquery/jquery.confirmable.js", "resources/src/jquery/jquery.footHovzer.js", "resources/src/jquery/jquery.getAttrs.js", "resources/src/jquery/jquery.hidpi.js", + "resources/src/jquery/jquery.lengthLimit.js", "resources/src/jquery/jquery.localize.js", "resources/src/jquery/jquery.makeCollapsible.js", "resources/src/jquery/jquery.spinner.js", diff --git a/resources/Resources.php b/resources/Resources.php index f5f17e04fd..bf31024977 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -161,8 +161,8 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'jquery.byteLimit' => [ - 'scripts' => 'resources/src/jquery/jquery.byteLimit.js', - 'dependencies' => 'mediawiki.String', + 'dependencies' => 'jquery.lengthLimit', + 'deprecated' => 'Use "jquery.lengthLimit" instead.', 'targets' => [ 'desktop', 'mobile' ], ], 'jquery.checkboxShiftClick' => [ @@ -268,6 +268,11 @@ return [ ], 'targets' => [ 'desktop', 'mobile' ], ], + 'jquery.lengthLimit' => [ + 'scripts' => 'resources/src/jquery/jquery.lengthLimit.js', + 'dependencies' => 'mediawiki.String', + 'targets' => [ 'desktop', 'mobile' ], + ], 'jquery.localize' => [ 'scripts' => 'resources/src/jquery/jquery.localize.js', ], @@ -1065,7 +1070,7 @@ return [ ], 'dependencies' => [ 'mediawiki.RegExp', - 'jquery.byteLimit', + 'jquery.lengthLimit', ], 'messages' => [ 'htmlform-chosen-placeholder', @@ -1427,7 +1432,7 @@ return [ 'mediawiki.editfont.styles', 'jquery.textSelection', 'oojs-ui-core', - 'mediawiki.widgets.visibleByteLimit', + 'mediawiki.widgets.visibleLengthLimit', 'mediawiki.api', ], ], @@ -2101,7 +2106,7 @@ return [ 'mediawiki.special.movePage' => [ 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.movePage.js', 'dependencies' => [ - 'mediawiki.widgets.visibleByteLimit', + 'mediawiki.widgets.visibleLengthLimit', 'mediawiki.widgets', ], ], @@ -2315,7 +2320,7 @@ return [ ], 'mediawiki.legacy.protect' => [ 'scripts' => 'resources/src/mediawiki.legacy/protect.js', - 'dependencies' => 'jquery.byteLimit', + 'dependencies' => 'jquery.lengthLimit', 'messages' => [ 'protect-unchain-permissions' ] ], // Used in the web installer. Test it after modifying this definition! @@ -2481,12 +2486,17 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.widgets.visibleByteLimit' => [ + 'dependencies' => 'mediawiki.widgets.visibleLengthLimit', + 'deprecated' => 'Use "mediawiki.widgets.visibleLengthLimit" instead.', + 'targets' => [ 'desktop', 'mobile' ] + ], + 'mediawiki.widgets.visibleLengthLimit' => [ 'scripts' => [ - 'resources/src/mediawiki.widgets.visibleByteLimit/mediawiki.widgets.visibleByteLimit.js' + 'resources/src/mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js' ], 'dependencies' => [ 'oojs-ui-core', - 'jquery.byteLimit', + 'jquery.lengthLimit', 'mediawiki.String', ], 'targets' => [ 'desktop', 'mobile' ] diff --git a/resources/src/jquery/jquery.byteLimit.js b/resources/src/jquery/jquery.lengthLimit.js similarity index 96% rename from resources/src/jquery/jquery.byteLimit.js rename to resources/src/jquery/jquery.lengthLimit.js index eb21846935..00ed7d3edb 100644 --- a/resources/src/jquery/jquery.byteLimit.js +++ b/resources/src/jquery/jquery.lengthLimit.js @@ -1,18 +1,18 @@ /** - * @class jQuery.plugin.byteLimit + * @class jQuery.plugin.lengthLimit */ ( function ( $, mw ) { var eventKeys = [ - 'keyup.byteLimit', - 'keydown.byteLimit', - 'change.byteLimit', - 'mouseup.byteLimit', - 'cut.byteLimit', - 'paste.byteLimit', - 'focus.byteLimit', - 'blur.byteLimit' + 'keyup.lengthLimit', + 'keydown.lengthLimit', + 'change.lengthLimit', + 'mouseup.lengthLimit', + 'cut.lengthLimit', + 'paste.lengthLimit', + 'focus.lengthLimit', + 'blur.lengthLimit' ].join( ' ' ), trimByteLength = require( 'mediawiki.String' ).trimByteLength; @@ -166,6 +166,6 @@ /** * @class jQuery - * @mixins jQuery.plugin.byteLimit + * @mixins jQuery.plugin.lengthLimit */ }( jQuery, mediaWiki ) ); diff --git a/resources/src/mediawiki.widgets.visibleByteLimit/mediawiki.widgets.visibleByteLimit.js b/resources/src/mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js similarity index 100% rename from resources/src/mediawiki.widgets.visibleByteLimit/mediawiki.widgets.visibleByteLimit.js rename to resources/src/mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js diff --git a/tests/qunit/QUnitTestResources.php b/tests/qunit/QUnitTestResources.php index 3372bf01fc..785e11462d 100644 --- a/tests/qunit/QUnitTestResources.php +++ b/tests/qunit/QUnitTestResources.php @@ -45,12 +45,12 @@ return [ 'scripts' => [ 'tests/qunit/suites/resources/startup.test.js', 'tests/qunit/suites/resources/jquery/jquery.accessKeyLabel.test.js', - 'tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js', 'tests/qunit/suites/resources/jquery/jquery.color.test.js', 'tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js', 'tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js', 'tests/qunit/suites/resources/jquery/jquery.hidpi.test.js', 'tests/qunit/suites/resources/jquery/jquery.highlightText.test.js', + 'tests/qunit/suites/resources/jquery/jquery.lengthLimit.test.js', 'tests/qunit/suites/resources/jquery/jquery.localize.test.js', 'tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js', 'tests/qunit/suites/resources/jquery/jquery.tabIndex.test.js', @@ -103,12 +103,12 @@ return [ ], 'dependencies' => [ 'jquery.accessKeyLabel', - 'jquery.byteLimit', 'jquery.color', 'jquery.colorUtil', 'jquery.getAttrs', 'jquery.hidpi', 'jquery.highlightText', + 'jquery.lengthLimit', 'jquery.localize', 'jquery.makeCollapsible', 'jquery.tabIndex', diff --git a/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js b/tests/qunit/suites/resources/jquery/jquery.lengthLimit.test.js similarity index 99% rename from tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js rename to tests/qunit/suites/resources/jquery/jquery.lengthLimit.test.js index d3233da475..7117d1f420 100644 --- a/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.lengthLimit.test.js @@ -1,7 +1,7 @@ ( function ( $, mw ) { var simpleSample, U_20AC, poop, mbSample; - QUnit.module( 'jquery.byteLimit', QUnit.newMwEnvironment() ); + QUnit.module( 'jquery.lengthLimit', QUnit.newMwEnvironment() ); // Simple sample (20 chars, 20 bytes) simpleSample = '12345678901234567890'; -- 2.20.1