http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62001
Revision: 62001
Author: adam
Date: 2010-02-04 23:45:03 +0000 (Thu, 04 Feb 2010)
Log Message:
-----------
Followup to r61980, specifically intended to help Roan sleep better at night
knowing users can enter the default text as a link if they want to
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
Modified:
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
2010-02-04 23:28:21 UTC (rev 62000)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
2010-02-04 23:45:03 UTC (rev 62001)
@@ -983,26 +983,30 @@
if ( $j( this ).val() == '' )
$j( this )
.addClass(
'wikieditor-toolbar-dialog-hint' )
- .val( $j( this ).data(
'tooltip' ) );
+ .val( $j( this ).data(
'tooltip' ) )
+ .data( 'tooltip-mode',
true );
} )
.focus( function() {
if( $j( this ).val() == $j( this
).data( 'tooltip' ) ) {
$j( this )
.val( '' )
- .removeClass(
'wikieditor-toolbar-dialog-hint' );
+ .removeClass(
'wikieditor-toolbar-dialog-hint' )
+ .data( 'tooltip-mode',
false );
}
})
.bind( 'change', function() {
if ( $j( this ).val() != $j( this
).data( 'tooltip' ) ) {
$j( this )
- .removeClass(
'wikieditor-toolbar-dialog-hint' );
+ .removeClass(
'wikieditor-toolbar-dialog-hint' )
+ .data( 'tooltip-mode',
false );
}
})
.bind( 'blur', function() {
if ( $j( this ).val() == '' ) {
$j( this )
.addClass(
'wikieditor-toolbar-dialog-hint' )
- .val( $j( this ).data(
'tooltip' ) );
+ .val( $j( this ).data(
'tooltip' ) )
+ .data( 'tooltip-mode',
true );
}
});
@@ -1160,9 +1164,9 @@
var target = $j(
'#wikieditor-toolbar-link-int-target' ).val();
var text = $j(
'#wikieditor-toolbar-link-int-text' ).val();
// check if the tooltips were passed as
target or text
- if ( target == $j(
'#wikieditor-toolbar-link-int-target' ).data( 'tooltip' ) )
+ if ( $j(
'#wikieditor-toolbar-link-int-target' ).data( 'tooltip-mode' ) )
target = "";
- if ( text == $j(
'#wikieditor-toolbar-link-int-text' ).data( 'tooltip' ) )
+ if ( $j(
'#wikieditor-toolbar-link-int-text' ).data( 'tooltip-mode' ) )
text = "";
var u = mw.usability;
if ( target == '' ) {
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-02-04 23:28:21 UTC (rev 62000)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-02-04 23:45:03 UTC (rev 62001)
@@ -1032,26 +1032,30 @@
if ( $j( this ).val() == '' )
$j( this )
.addClass(
'wikieditor-toolbar-dialog-hint' )
- .val( $j( this ).data(
'tooltip' ) );
+ .val( $j( this ).data(
'tooltip' ) )
+ .data( 'tooltip-mode',
true );
} )
.focus( function() {
if( $j( this ).val() == $j( this
).data( 'tooltip' ) ) {
$j( this )
.val( '' )
- .removeClass(
'wikieditor-toolbar-dialog-hint' );
+ .removeClass(
'wikieditor-toolbar-dialog-hint' )
+ .data( 'tooltip-mode',
false );
}
})
.bind( 'change', function() {
if ( $j( this ).val() != $j( this
).data( 'tooltip' ) ) {
$j( this )
- .removeClass(
'wikieditor-toolbar-dialog-hint' );
+ .removeClass(
'wikieditor-toolbar-dialog-hint' )
+ .data( 'tooltip-mode',
false );
}
})
.bind( 'blur', function() {
if ( $j( this ).val() == '' ) {
$j( this )
.addClass(
'wikieditor-toolbar-dialog-hint' )
- .val( $j( this ).data(
'tooltip' ) );
+ .val( $j( this ).data(
'tooltip' ) )
+ .data( 'tooltip-mode',
true );
}
});
@@ -1209,9 +1213,9 @@
var target = $j(
'#wikieditor-toolbar-link-int-target' ).val();
var text = $j(
'#wikieditor-toolbar-link-int-text' ).val();
// check if the tooltips were passed as
target or text
- if ( target == $j(
'#wikieditor-toolbar-link-int-target' ).data( 'tooltip' ) )
+ if ( $j(
'#wikieditor-toolbar-link-int-target' ).data( 'tooltip-mode' ) )
target = "";
- if ( text == $j(
'#wikieditor-toolbar-link-int-text' ).data( 'tooltip' ) )
+ if ( $j(
'#wikieditor-toolbar-link-int-text' ).data( 'tooltip-mode' ) )
text = "";
var u = mw.usability;
if ( target == '' ) {
Modified:
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-02-04 23:28:21 UTC (rev 62000)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-02-04 23:45:03 UTC (rev 62001)
@@ -42,7 +42,7 @@
$j('#wikieditor-toolbar-link-type-int,
#wikieditor-toolbar-link-type-ext').click(function(){if($j('#wikieditor-toolbar-link-type-ext').is(':checked'))
updateWidget('external');if($j('#wikieditor-toolbar-link-type-int').is(':checked'))
updateExistence();});var
u=mw.usability;$j(this).find('[rel]').each(function(){$j(this).text(u.getMsg($j(this).attr('rel')));});$j('#wikieditor-toolbar-link-int-target').data('tooltip',u.getMsg('wikieditor-toolbar-tool-link-int-target-tooltip'));$j('#wikieditor-toolbar-link-int-text').data('tooltip',u.getMsg('wikieditor-toolbar-tool-link-int-text-tooltip'));$j('#wikieditor-toolbar-link-int-target,
#wikieditor-toolbar-link-int-text').each(function(){var
tooltip=u.getMsg($j(this).attr('id')+'-tooltip');if($j(this).val()=='')
-$j(this).addClass('wikieditor-toolbar-dialog-hint').val($j(this).data('tooltip'));}).focus(function(){if($j(this).val()==$j(this).data('tooltip')){$j(this).val('').removeClass('wikieditor-toolbar-dialog-hint');}}).bind('change',function(){if($j(this).val()!=$j(this).data('tooltip')){$j(this).removeClass('wikieditor-toolbar-dialog-hint');}}).bind('blur',function(){if($j(this).val()==''){$j(this).addClass('wikieditor-toolbar-dialog-hint').val($j(this).data('tooltip'));}});$j('#wikieditor-toolbar-link-int-target').bind('change
keydown paste
cut',function(){setTimeout(function(){if(isExternalLink($j('#wikieditor-toolbar-link-int-target').val()))
+$j(this).addClass('wikieditor-toolbar-dialog-hint').val($j(this).data('tooltip')).data('tooltip-mode',true);}).focus(function(){if($j(this).val()==$j(this).data('tooltip')){$j(this).val('').removeClass('wikieditor-toolbar-dialog-hint').data('tooltip-mode',false);}}).bind('change',function(){if($j(this).val()!=$j(this).data('tooltip')){$j(this).removeClass('wikieditor-toolbar-dialog-hint').data('tooltip-mode',false);}}).bind('blur',function(){if($j(this).val()==''){$j(this).addClass('wikieditor-toolbar-dialog-hint').val($j(this).data('tooltip')).data('tooltip-mode',true);}});$j('#wikieditor-toolbar-link-int-target').bind('change
keydown paste
cut',function(){setTimeout(function(){if(isExternalLink($j('#wikieditor-toolbar-link-int-target').val()))
$j('#wikieditor-toolbar-link-type-ext').attr('checked','checked');else
$j('#wikieditor-toolbar-link-type-int').attr('checked','checked');if($j('#wikieditor-toolbar-link-int-text').data('untouched'))
if($j('#wikieditor-toolbar-link-int-target').val()==$j('#wikieditor-toolbar-link-int-target').data('tooltip')){$j('#wikieditor-toolbar-link-int-text').addClass('wikieditor-toolbar-dialog-hint').val($j('#wikieditor-toolbar-link-int-text').data('tooltip')).change();}else{$j('#wikieditor-toolbar-link-int-text').val($j('#wikieditor-toolbar-link-int-target').val()).change();}},0);});$j('#wikieditor-toolbar-link-int-text').bind('change
keydown paste cut',function(){var oldVal=$j(this).val();var
that=this;setTimeout(function(){if($j(that).val()!=oldVal)
@@ -54,8 +54,8 @@
request.abort();}});},dialog:{width:500,dialogClass:'wikiEditor-toolbar-dialog',buttons:{'wikieditor-toolbar-tool-link-insert':function(){function
escapeInternalText(s){return s.replace(/(]{2,})/g,'<nowiki>$1</nowiki>');}
function escapeExternalTarget(s){return s.replace(/
/g,'%20').replace(/\[/g,'%5B').replace(/]/g,'%5D');}
function escapeExternalText(s){return
s.replace(/(]+)/g,'<nowiki>$1</nowiki>');}
-var insertText='';var
whitespace=$j('#wikieditor-toolbar-link-dialog').data('whitespace');var
target=$j('#wikieditor-toolbar-link-int-target').val();var
text=$j('#wikieditor-toolbar-link-int-text').val();if(target==$j('#wikieditor-toolbar-link-int-target').data('tooltip'))
-target="";if(text==$j('#wikieditor-toolbar-link-int-text').data('tooltip'))
+var insertText='';var
whitespace=$j('#wikieditor-toolbar-link-dialog').data('whitespace');var
target=$j('#wikieditor-toolbar-link-int-target').val();var
text=$j('#wikieditor-toolbar-link-int-text').val();if($j('#wikieditor-toolbar-link-int-target').data('tooltip-mode'))
+target="";if($j('#wikieditor-toolbar-link-int-text').data('tooltip-mode'))
text="";var
u=mw.usability;if(target==''){alert(u.getMsg('wikieditor-toolbar-tool-link-empty'));return;}
if($j.trim(text)==''){text='';}
if($j('#wikieditor-toolbar-link-type-int').is(':checked')){if($j('#wikieditor-toolbar-link-int-target-status-invalid').is(':visible')){alert(u.getMsg('wikieditor-toolbar-tool-link-int-invalid'));return;}
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-02-04 23:28:21 UTC (rev 62000)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-02-04 23:45:03 UTC (rev 62001)
@@ -16,14 +16,14 @@
array( 'src' => 'Modules/Preview/Preview.js', 'version'
=> 6 ),
array( 'src' => 'Modules/Publish/Publish.js', 'version'
=> 6 ),
array( 'src' => 'Modules/Toc/Toc.js', 'version' => 7 ),
- array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 46 ),
+ array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 47 ),
array( 'src' =>
'Modules/TemplateEditor/TemplateEditor.js', 'version' => 4 ),
),
'combined' => array(
- array( 'src' => 'WikiEditor.combined.js', 'version' =>
48 ),
+ array( 'src' => 'WikiEditor.combined.js', 'version' =>
49 ),
),
'minified' => array(
- array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 48 ),
+ array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 49 ),
),
);
static $messages = array(
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
