| Property changes on: branches/uploadwizard/phase3/profileinfo.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Reverse-merged /trunk/phase3/profileinfo.php:r73549-74018,74020-74029 |
| 2 | 2 | Merged /branches/uploadwizard/extensions/profileinfo.php:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/load.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3 | 3 | Reverse-merged /trunk/phase3/load.php:r73549-74018,74020-74029 |
| 4 | 4 | Merged /branches/uploadwizard/extensions/load.php:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/config |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 5 | 5 | Reverse-merged /trunk/phase3/config:r73549-74018,74020-74029 |
| 6 | 6 | Merged /branches/uploadwizard/extensions/config:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/thumb.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 7 | 7 | Reverse-merged /trunk/phase3/thumb.php:r73549-74018,74020-74029 |
| 8 | 8 | Merged /branches/uploadwizard/extensions/thumb.php:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/languages |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 9 | 9 | Reverse-merged /trunk/phase3/languages:r73549-74018,74020-74029 |
| 10 | 10 | Merged /branches/uploadwizard/extensions/languages:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/RELEASE-NOTES |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 11 | 11 | Merged /branches/uploadwizard/extensions/RELEASE-NOTES:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/FAQ |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 12 | 12 | Reverse-merged /trunk/phase3/FAQ:r73549-74018,74020-74029 |
| 13 | 13 | Merged /branches/uploadwizard/extensions/FAQ:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/resources |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 14 | 14 | Reverse-merged /trunk/phase3/resources:r73549-74018,74020-74029 |
| 15 | 15 | Merged /branches/uploadwizard/extensions/resources:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/StartProfiler.sample |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 16 | 16 | Reverse-merged /trunk/phase3/StartProfiler.sample:r73549-74018,74020-74029 |
| 17 | 17 | Merged /branches/uploadwizard/extensions/StartProfiler.sample:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/maintenance |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 18 | 18 | Reverse-merged /trunk/phase3/maintenance:r73549-74018,74020-74029 |
| 19 | 19 | Merged /branches/uploadwizard/extensions/maintenance:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/php5.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 20 | 20 | Reverse-merged /trunk/phase3/php5.php5:r73549-74018,74020-74029 |
| 21 | 21 | Merged /branches/uploadwizard/extensions/php5.php5:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/UPGRADE |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 22 | 22 | Reverse-merged /trunk/phase3/UPGRADE:r73549-74018,74020-74029 |
| 23 | 23 | Merged /branches/uploadwizard/extensions/UPGRADE:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/skins |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 24 | 24 | Merged /branches/uploadwizard/extensions/skins:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/docs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 25 | 25 | Reverse-merged /trunk/phase3/docs:r73549-74018,74020-74029 |
| 26 | 26 | Merged /branches/uploadwizard/extensions/docs:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/math |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 27 | 27 | Reverse-merged /trunk/phase3/math:r73549-74018,74020-74029 |
| 28 | 28 | Merged /branches/uploadwizard/extensions/math:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/CREDITS |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 29 | 29 | Reverse-merged /trunk/phase3/CREDITS:r73549-74018,74020-74029 |
| 30 | 30 | Merged /branches/uploadwizard/extensions/CREDITS:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/opensearch_desc.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 31 | 31 | Reverse-merged /trunk/phase3/opensearch_desc.php5:r73549-74018,74020-74029 |
| 32 | 32 | Merged /branches/uploadwizard/extensions/opensearch_desc.php5:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/trackback.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 33 | 33 | Reverse-merged /trunk/phase3/trackback.php5:r73549-74018,74020-74029 |
| 34 | 34 | Merged /branches/uploadwizard/extensions/trackback.php5:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/HISTORY |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 35 | 35 | Reverse-merged /trunk/phase3/HISTORY:r73549-74018,74020-74029 |
| 36 | 36 | Merged /branches/uploadwizard/extensions/HISTORY:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/cache |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 37 | 37 | Reverse-merged /trunk/phase3/cache:r73549-74018,74020-74029 |
| 38 | 38 | Merged /branches/uploadwizard/extensions/cache:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/images |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 39 | 39 | Reverse-merged /trunk/phase3/images:r73549-74018,74020-74029 |
| 40 | 40 | Merged /branches/uploadwizard/extensions/images:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/INSTALL |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 41 | 41 | Reverse-merged /trunk/phase3/INSTALL:r73549-74018,74020-74029 |
| 42 | 42 | Merged /branches/uploadwizard/extensions/INSTALL:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/bin |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 43 | 43 | Reverse-merged /trunk/phase3/bin:r73549-74018,74020-74029 |
| 44 | 44 | Merged /branches/uploadwizard/extensions/bin:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/img_auth.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 45 | 45 | Reverse-merged /trunk/phase3/img_auth.php5:r73549-74018,74020-74029 |
| 46 | 46 | Merged /branches/uploadwizard/extensions/img_auth.php5:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/COPYING |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 47 | 47 | Reverse-merged /trunk/phase3/COPYING:r73549-74018,74020-74029 |
| 48 | 48 | Merged /branches/uploadwizard/extensions/COPYING:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/trackback.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 49 | 49 | Reverse-merged /trunk/phase3/trackback.php:r73549-74018,74020-74029 |
| 50 | 50 | Merged /branches/uploadwizard/extensions/trackback.php:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/opensearch_desc.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 51 | 51 | Reverse-merged /trunk/phase3/opensearch_desc.php:r73549-74018,74020-74029 |
| 52 | 52 | Merged /branches/uploadwizard/extensions/opensearch_desc.php:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/redirect.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 53 | 53 | Reverse-merged /trunk/phase3/redirect.php5:r73549-74018,74020-74029 |
| 54 | 54 | Merged /branches/uploadwizard/extensions/redirect.php5:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/index.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 55 | 55 | Reverse-merged /trunk/phase3/index.php5:r73549-74018,74020-74029 |
| 56 | 56 | Merged /branches/uploadwizard/extensions/index.php5:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/img_auth.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 57 | 57 | Reverse-merged /trunk/phase3/img_auth.php:r73549-74018,74020-74029 |
| 58 | 58 | Merged /branches/uploadwizard/extensions/img_auth.php:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/redirect.phtml |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 59 | 59 | Reverse-merged /trunk/phase3/redirect.phtml:r73549-74018,74020-74029 |
| 60 | 60 | Merged /branches/uploadwizard/extensions/redirect.phtml:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/api.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 61 | 61 | Reverse-merged /trunk/phase3/api.php5:r73549-74018,74020-74029 |
| 62 | 62 | Merged /branches/uploadwizard/extensions/api.php5:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/wiki.phtml |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 63 | 63 | Reverse-merged /trunk/phase3/wiki.phtml:r73549-74018,74020-74029 |
| 64 | 64 | Merged /branches/uploadwizard/extensions/wiki.phtml:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/redirect.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 65 | 65 | Reverse-merged /trunk/phase3/redirect.php:r73549-74018,74020-74029 |
| 66 | 66 | Merged /branches/uploadwizard/extensions/redirect.php:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/thumb.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 67 | 67 | Reverse-merged /trunk/phase3/thumb.php5:r73549-74018,74020-74029 |
| 68 | 68 | Merged /branches/uploadwizard/extensions/thumb.php5:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/load.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 69 | 69 | Reverse-merged /trunk/phase3/load.php5:r73549-74018,74020-74029 |
| 70 | 70 | Merged /branches/uploadwizard/extensions/load.php5:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/serialized |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 71 | 71 | Reverse-merged /trunk/phase3/serialized:r73549-74018,74020-74029 |
| 72 | 72 | Merged /branches/uploadwizard/extensions/serialized:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/README |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 73 | 73 | Reverse-merged /trunk/phase3/README:r73549-74018,74020-74029 |
| 74 | 74 | Merged /branches/uploadwizard/extensions/README:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/index.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 75 | 75 | Reverse-merged /trunk/phase3/index.php:r73549-74018,74020-74029 |
| 76 | 76 | Merged /branches/uploadwizard/extensions/index.php:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3/api.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 77 | 77 | Reverse-merged /trunk/phase3/api.php:r73549-74018,74020-74029 |
| 78 | 78 | Merged /branches/uploadwizard/extensions/api.php:r73550-74029 |
| Property changes on: branches/uploadwizard/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 79 | 79 | Merged /trunk/phase3/extensions:r73544-74018 |
| 80 | 80 | Merged /branches/uploadwizard/extensions:r73550-74029* |
| Index: branches/uploadwizard/extensions/UploadWizard/resources/mw.UploadWizard.js |
| — | — | @@ -198,29 +198,31 @@ |
| 199 | 199 | * Fetch a thumbnail for this upload of the desired width. |
| 200 | 200 | * It is assumed you don't call this until it's been transported. |
| 201 | 201 | * |
| | 202 | + * The success message from the API should have included enough information to make thumbnails already. |
| | 203 | + * |
| | 204 | + * But, if we don't have the thumbnail, try to fetch it by invoking a thumbnail URL pattern. |
| 202 | 205 | * We create the thumbnail by passing a special URL which creates the thumbnail on the fly and returns the image contents. |
| 203 | 206 | * If the original image URL is http://foo.com/bar/baz/xyz.jpg, and the desired width is 120 pixels, |
| 204 | 207 | * the thumbnail URL is http://foo.com/bar/baz/120px-xyz.jpg |
| | 208 | + * N.B. in general thumbnails have the same mime-type as the original, but NOT ALWAYS. Getting a thumbnail in this way may |
| | 209 | + * cause conflicts between extension & mime-type. |
| 205 | 210 | * |
| 206 | 211 | * @param width - desired width of thumbnail (height will scale to match) |
| 207 | 212 | * @param callback - callback to execute once thumbnail has been obtained -- must accept Image object |
| 208 | 213 | */ |
| 209 | 214 | getThumbnail: function( width, callback ) { |
| 210 | | - var _this = this; |
| 211 | | - key = "width" + width; |
| 212 | | - if ( mw.isDefined( _this._thumbnails[key] ) && typeof _this._thumbnails[key] === 'Image' ) { |
| 213 | | - callback( _this._thumbnails[key] ); |
| | 215 | + var key = "width" + width; |
| | 216 | + if ( mw.isDefined( this._thumbnails[key] ) && typeof this._thumbnails[key] === 'Image' ) { |
| | 217 | + callback( this._thumbnails[key] ); |
| 214 | 218 | } else { |
| 215 | | - var thumbUrl = _this.imageinfo.url.replace( /(.*)/([^\/]+)$/, "$1/" + width + "px-" + $2 ); |
| 216 | | - _this._thumbnails[ "width" + width ] = new Image( thumbUrl ); |
| 217 | | - var image = new Image(); |
| 218 | | - image.onload = function(){ |
| 219 | | - _this._thumbnails[key] = image; |
| 220 | | - callback( image ); |
| | 219 | + var thumbUrl = this.imageinfo.url.replace( /(.*)\/([^\/]+)$/, "$1/" + width + "px-$2" ); |
| | 220 | + this._thumbnails[key] = new Image(); |
| | 221 | + var _this = this; |
| | 222 | + this._thumbnails[key].onload = function(){ |
| | 223 | + callback( _this._thumbnails[key] ); |
| 221 | 224 | } |
| 222 | | - image.src = thumbUrl; |
| | 225 | + this._thumbnails[key].src = thumbUrl; |
| 223 | 226 | } |
| 224 | | - |
| 225 | 227 | }, |
| 226 | 228 | |
| 227 | 229 | |