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

LinkDialog: use placeholder instead of fake values

Browse source 
Use proper placeholder attribute instead of faking it with a value.
This predated even jquery.placeholder and is no longer needed.
Also fixes a bug where it was checking with the API for the existence
of the placeholder value.

Bug: T133716
Change-Id: I290ec48f6b1d250da28efffd7ebdb6b681c0227e
This commit is contained in:
Derk-Jan Hartman 2018-11-15 07:55:09 +01:00 committed by TheDJ
parent daab3360c9
commit a686b7f580
2 changed files with 8 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -226,44 +226,10 @@
} );
// Set tabindexes on form fields
$.wikiEditor.modules.dialogs.fn.setTabindexes( $( this ).find( 'input' ).not( '[tabindex]' ) );
// Setup the tooltips in the textboxes
$( '#wikieditor-toolbar-link-int-target' )
.data( 'tooltip', mw.msg( 'wikieditor-toolbar-tool-link-int-target-tooltip' ) );
$( '#wikieditor-toolbar-link-int-text' )
.data( 'tooltip', mw.msg( 'wikieditor-toolbar-tool-link-int-text-tooltip' ) );
$( '#wikieditor-toolbar-link-int-target, #wikieditor-toolbar-link-int-text' )
.each( function () {
if ( $( this ).val() === '' ) {
$( this )
.addClass( 'wikieditor-toolbar-dialog-hint' )
.val( $( this ).data( 'tooltip' ) )
.data( 'tooltip-mode', true );
}
} )
.on( 'focus', function () {
if ( $( this ).val() === $( this ).data( 'tooltip' ) ) {
$( this )
.val( '' )
.removeClass( 'wikieditor-toolbar-dialog-hint' )
.data( 'tooltip-mode', false );
}
} )
.on( 'change', function () {
if ( $( this ).val() !== $( this ).data( 'tooltip' ) ) {
$( this )
.removeClass( 'wikieditor-toolbar-dialog-hint' )
.data( 'tooltip-mode', false );
}
} )
.on( 'blur', function () {
if ( $( this ).val() === '' ) {
$( this )
.addClass( 'wikieditor-toolbar-dialog-hint' )
.val( $( this ).data( 'tooltip' ) )
.data( 'tooltip-mode', true );
}
} );
$( '#wikieditor-toolbar-link-int-target' ).attr( 'placeholder',
mw.msg( 'wikieditor-toolbar-tool-link-int-target-tooltip' ) );
$( '#wikieditor-toolbar-link-int-text' ).attr( 'placeholder',
mw.msg( 'wikieditor-toolbar-tool-link-int-text-tooltip' ) );
// Automatically copy the value of the internal link page title field to the link text field unless the
// user has changed the link text field - this is a convenience thing since most link texts are going to
// be the same as the page title - Also change the internal/external radio button accordingly
@ -279,19 +245,9 @@
updateExistence();
}
if ( $( '#wikieditor-toolbar-link-int-text' ).data( 'untouched' ) ) {
// eslint-disable-next-line eqeqeq
if ( $( '#wikieditor-toolbar-link-int-target' ).val() ==
$( '#wikieditor-toolbar-link-int-target' ).data( 'tooltip' )
) {
$( '#wikieditor-toolbar-link-int-text' )
.addClass( 'wikieditor-toolbar-dialog-hint' )
.val( $( '#wikieditor-toolbar-link-int-text' ).data( 'tooltip' ) )
.change();
} else {
$( '#wikieditor-toolbar-link-int-text' )
.val( $( '#wikieditor-toolbar-link-int-target' ).val() )
.change();
}
$( '#wikieditor-toolbar-link-int-text' )
.val( $( '#wikieditor-toolbar-link-int-target' ).val() )
.change();
}
}, 0 );
} );
@ -416,13 +372,6 @@
function escapeExternalText( s ) {
return s.replace( /(\]+)/g, '<nowiki>$1</nowiki>' );
}
// check if the tooltips were passed as target or text
if ( $( '#wikieditor-toolbar-link-int-target' ).data( 'tooltip-mode' ) ) {
target = '';
}
if ( $( '#wikieditor-toolbar-link-int-text' ).data( 'tooltip-mode' ) ) {
text = '';
}
if ( target === '' ) {
// eslint-disable-next-line no-alert
alert( mw.msg( 'wikieditor-toolbar-tool-link-empty' ) );
@ -568,8 +517,7 @@
}
$( '#wikieditor-toolbar-link-int-text' ).data( 'untouched',
$( '#wikieditor-toolbar-link-int-text' ).val() ===
$( '#wikieditor-toolbar-link-int-target' ).val() ||
$( '#wikieditor-toolbar-link-int-text' ).hasClass( 'wikieditor-toolbar-dialog-hint' )
$( '#wikieditor-toolbar-link-int-target' ).val()
);
$( '#wikieditor-toolbar-link-int-target' ).suggestions();
@ -578,13 +526,6 @@
$( '#wikieditor-toolbar-link-int-text' ).data( 'untouched', false );
}
$( '#wikieditor-toolbar-link-int-text, #wikiedit-toolbar-link-int-target' )
.each( function () {
if ( $( this ).val() === '' ) {
$( this ).parent().find( 'label' ).show();
}
} );
if ( !$( this ).data( 'dialogkeypressset' ) ) {
$( this ).data( 'dialogkeypressset', true );
// Execute the action associated with the first button

3
modules/jquery.wikiEditor.dialogs.less
View file

@ -55,6 +55,3 @@ body {
margin-right: 2em;
}
.wikieditor-toolbar-dialog-hint {
color: #54595d;
}