http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72919
Revision: 72919
Author: catrope
Date: 2010-09-13 18:08:51 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
UsabilityInitiative: (bug 24181) Don't be too lax about showing "invalid title"
in the link dialog
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-09-13 18:04:29 UTC (rev 72918)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
2010-09-13 18:08:51 UTC (rev 72919)
@@ -1140,13 +1140,10 @@
'format': 'json'
},
success: function( data ) {
- if ( !data ) {
- // This happens
in some weird cases
- return;
- }
var status;
- if ( typeof data.query
== 'undefined' ) {
- status =
'invalid';
+ if ( !data || typeof
data.query == 'undefined' ) {
+ // This happens
in some weird cases
+ status = false;
} else {
var page =
data.query.pages[data.query.pageids[0]];
status =
'exists';
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-09-13 18:04:29 UTC (rev 72918)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-09-13 18:08:51 UTC (rev 72919)
@@ -1194,13 +1194,10 @@
'format': 'json'
},
success: function( data ) {
- if ( !data ) {
- // This happens
in some weird cases
- return;
- }
var status;
- if ( typeof data.query
== 'undefined' ) {
- status =
'invalid';
+ if ( !data || typeof
data.query == 'undefined' ) {
+ // This happens
in some weird cases
+ status = false;
} else {
var page =
data.query.pages[data.query.pageids[0]];
status =
'exists';
Modified:
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-09-13 18:04:29 UTC (rev 72918)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-09-13 18:08:51 UTC (rev 72919)
@@ -35,8 +35,7 @@
if(target.replace(/^\s+$/,'')==''){updateWidget(false);return;}
if(!internal&&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,'converttitles':'','format':'json'},success:function(data){if(!data){return;}
-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')
+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,'converttitles':'','format':'json'},success:function(data){var
status;if(!data||typeof data.query=='undefined'){status=false;}else{var
page=data.query.pages[data.query.pageids[0]];status='exists';if(typeof
page.missing!='undefined')
status='notexists';else if(typeof page.invalid!='undefined')
status='invalid';}
if(!internal)cache[target]=status;updateWidget(status);}}));}
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-09-13 18:04:29 UTC (rev 72918)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-09-13 18:08:51 UTC (rev 72919)
@@ -17,16 +17,16 @@
array( 'src' =>
'Modules/PreviewDialog/PreviewDialog.js', 'version' => 2 ),
array( 'src' => 'Modules/Publish/Publish.js', 'version'
=> 6 ),
array( 'src' => 'Modules/Toc/Toc.js', 'version' => 10 ),
- array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 105 ),
+ array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 106 ),
array( 'src' =>
'Modules/TemplateEditor/TemplateEditor.js', 'version' => 6 ),
array( 'src' => 'Modules/Templates/Templates.js',
'version' => 1 ),
array( 'src' =>
'Modules/AddMediaWizard/AddMediaWizard.js', 'version' => 6 ),
),
'combined' => array(
- array( 'src' => 'WikiEditor.combined.js', 'version' =>
121 ),
+ array( 'src' => 'WikiEditor.combined.js', 'version' =>
122 ),
),
'minified' => array(
- array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 121 ),
+ array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 122 ),
),
);
static $messages = array(
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
