http://www.mediawiki.org/wiki/Special:Code/MediaWiki/58426
Revision: 58426
Author: catrope
Date: 2009-11-02 11:53:21 +0000 (Mon, 02 Nov 2009)
Log Message:
-----------
* NavigableTOC: (bug 21201) Display hand cursor over highlighted sections in
NTOC
* EditToolbar: Fix display of status image in link dialog by adding a <br />
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.min.js
trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
trunk/extensions/UsabilityInitiative/css/combined.css
trunk/extensions/UsabilityInitiative/css/combined.min.css
trunk/extensions/UsabilityInitiative/css/wikiEditor.toc.css
Modified: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
===================================================================
--- trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-11-02 11:36:35 UTC (rev 58425)
+++ trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-11-02 11:53:21 UTC (rev 58426)
@@ -944,6 +944,7 @@
var externalMsg = gM(
'edittoolbar-tool-link-int-target-status-external' );
var loadingMsg = gM(
'edittoolbar-tool-link-int-target-status-loading' );
$j( '#edittoolbar-link-int-target-status' )
+ .before( $j( '<br />' ) )
.append( $j( '<img />' ).attr( {
'id':
'edittoolbar-link-int-target-status-exists',
'src': $j.wikiEditor.imgPath +
'dialogs/' + 'insert-link-exists.png',
@@ -1137,7 +1138,7 @@
$j(this).data( 'articlePathRegex', new RegExp(
'^' + RegExp.escape( wgServer +
wgArticlePath )
.replace( /\\\$1/g, '(.*)' ) +
'$'
- ) );
+ ) );
// Pre-fill the text fields based on the
current selection
var selection = $j(this).data( 'context'
).$textarea.getSelection();
$j( '#edittoolbar-link-int-target' ).focus();
Modified: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.min.js
2009-11-02 11:36:35 UTC (rev 58425)
+++ trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.min.js
2009-11-02 11:53:21 UTC (rev 58426)
@@ -39,7 +39,7 @@
$j(this).find('[rel]').each(function(){$j(this).text(gM($j(this).attr('rel')));});$j('#edittoolbar-link-int-target').bind('change
keypress paste
cut',function(){setTimeout(function(){if(isExternalLink($j('#edittoolbar-link-int-target').val()))
$j('#edittoolbar-link-type-ext').attr('checked','checked');else
$j('#edittoolbar-link-type-int').attr('checked','checked');if($j('#edittoolbar-link-int-text').data('untouched'))
-$j('#edittoolbar-link-int-text').val($j('#edittoolbar-link-int-target').val());},0);});$j('#edittoolbar-link-int-text').bind('change
keypress paste cut',function(){$j(this).data('untouched',false);});var
existsMsg=gM('edittoolbar-tool-link-int-target-status-exists');var
notexistsMsg=gM('edittoolbar-tool-link-int-target-status-notexists');var
invalidMsg=gM('edittoolbar-tool-link-int-target-status-invalid');var
externalMsg=gM('edittoolbar-tool-link-int-target-status-external');var
loadingMsg=gM('edittoolbar-tool-link-int-target-status-loading');$j('#edittoolbar-link-int-target-status').append($j('<img
/>').attr({'id':'edittoolbar-link-int-target-status-exists','src':$j.wikiEditor.imgPath+'dialogs/'+'insert-link-exists.png','alt':existsMsg,'title':existsMsg})).append($j('<img
/>').attr({'id':'edittoolbar-link-int-target-status-notexists','src':$j.wikiEditor.imgPath+'dialogs/'+'insert-link-notexists.png','alt':notexistsMsg,'title':notexistsMsg})).append($j('<img
/>').attr({'id':'edittoolbar-link-int-target-status-invalid','src':$j.wikiEditor.imgPath+'dialogs/'+'insert-link-invalid.png','alt':invalidMsg,'title':invalidMsg})).append($j('<img
/>').attr({'id':'edittoolbar-link-int-target-status-external','src':$j.wikiEditor.imgPath+'dialogs/'+'insert-link-external.png','alt':externalMsg,'title':externalMsg})).append($j('<img
/>').attr({'id':'edittoolbar-link-int-target-status-loading','src':$j.wikiEditor.imgPath+'dialogs/loading.gif','alt':loadingMsg,'title':loadingMsg})).data('existencecache',{}).children().hide();$j('#edittoolbar-link-int-target').bind('keypress
paste cut',function(){if(typeof
$j(this).data('timerID')!='undefined'){clearTimeout($j(this).data('timerID'));}
+$j('#edittoolbar-link-int-text').val($j('#edittoolbar-link-int-target').val());},0);});$j('#edittoolbar-link-int-text').bind('change
keypress paste cut',function(){$j(this).data('untouched',false);});var
existsMsg=gM('edittoolbar-tool-link-int-target-status-exists');var
notexistsMsg=gM('edittoolbar-tool-link-int-target-status-notexists');var
invalidMsg=gM('edittoolbar-tool-link-int-target-status-invalid');var
externalMsg=gM('edittoolbar-tool-link-int-target-status-external');var
loadingMsg=gM('edittoolbar-tool-link-int-target-status-loading');$j('#edittoolbar-link-int-target-status').before($j('<br
/>')).append($j('<img
/>').attr({'id':'edittoolbar-link-int-target-status-exists','src':$j.wikiEditor.imgPath+'dialogs/'+'insert-link-exists.png','alt':existsMsg,'title':existsMsg})).append($j('<img
/>').attr({'id':'edittoolbar-link-int-target-status-notexists','src':$j.wikiEditor.imgPath+'dialogs/'+'insert-link-notexists.png','alt':notexistsMsg,'title':notexistsMsg})).append($j('<img
/>').attr({'id':'edittoolbar-link-int-target-status-invalid','src':$j.wikiEditor.imgPath+'dialogs/'+'insert-link-invalid.png','alt':invalidMsg,'title':invalidMsg})).append($j('<img
/>').attr({'id':'edittoolbar-link-int-target-status-external','src':$j.wikiEditor.imgPath+'dialogs/'+'insert-link-external.png','alt':externalMsg,'title':externalMsg})).append($j('<img
/>').attr({'id':'edittoolbar-link-int-target-status-loading','src':$j.wikiEditor.imgPath+'dialogs/loading.gif','alt':loadingMsg,'title':loadingMsg})).data('existencecache',{}).children().hide();$j('#edittoolbar-link-int-target').bind('keypress
paste cut',function(){if(typeof
$j(this).data('timerID')!='undefined'){clearTimeout($j(this).data('timerID'));}
var
timerID=setTimeout(updateExistence,120);$j(this).data('timerID',timerID);}).change(function(){if(typeof
$j(this).data('timerID')!='undefined'){clearTimeout($j(this).data('timerID'));}
updateExistence();});$j('#edittoolbar-link-int-target').data('suggcache',{}).suggestions({fetch:function(query){var
that=this;var
title=$j(this).val();if(isExternalLink(title)||title.indexOf('|')!=-1||title==''){$j(this).suggestions('suggestions',[]);return;}
var cache=$j(this).data('suggcache');if(typeof
cache[title]!='undefined'){$j(this).suggestions('suggestions',cache[title]);return;}
Modified: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
===================================================================
--- trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
2009-11-02 11:36:35 UTC (rev 58425)
+++ trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
2009-11-02 11:53:21 UTC (rev 58426)
@@ -19,7 +19,7 @@
/* Configuration */
// Bump the version number every time you change any of the .css/.js files
-$wgEditToolbarStyleVersion = 69;
+$wgEditToolbarStyleVersion = 70;
// Set this to true to simply override the stock toolbar for everyone
$wgEditToolbarGlobalEnable = false;
Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2009-11-02 11:36:35 UTC (rev 58425)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2009-11-02 11:53:21 UTC (rev 58426)
@@ -22,15 +22,15 @@
array( 'src' => 'css/wikiEditor.css', 'version'
=> 4 ),
array( 'src' => 'css/wikiEditor.toolbar.css',
'version' => 7 ),
array( 'src' => 'css/wikiEditor.dialogs.css',
'version' => 2 ),
- array( 'src' => 'css/wikiEditor.toc.css',
'version' => 7 ),
+ array( 'src' => 'css/wikiEditor.toc.css',
'version' => 8 ),
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2' ),
),
'combined' => array(
- array( 'src' => 'css/combined.css', 'version'
=> 13 ),
+ array( 'src' => 'css/combined.css', 'version'
=> 14 ),
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2' ),
),
'minified' => array(
- array( 'src' => 'css/combined.min.css',
'version' => 13 ),
+ array( 'src' => 'css/combined.min.css',
'version' => 14 ),
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2' ),
),
)
Modified: trunk/extensions/UsabilityInitiative/css/combined.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/combined.css 2009-11-02
11:36:35 UTC (rev 58425)
+++ trunk/extensions/UsabilityInitiative/css/combined.css 2009-11-02
11:53:21 UTC (rev 58426)
@@ -171,7 +171,6 @@
.wikiEditor-ui-toc ul li div.current {
background-color: #FAFAFA;
color: #333333;
- cursor: default;
}
.wikiEditor-ui-toc ul li div.section-0 {
font-size: 1em;
Modified: trunk/extensions/UsabilityInitiative/css/combined.min.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/combined.min.css 2009-11-02
11:36:35 UTC (rev 58425)
+++ trunk/extensions/UsabilityInitiative/css/combined.min.css 2009-11-02
11:53:21 UTC (rev 58426)
@@ -158,7 +158,6 @@
.wikiEditor-ui-toc ul li div.current{
background-color:#FAFAFA;
color:#333333;
-cursor:default;
}
.wikiEditor-ui-toc ul li div.section-0{
font-size:1em;
@@ -501,4 +500,4 @@
background-color:white;
text-decoration:none;
border-color:#a8d7f9;
-}
+}
\ No newline at end of file
Modified: trunk/extensions/UsabilityInitiative/css/wikiEditor.toc.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/wikiEditor.toc.css 2009-11-02
11:36:35 UTC (rev 58425)
+++ trunk/extensions/UsabilityInitiative/css/wikiEditor.toc.css 2009-11-02
11:53:21 UTC (rev 58426)
@@ -66,7 +66,6 @@
.wikiEditor-ui-toc ul li div.current {
background-color: #FAFAFA;
color: #333333;
- cursor: default;
}
.wikiEditor-ui-toc ul li div.section-0 {
font-size: 1em;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
