http://www.mediawiki.org/wiki/Special:Code/MediaWiki/59747
Revision: 59747
Author: adam
Date: 2009-12-04 21:59:28 +0000 (Fri, 04 Dec 2009)
Log Message:
-----------
Follow up improvements to r59687
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
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
trunk/extensions/UsabilityInitiative/css/combined.css
trunk/extensions/UsabilityInitiative/css/combined.min.css
trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2009-12-04 21:11:10 UTC (rev 59746)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2009-12-04 21:59:28 UTC (rev 59747)
@@ -21,17 +21,17 @@
array( 'src' => 'css/suggestions.css',
'version' => 6 ),
array( 'src' => 'css/wikiEditor.css', 'version'
=> 7 ),
array( 'src' => 'css/wikiEditor.toolbar.css',
'version' => 7 ),
- array( 'src' => 'css/wikiEditor.dialogs.css',
'version' => 3 ),
+ array( 'src' => 'css/wikiEditor.dialogs.css',
'version' => 4 ),
array( 'src' => 'css/wikiEditor.toc.css',
'version' => 23 ),
array( 'src' => 'css/wikiEditor.preview.css',
'version' => 1 ),
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
'combined' => array(
- array( 'src' => 'css/combined.css', 'version'
=> 31 ),
+ array( 'src' => 'css/combined.css', 'version'
=> 32 ),
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
'minified' => array(
- array( 'src' => 'css/combined.min.css',
'version' => 31 ),
+ array( 'src' => 'css/combined.min.css',
'version' => 32 ),
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
)
Modified:
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
2009-12-04 21:11:10 UTC (rev 59746)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
2009-12-04 21:59:28 UTC (rev 59747)
@@ -883,8 +883,12 @@
function updateExistence() {
function updateWidget( status ) {
$j(
'#wikieditor-toolbar-link-int-target-status' ).children().hide();
- $j(
'#wikieditor-toolbar-link-int-target-status-' + status ).show();
- $j(
'#wikieditor-toolbar-link-int-target' ).parent().removeClass().addClass(
'status-' + status );
+ $j(
'#wikieditor-toolbar-link-int-target' ).parent()
+ .removeClass( 'status-invalid
status-external status-notexists status-exists status-loading' );
+ if ( status ) {
+ $j(
'#wikieditor-toolbar-link-int-target-status-' + status ).show();
+ $j(
'#wikieditor-toolbar-link-int-target' ).parent().addClass( 'status-' + status );
+ }
}
// Abort previous request
var request = $j(
'#wikieditor-toolbar-link-int-target-status' ).data( 'request' );
@@ -900,7 +904,7 @@
}
if ( target == '' ) {
// Hide the widget when the textbox is
empty
- $j(
'#wikieditor-toolbar-link-int-target-status' ).children().hide();
+ updateWidget( false );
return;
}
if ( isExternalLink( target ) ) {
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2009-12-04 21:11:10 UTC (rev 59746)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2009-12-04 21:59:28 UTC (rev 59747)
@@ -931,8 +931,12 @@
function updateExistence() {
function updateWidget( status ) {
$j(
'#wikieditor-toolbar-link-int-target-status' ).children().hide();
- $j(
'#wikieditor-toolbar-link-int-target-status-' + status ).show();
- $j(
'#wikieditor-toolbar-link-int-target' ).parent().removeClass().addClass(
'status-' + status );
+ $j(
'#wikieditor-toolbar-link-int-target' ).parent()
+ .removeClass( 'status-invalid
status-external status-notexists status-exists status-loading' );
+ if ( status ) {
+ $j(
'#wikieditor-toolbar-link-int-target-status-' + status ).show();
+ $j(
'#wikieditor-toolbar-link-int-target' ).parent().addClass( 'status-' + status );
+ }
}
// Abort previous request
var request = $j(
'#wikieditor-toolbar-link-int-target-status' ).data( 'request' );
@@ -948,7 +952,7 @@
}
if ( target == '' ) {
// Hide the widget when the textbox is
empty
- $j(
'#wikieditor-toolbar-link-int-target-status' ).children().hide();
+ updateWidget( false );
return;
}
if ( isExternalLink( target ) ) {
Modified:
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2009-12-04 21:11:10 UTC (rev 59746)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2009-12-04 21:59:28 UTC (rev 59747)
@@ -33,10 +33,10 @@
</tr>\
</table></fieldset>',init:function(){function isExternalLink(s){if(typeof
arguments.callee.regex=='undefined'){arguments.callee.regex=new
RegExp("(^("+urlprotocols+"))|(^www\\.)|([^.]\\.[a-z]{2,}($|\\/))",'i');}
return s.match(arguments.callee.regex);}
-function updateExistence(){function
updateWidget(status){$j('#wikieditor-toolbar-link-int-target-status').children().hide();$j('#wikieditor-toolbar-link-int-target-status-'+status).show();$j('#wikieditor-toolbar-link-int-target').parent().removeClass().addClass('status-'+status);}
+function updateExistence(){function
updateWidget(status){$j('#wikieditor-toolbar-link-int-target-status').children().hide();$j('#wikieditor-toolbar-link-int-target').parent().removeClass('status-invalid
status-external status-notexists status-exists
status-loading');if(status){$j('#wikieditor-toolbar-link-int-target-status-'+status).show();$j('#wikieditor-toolbar-link-int-target').parent().addClass('status-'+status);}}
var
request=$j('#wikieditor-toolbar-link-int-target-status').data('request');if(request){request.abort();}
var target=$j('#wikieditor-toolbar-link-int-target').val();var
cache=$j('#wikieditor-toolbar-link-int-target-status').data('existencecache');if(cache[target]){updateWidget(cache[target]);return;}
-if(target==''){$j('#wikieditor-toolbar-link-int-target-status').children().hide();return;}
+if(target==''){updateWidget(false);return;}
if(isExternalLink(target)){updateWidget('external');return;}
if(target.indexOf('|')!=-1){updateWidget('invalid');return;}
updateWidget('loading');$j('#wikieditor-toolbar-link-int-target-status').data('request',$j.ajax({url:wgScriptPath+'/api.php',dataType:'json',data:{'action':'query','indexpageids':'','titles':target,'format':'json'},success:function(data){var
status;if(typeof data.query=='undefined'){status='invalid';}else{var
page=data.query.pages[data.query.pageids[0]];status='exists';if(typeof
page.missing!='undefined')
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2009-12-04 21:11:10 UTC (rev 59746)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2009-12-04 21:59:28 UTC (rev 59747)
@@ -16,13 +16,13 @@
array( 'src' => 'Modules/Preview/Preview.js', 'version'
=> 2 ),
array( 'src' => 'Modules/Publish/Publish.js', 'version'
=> 1 ),
array( 'src' => 'Modules/Toc/Toc.js', 'version' => 1 ),
- array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 11 ),
+ array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 12 ),
),
'combined' => array(
- array( 'src' => 'WikiEditor.combined.js', 'version' =>
9 ),
+ array( 'src' => 'WikiEditor.combined.js', 'version' =>
10 ),
),
'minified' => array(
- array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 9 ),
+ array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 10 ),
),
);
static $messages = array(
Modified: trunk/extensions/UsabilityInitiative/css/combined.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/combined.css 2009-12-04
21:11:10 UTC (rev 59746)
+++ trunk/extensions/UsabilityInitiative/css/combined.css 2009-12-04
21:59:28 UTC (rev 59747)
@@ -174,7 +174,7 @@
z-index: 1099;
}
-#wikieditor-toolbar-link-dialog .status-invalid input {
+.ui-dialog-content .status-invalid input {
border: 2px solid red;
padding: 2px 1px;
}/* wikiEditor toc module */
Modified: trunk/extensions/UsabilityInitiative/css/combined.min.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/combined.min.css 2009-12-04
21:11:10 UTC (rev 59746)
+++ trunk/extensions/UsabilityInitiative/css/combined.min.css 2009-12-04
21:59:28 UTC (rev 59747)
@@ -163,7 +163,7 @@
div.suggestions{
z-index:1099;
}
-#wikieditor-toolbar-link-dialog .status-invalid input{
+.ui-dialog-content .status-invalid input{
border:2px solid red;
padding:2px 1px;
}
Modified: trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
2009-12-04 21:11:10 UTC (rev 59746)
+++ trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
2009-12-04 21:59:28 UTC (rev 59747)
@@ -14,7 +14,7 @@
z-index: 1099;
}
-#wikieditor-toolbar-link-dialog .status-invalid input {
+.ui-dialog-content .status-invalid input {
border: 2px solid red;
padding: 2px 1px;
}
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
