| Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php |
| — | — | @@ -16,14 +16,14 @@ |
| 17 | 17 | array( 'src' => 'Modules/Preview/Preview.js', 'version' => 6 ), |
| 18 | 18 | array( 'src' => 'Modules/Publish/Publish.js', 'version' => 6 ), |
| 19 | 19 | array( 'src' => 'Modules/Toc/Toc.js', 'version' => 7 ), |
| 20 | | - array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version' => 46 ), |
| | 20 | + array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version' => 47 ), |
| 21 | 21 | array( 'src' => 'Modules/TemplateEditor/TemplateEditor.js', 'version' => 4 ), |
| 22 | 22 | ), |
| 23 | 23 | 'combined' => array( |
| 24 | | - array( 'src' => 'WikiEditor.combined.js', 'version' => 48 ), |
| | 24 | + array( 'src' => 'WikiEditor.combined.js', 'version' => 49 ), |
| 25 | 25 | ), |
| 26 | 26 | 'minified' => array( |
| 27 | | - array( 'src' => 'WikiEditor.combined.min.js', 'version' => 48 ), |
| | 27 | + array( 'src' => 'WikiEditor.combined.min.js', 'version' => 49 ), |
| 28 | 28 | ), |
| 29 | 29 | ); |
| 30 | 30 | static $messages = array( |
| Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js |
| — | — | @@ -1032,26 +1032,30 @@ |
| 1033 | 1033 | if ( $j( this ).val() == '' ) |
| 1034 | 1034 | $j( this ) |
| 1035 | 1035 | .addClass( 'wikieditor-toolbar-dialog-hint' ) |
| 1036 | | - .val( $j( this ).data( 'tooltip' ) ); |
| | 1036 | + .val( $j( this ).data( 'tooltip' ) ) |
| | 1037 | + .data( 'tooltip-mode', true ); |
| 1037 | 1038 | } ) |
| 1038 | 1039 | .focus( function() { |
| 1039 | 1040 | if( $j( this ).val() == $j( this ).data( 'tooltip' ) ) { |
| 1040 | 1041 | $j( this ) |
| 1041 | 1042 | .val( '' ) |
| 1042 | | - .removeClass( 'wikieditor-toolbar-dialog-hint' ); |
| | 1043 | + .removeClass( 'wikieditor-toolbar-dialog-hint' ) |
| | 1044 | + .data( 'tooltip-mode', false ); |
| 1043 | 1045 | } |
| 1044 | 1046 | }) |
| 1045 | 1047 | .bind( 'change', function() { |
| 1046 | 1048 | if ( $j( this ).val() != $j( this ).data( 'tooltip' ) ) { |
| 1047 | 1049 | $j( this ) |
| 1048 | | - .removeClass( 'wikieditor-toolbar-dialog-hint' ); |
| | 1050 | + .removeClass( 'wikieditor-toolbar-dialog-hint' ) |
| | 1051 | + .data( 'tooltip-mode', false ); |
| 1049 | 1052 | } |
| 1050 | 1053 | }) |
| 1051 | 1054 | .bind( 'blur', function() { |
| 1052 | 1055 | if ( $j( this ).val() == '' ) { |
| 1053 | 1056 | $j( this ) |
| 1054 | 1057 | .addClass( 'wikieditor-toolbar-dialog-hint' ) |
| 1055 | | - .val( $j( this ).data( 'tooltip' ) ); |
| | 1058 | + .val( $j( this ).data( 'tooltip' ) ) |
| | 1059 | + .data( 'tooltip-mode', true ); |
| 1056 | 1060 | } |
| 1057 | 1061 | }); |
| 1058 | 1062 | |
| — | — | @@ -1209,9 +1213,9 @@ |
| 1210 | 1214 | var target = $j( '#wikieditor-toolbar-link-int-target' ).val(); |
| 1211 | 1215 | var text = $j( '#wikieditor-toolbar-link-int-text' ).val(); |
| 1212 | 1216 | // check if the tooltips were passed as target or text |
| 1213 | | - if ( target == $j( '#wikieditor-toolbar-link-int-target' ).data( 'tooltip' ) ) |
| | 1217 | + if ( $j( '#wikieditor-toolbar-link-int-target' ).data( 'tooltip-mode' ) ) |
| 1214 | 1218 | target = ""; |
| 1215 | | - if ( text == $j( '#wikieditor-toolbar-link-int-text' ).data( 'tooltip' ) ) |
| | 1219 | + if ( $j( '#wikieditor-toolbar-link-int-text' ).data( 'tooltip-mode' ) ) |
| 1216 | 1220 | text = ""; |
| 1217 | 1221 | var u = mw.usability; |
| 1218 | 1222 | if ( target == '' ) { |
| Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | $j('#wikieditor-toolbar-link-type-int, #wikieditor-toolbar-link-type-ext').click(function(){if($j('#wikieditor-toolbar-link-type-ext').is(':checked')) |
| 44 | 44 | updateWidget('external');if($j('#wikieditor-toolbar-link-type-int').is(':checked')) |
| 45 | 45 | 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()=='') |
| 46 | | -$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())) |
| | 46 | +$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())) |
| 47 | 47 | $j('#wikieditor-toolbar-link-type-ext').attr('checked','checked');else |
| 48 | 48 | $j('#wikieditor-toolbar-link-type-int').attr('checked','checked');if($j('#wikieditor-toolbar-link-int-text').data('untouched')) |
| 49 | 49 | 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 @@ |
| 55 | 55 | 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>');} |
| 56 | 56 | function escapeExternalTarget(s){return s.replace(/ /g,'%20').replace(/\[/g,'%5B').replace(/]/g,'%5D');} |
| 57 | 57 | function escapeExternalText(s){return s.replace(/(]+)/g,'<nowiki>$1</nowiki>');} |
| 58 | | -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')) |
| 59 | | -target="";if(text==$j('#wikieditor-toolbar-link-int-text').data('tooltip')) |
| | 58 | +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')) |
| | 59 | +target="";if($j('#wikieditor-toolbar-link-int-text').data('tooltip-mode')) |
| 60 | 60 | text="";var u=mw.usability;if(target==''){alert(u.getMsg('wikieditor-toolbar-tool-link-empty'));return;} |
| 61 | 61 | if($j.trim(text)==''){text='';} |
| 62 | 62 | 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;} |
| Index: trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js |
| — | — | @@ -983,26 +983,30 @@ |
| 984 | 984 | if ( $j( this ).val() == '' ) |
| 985 | 985 | $j( this ) |
| 986 | 986 | .addClass( 'wikieditor-toolbar-dialog-hint' ) |
| 987 | | - .val( $j( this ).data( 'tooltip' ) ); |
| | 987 | + .val( $j( this ).data( 'tooltip' ) ) |
| | 988 | + .data( 'tooltip-mode', true ); |
| 988 | 989 | } ) |
| 989 | 990 | .focus( function() { |
| 990 | 991 | if( $j( this ).val() == $j( this ).data( 'tooltip' ) ) { |
| 991 | 992 | $j( this ) |
| 992 | 993 | .val( '' ) |
| 993 | | - .removeClass( 'wikieditor-toolbar-dialog-hint' ); |
| | 994 | + .removeClass( 'wikieditor-toolbar-dialog-hint' ) |
| | 995 | + .data( 'tooltip-mode', false ); |
| 994 | 996 | } |
| 995 | 997 | }) |
| 996 | 998 | .bind( 'change', function() { |
| 997 | 999 | if ( $j( this ).val() != $j( this ).data( 'tooltip' ) ) { |
| 998 | 1000 | $j( this ) |
| 999 | | - .removeClass( 'wikieditor-toolbar-dialog-hint' ); |
| | 1001 | + .removeClass( 'wikieditor-toolbar-dialog-hint' ) |
| | 1002 | + .data( 'tooltip-mode', false ); |
| 1000 | 1003 | } |
| 1001 | 1004 | }) |
| 1002 | 1005 | .bind( 'blur', function() { |
| 1003 | 1006 | if ( $j( this ).val() == '' ) { |
| 1004 | 1007 | $j( this ) |
| 1005 | 1008 | .addClass( 'wikieditor-toolbar-dialog-hint' ) |
| 1006 | | - .val( $j( this ).data( 'tooltip' ) ); |
| | 1009 | + .val( $j( this ).data( 'tooltip' ) ) |
| | 1010 | + .data( 'tooltip-mode', true ); |
| 1007 | 1011 | } |
| 1008 | 1012 | }); |
| 1009 | 1013 | |
| — | — | @@ -1160,9 +1164,9 @@ |
| 1161 | 1165 | var target = $j( '#wikieditor-toolbar-link-int-target' ).val(); |
| 1162 | 1166 | var text = $j( '#wikieditor-toolbar-link-int-text' ).val(); |
| 1163 | 1167 | // check if the tooltips were passed as target or text |
| 1164 | | - if ( target == $j( '#wikieditor-toolbar-link-int-target' ).data( 'tooltip' ) ) |
| | 1168 | + if ( $j( '#wikieditor-toolbar-link-int-target' ).data( 'tooltip-mode' ) ) |
| 1165 | 1169 | target = ""; |
| 1166 | | - if ( text == $j( '#wikieditor-toolbar-link-int-text' ).data( 'tooltip' ) ) |
| | 1170 | + if ( $j( '#wikieditor-toolbar-link-int-text' ).data( 'tooltip-mode' ) ) |
| 1167 | 1171 | text = ""; |
| 1168 | 1172 | var u = mw.usability; |
| 1169 | 1173 | if ( target == '' ) { |