r85606 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r85605‎ | r85606 | r85607 >
Date:02:00, 7 April 2011
Author:kaldari
Status:deferred
Tags:
Comment:
beginning of fix for Bug 28316
Modified paths:
  • /trunk/extensions/UploadWizard/UploadWizard.config.php (modified) (history)
  • /trunk/extensions/UploadWizard/resources/mw.UploadWizard.js (modified) (history)

Diff [purge]

Index: trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
@@ -202,14 +202,21 @@
203203 _this.ui.setStatus( 'mwe-upwiz-getting-metadata' );
204204 if ( result.upload ) {
205205 _this.extractUploadInfo( result.upload );
 206+ // create the small thumbnail used on the 'upload' step
206207 _this.getThumbnail(
207208 function( image ) {
208209 // n.b. if server returns a URL, which is a 404, we do NOT get broken image
209 - _this.ui.setPreview( image );
 210+ _this.ui.setPreview( image ); // make the thumbnail the preview image
210211 },
211 - mw.UploadWizard.config[ 'iconThumbnailWidth' ],
 212+ mw.UploadWizard.config[ 'iconThumbnailWidth' ],
212213 mw.UploadWizard.config[ 'iconThumbnailMaxHeight' ]
213214 );
 215+ // create the large thumbnail that the other thumbnails link to
 216+ _this.getThumbnail(
 217+ function( image ) {},
 218+ mw.UploadWizard.config[ 'largeThumbnailWidth' ],
 219+ mw.UploadWizard.config[ 'largeThumbnailMaxHeight' ]
 220+ );
214221 _this.deedPreview.setup();
215222 _this.details.populate();
216223 _this.state = 'stashed';
Index: trunk/extensions/UploadWizard/UploadWizard.config.php
@@ -189,7 +189,13 @@
190190
191191 // Small thumbnail max height
192192 'smallThumbnailMaxHeight' => 100,
 193+
 194+ // Large thumbnail width
 195+ 'largeThumbnailWidth' => 500,
193196
 197+ // Large thumbnail max height
 198+ 'largeThumbnailMaxHeight' => 500,
 199+
194200 // Icon thumbnail width:
195201 'iconThumbnailWidth' => 32,
196202

Follow-up revisions

RevisionCommit summaryAuthorDate
r85608merge in uploadWizard updates ( r85606 )dale06:10, 7 April 2011
r856091.17wmf1: Merge UploadWizard to trunk state as of r85604 (excluding r85606)catrope07:50, 7 April 2011

Status & tagging log