wikimedia/mediawiki-extensions-WikiEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/WikiEditor synced 2024-11-14 19:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Move insert-link mode constants to a better location"

Browse source
This commit is contained in:
jenkins-bot 2021-12-09 20:13:04 +00:00 committed by Gerrit Code Review
parent bdb4f1c20a b296fc3578
commit 0fe853a748
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/insertlink/LinkTypeField.js
View file

@ -9,11 +9,9 @@ function LinkTypeField() {
OO.EventEmitter.call( this ); OO.EventEmitter.call( this );
this.radioInt = new OO.ui.RadioOptionWidget( { this.radioInt = new OO.ui.RadioOptionWidget( {
data: 'int',
label: mw.msg( 'wikieditor-toolbar-tool-link-int' ) label: mw.msg( 'wikieditor-toolbar-tool-link-int' )
} ); } );
this.radioExt = new OO.ui.RadioOptionWidget( { this.radioExt = new OO.ui.RadioOptionWidget( {
data: 'ext',
label: mw.msg( 'wikieditor-toolbar-tool-link-ext' ) label: mw.msg( 'wikieditor-toolbar-tool-link-ext' )
} ); } );
var radioSelect = new OO.ui.RadioSelectWidget( { var radioSelect = new OO.ui.RadioSelectWidget( {
@ -36,6 +34,10 @@ function LinkTypeField() {
OO.inheritClass( LinkTypeField, OO.ui.FieldLayout ); OO.inheritClass( LinkTypeField, OO.ui.FieldLayout );
OO.mixinClass( LinkTypeField, OO.EventEmitter ); OO.mixinClass( LinkTypeField, OO.EventEmitter );
LinkTypeField.static.LINK_MODE_INTERNAL = 'internal';
LinkTypeField.static.LINK_MODE_EXTERNAL = 'external';
/** /**
* Select the 'external link' radio. * Select the 'external link' radio.
* *

25
modules/insertlink/TitleInputField.js
View file

@ -1,3 +1,4 @@
var LinkTypeField = require( './LinkTypeField.js' );
var TitleInputWidget = require( './TitleInputWidget.js' ); var TitleInputWidget = require( './TitleInputWidget.js' );
var TitleOptionWidget = require( './TitleOptionWidget.js' ); var TitleOptionWidget = require( './TitleOptionWidget.js' );
@ -20,11 +21,7 @@ function TitleInputField() {
} ); } );
// The URL mode is set by the user via radio buttons, or automatically for link targets that look like URLs. // The URL mode is set by the user via radio buttons, or automatically for link targets that look like URLs.
this.urlModes = { this.urlMode = LinkTypeField.static.LINK_MODE_INTERNAL;
internal: 'internal',
external: 'external'
};
this.urlMode = this.urlModes.internal;
// The 'manual' URL mode flag is set when the user changes the mode, and doesn't change again. // The 'manual' URL mode flag is set when the user changes the mode, and doesn't change again.
this.urlModeManual = false; this.urlModeManual = false;
@ -45,7 +42,7 @@ OO.mixinClass( TitleInputField, OO.EventEmitter );
TitleInputField.prototype.reset = function () { TitleInputField.prototype.reset = function () {
this.getField().setValue( '' ); this.getField().setValue( '' );
this.urlModeManual = false; this.urlModeManual = false;
this.urlMode = this.urlModes.internal; this.urlMode = LinkTypeField.static.LINK_MODE_INTERNAL;
}; };
/** /**
@ -55,9 +52,9 @@ TitleInputField.prototype.reset = function () {
* @param {string} urlMode One of the `TitleInputField.urlModes.*` values. * @param {string} urlMode One of the `TitleInputField.urlModes.*` values.
*/ */
TitleInputField.prototype.setUrlMode = function ( urlMode ) { TitleInputField.prototype.setUrlMode = function ( urlMode ) {
this.urlMode = urlMode === this.urlModes.external ? this.urlMode = urlMode === LinkTypeField.static.LINK_MODE_EXTERNAL ?
this.urlModes.external : LinkTypeField.static.LINK_MODE_EXTERNAL :
this.urlModes.internal; LinkTypeField.static.LINK_MODE_INTERNAL;
this.urlModeManual = true; this.urlModeManual = true;
this.getField().selectFirstMatch(); this.getField().selectFirstMatch();
this.validate( this.getField().getValue() ); this.validate( this.getField().getValue() );
@ -68,7 +65,7 @@ TitleInputField.prototype.setUrlMode = function ( urlMode ) {
* @return {boolean} * @return {boolean}
*/ */
TitleInputField.prototype.isExternal = function () { TitleInputField.prototype.isExternal = function () {
return this.urlMode === this.urlModes.external; return this.urlMode === LinkTypeField.static.LINK_MODE_EXTERNAL;
}; };
/** /**
@ -103,7 +100,7 @@ TitleInputField.prototype.setMessage = function ( icon, message, type ) {
*/ */
TitleInputField.prototype.onChange = function ( value ) { TitleInputField.prototype.onChange = function ( value ) {
if ( !this.urlModeManual && this.getField().looksLikeExternalLink( value ) ) { if ( !this.urlModeManual && this.getField().looksLikeExternalLink( value ) ) {
this.urlMode = this.urlModes.external; this.urlMode = LinkTypeField.static.LINK_MODE_EXTERNAL;
} }
this.validate( value ); this.validate( value );
}; };
@ -115,7 +112,7 @@ TitleInputField.prototype.onChange = function ( value ) {
* @param {string} value * @param {string} value
*/ */
TitleInputField.prototype.validate = function ( value ) { TitleInputField.prototype.validate = function ( value ) {
if ( this.urlMode === this.urlModes.internal && value !== '' && !mw.Title.newFromText( value ) ) { if ( this.urlMode === LinkTypeField.static.LINK_MODE_INTERNAL && value !== '' && !mw.Title.newFromText( value ) ) {
this.setMessage( 'error', mw.message( 'wikieditor-toolbar-tool-link-int-target-status-invalid' ).parse(), 'error' ); this.setMessage( 'error', mw.message( 'wikieditor-toolbar-tool-link-int-target-status-invalid' ).parse(), 'error' );
this.emit( 'invalid' ); this.emit( 'invalid' );
} else { } else {
@ -129,7 +126,9 @@ TitleInputField.prototype.validate = function ( value ) {
* @param {TitleOptionWidget} item * @param {TitleOptionWidget} item
*/ */
TitleInputField.prototype.onSelect = function ( item ) { TitleInputField.prototype.onSelect = function ( item ) {
if ( this.urlMode === this.urlModes.external || ( !this.urlModeManual && this.urlMode === this.urlModes.internal && item.isExternal() ) ) { if ( this.urlMode === LinkTypeField.static.LINK_MODE_EXTERNAL ||
( !this.urlModeManual && this.urlMode === LinkTypeField.static.LINK_MODE_INTERNAL && item.isExternal() )
) {
this.setMessage( 'linkExternal', mw.message( 'wikieditor-toolbar-tool-link-int-target-status-external' ).parse() ); this.setMessage( 'linkExternal', mw.message( 'wikieditor-toolbar-tool-link-int-target-status-external' ).parse() );
} else if ( item.isDisambiguation() ) { } else if ( item.isDisambiguation() ) {
this.setMessage( 'articleDisambiguation', mw.message( 'wikieditor-toolbar-tool-link-int-target-status-disambig' ).parse() ); this.setMessage( 'articleDisambiguation', mw.message( 'wikieditor-toolbar-tool-link-int-target-status-disambig' ).parse() );

4
modules/jquery.wikiEditor.dialogs.config.js
View file

@ -143,8 +143,8 @@
insertLinkLinkTypeField.connect( this, { insertLinkLinkTypeField.connect( this, {
change: function ( isExternal ) { change: function ( isExternal ) {
var urlMode = isExternal ? var urlMode = isExternal ?
insertLinkTitleInputField.urlModes.external : insertLinkLinkTypeField.constructor.static.LINK_MODE_EXTERNAL :
insertLinkTitleInputField.urlModes.internal; insertLinkLinkTypeField.constructor.static.LINK_MODE_INTERNAL;
insertLinkTitleInputField.setUrlMode( urlMode ); insertLinkTitleInputField.setUrlMode( urlMode );
} }
} ); } );