Fix classname mismatch between upload js and templates/thumbnail.html
authorBrian Wolff <bawolff+wn@gmail.com>
Mon, 24 Aug 2015 04:43:15 +0000 (22:43 -0600)
committerBrian Wolff <bawolff+wn@gmail.com>
Mon, 24 Aug 2015 04:47:30 +0000 (22:47 -0600)
Classname was changed to use newer jQuery library, but js was still
hardcoding the old classname. This resulted in the preview of the
to be uploaded file, not to be shown.

I added an html comment to the template file to warn future
modifies about the dependency. I'm not sure if html comments in
template files are considered "appropriate".

Bug: T109952
Change-Id: I098a86260453d32644ff9ab06194c13998643de9
Follow-up: 6a70cc6968a3780c0b118e07f02f5ef015e655bb

resources/src/mediawiki.special/mediawiki.special.upload.js
resources/src/mediawiki.special/templates/thumbnail.html

index ea1eb99..7dd0369 100644 (file)
                                        ctx.clearRect( 0, 0, 180, 180 );
                                        ctx.rotate( rotation / 180 * Math.PI );
                                        ctx.drawImage( img, x, y, width, height );
-                                       thumb.find( '.mw-small-spinner' ).replaceWith( $canvas );
+                                       thumb.find( '.mw-spinner-small' ).replaceWith( $canvas );
 
                                        // Image size
                                        info = mw.msg( 'widthheight', logicalWidth, logicalHeight ) +
index 4f41fad..305f20c 100644 (file)
@@ -1,5 +1,6 @@
 <div id="mw-upload-thumbnail" class="thumb tright">
        <div class="thumbinner">
+               <!-- Note: Change showPreview() in mediawiki.special.upload.js if mw-spinner-small classname changes -->
                <div class="mw-spinner mw-spinner-small" style="width: 180px; height: 180px"></div>
                <div class="thumbcaption">
                        <div class="filename"></div>