Revision: 43549
Author: ialex
Date: 2008-11-15 11:23:21 +0000 (Sat, 15 Nov 2008)
Log Message:
-----------
Added basic error handling for wfAjaxGetThumbnailUrl
Modified Paths:
--------------
trunk/extensions/Configure/Configure.i18n.php
trunk/extensions/Configure/Configure.js
trunk/extensions/Configure/Configure.page.php
Modified: trunk/extensions/Configure/Configure.i18n.php
===================================================================
--- trunk/extensions/Configure/Configure.i18n.php 2008-11-15 11:17:35 UTC
(rev 43548)
+++ trunk/extensions/Configure/Configure.i18n.php 2008-11-15 11:23:21 UTC
(rev 43549)
@@ -40,6 +40,7 @@
'configure-js-remove' => 'Delete',
'configure-js-remove-row' => 'Delete this entry',
'configure-js-get-image-url' => 'Convert file name to URL',
+ 'configure-js-image-error' => 'An error occured while
fetching the URL. Please check that the file exists.',
'configure-no-diff' => 'There is no changes between
selected versions.',
'configure-no-directory' => 'The directory used to store
the settings, <tt>$1</tt>, does not exist.
Please create it or change it to use this extension.',
Modified: trunk/extensions/Configure/Configure.js
===================================================================
--- trunk/extensions/Configure/Configure.js 2008-11-15 11:17:35 UTC (rev
43548)
+++ trunk/extensions/Configure/Configure.js 2008-11-15 11:23:21 UTC (rev
43549)
@@ -497,7 +497,13 @@
sajax_do_call( 'wfAjaxGetThumbnailUrl',
[textbox.value, 130, 130], // FIXME hard-coded.
function(response) {
- textbox.value = response.responseText;
+ var text = response.responseText;
+ // basic error handling
+ if( text.substr( 0, 9 ) == "<!DOCTYPE" ) {
+ alert( wgConfigureImageError );
+ } else {
+ textbox.value = response.responseText;
+ }
}
);
}
Modified: trunk/extensions/Configure/Configure.page.php
===================================================================
--- trunk/extensions/Configure/Configure.page.php 2008-11-15 11:17:35 UTC
(rev 43548)
+++ trunk/extensions/Configure/Configure.page.php 2008-11-15 11:23:21 UTC
(rev 43549)
@@ -696,6 +696,7 @@
$promptGroup = Xml::encodeJsVar( wfMsg(
'configure-js-prompt-group' ) );
$groupExists = Xml::encodeJsVar( wfMsg(
'configure-js-group-exists' ) );
$getimgurl = Xml::encodeJsVar( wfMsg(
'configure-js-get-image-url' ) );
+ $imageerror = Xml::encodeJsVar( wfMsg(
'configure-js-image-error' ) );
$ajax = isset( $wgUseAjax ) && $wgUseAjax ? 'true' : 'false';
$script = array(
"<script type=\"$wgJsMimeType\">/*<![CDATA[*/",
@@ -706,6 +707,7 @@
"var wgConfigureGroupExists = {$groupExists};",
"var wgConfigureUseAjax = {$ajax};",
"var wgConfigureGetImageUrl = {$getimgurl};",
+ "var wgConfigureImageError = {$imageerror};",
"/*]]>*/</script>",
"<script type=\"{$wgJsMimeType}\"
src=\"{$wgScriptPath}/extensions/Configure/Configure.js?{$wgConfigureStyleVersion}\"></script>",
);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
