MediaWiki r44072 - Code Review

Jump to: navigation, search
Repository:MediaWiki
Revision:r44071‎ | r44072 (on ViewVC)‎ | r44073 >
Date:14:31, 30 November 2008
Author:werdna
Status:ok
Tags:
Comment:
Inline preview of logo selection.
Modified paths:

Diff [purge]

Index: trunk/extensions/Configure/Configure.page.php
===================================================================
--- trunk/extensions/Configure/Configure.page.php	(revision 44071)
+++ trunk/extensions/Configure/Configure.page.php	(revision 44072)
@@ -816,7 +816,8 @@
 		if ( $type == 'image-url' ) {
 			if ( !$allowed )
 				return '<code>' . htmlspecialchars( (string)$default ) . '</code>';
-			return Xml::input( "wp$conf", 45, (string)$default, array( 'class' => 'image-selector' ) );
+			return Xml::input( "wp$conf", 45, (string)$default, array( 'class' => 'image-selector', 'id' => 'image-url-textbox-'.$conf ) ) . '&nbsp;' .
+				Xml::element( 'img', array( 'id' => 'image-url-preview-'.$conf, 'src' => $default ) );
 		}
 		if ( $type == 'bool' ) {
 			if ( !$allowed )
Index: trunk/extensions/Configure/Configure.php
===================================================================
--- trunk/extensions/Configure/Configure.php	(revision 44071)
+++ trunk/extensions/Configure/Configure.php	(revision 44072)
@@ -147,7 +147,7 @@
 /**
  * Styles versions, you shouldn't change it
  */
-$wgConfigureStyleVersion = '11';
+$wgConfigureStyleVersion = '12';
 
 # Adding new rights...
 $wgAvailableRights[] = 'configure';
Index: trunk/extensions/Configure/Configure.js
===================================================================
--- trunk/extensions/Configure/Configure.js	(revision 44071)
+++ trunk/extensions/Configure/Configure.js	(revision 44072)
@@ -160,15 +160,17 @@
 	var thumbs = getElementsByClassName( configform, 'input', 'image-selector' );
 	for( var t = 0; t < thumbs.length; t++ ){
 		var textbox = thumbs[t];
+		var conf = textbox.id.substr( 18 );
+		var img = document.getElementById( 'image-url-preview-'+conf );
 
 		var button = document.createElement( 'input' );
 		button.type = 'button';
 		button.className = 'mw-button-get-image-url';
 		button.value = wgConfigureGetImageUrl;
-		button.onclick = createImageUrlCallback( textbox );
+		button.onclick = createImageUrlCallback( textbox, img );
 
-		textbox.parentNode.appendChild( document.createTextNode( '\u00A0' ) );
-		textbox.parentNode.appendChild( button );
+		textbox.parentNode.insertBefore( button, img );
+		textbox.parentNode.appendChild( document.createTextNode( '\u00A0' ), textbox ); // nbsp
 	}
 
 	// $wgGroupPermissions stuff, only if ajax is enabled
@@ -556,7 +558,7 @@
 /**
  * Handle [Get thumbnail URL] button clicks
  */
-function createImageUrlCallback( textbox ) {
+function createImageUrlCallback( textbox, img ) {
 	return function() {
 		sajax_do_call( 'wfAjaxGetThumbnailUrl',
 			[textbox.value, 130, 130], // FIXME hard-coded.
@@ -567,6 +569,7 @@
 					alert( wgConfigureImageError );
 				} else {
 					textbox.value = response.responseText;
+					img.src = response.responseText;
 				}
 			}
 		);

Status & tagging log

Personal tools
Namespaces
Variants
Views
Actions
Site
Support
Download
Development
Communication
Toolbox