| Index: branches/wmf/1.18wmf1/extensions/UploadWizard/resources/mw.fileApi.js |
| — | — | @@ -16,12 +16,13 @@ |
| 17 | 17 | * Also excludes files over 10M to avoid going insane on memory usage. |
| 18 | 18 | * |
| 19 | 19 | * @todo is there a way we can ask the browser what's supported in <img>s? |
| | 20 | + * @todo put SVG back after working around Firefox 7 bug <https://bugzilla.wikimedia.org/show_bug.cgi?id=31643> |
| 20 | 21 | * |
| 21 | 22 | * @param {File} file |
| 22 | 23 | * @return boolean |
| 23 | 24 | */ |
| 24 | 25 | isPreviewableFile: function( file ) { |
| 25 | | - var known = [ 'image/png', 'image/gif', 'image/jpeg', 'image/svg+xml'], |
| | 26 | + var known = [ 'image/png', 'image/gif', 'image/jpeg'], |
| 26 | 27 | tooHuge = 10 * 1024 * 1024; |
| 27 | 28 | return ( $.inArray( file.type, known ) !== -1 ) && file.size > 0 && file.size < tooHuge; |
| 28 | 29 | } |
| Property changes on: branches/wmf/1.18wmf1/extensions/UploadWizard |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 29 | 30 | Merged /trunk/extensions/UploadWizard:r99653 |
| Property changes on: branches/wmf/1.18wmf1/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 30 | 31 | Merged /trunk/extensions:r99653 |
| Index: branches/wmf/1.18wmf1/resources/mediawiki.special/mediawiki.special.upload.js |
| — | — | @@ -19,12 +19,13 @@ |
| 20 | 20 | * Also excludes files over 10M to avoid going insane on memory usage. |
| 21 | 21 | * |
| 22 | 22 | * @todo is there a way we can ask the browser what's supported in <img>s? |
| | 23 | + * @todo put SVG back after working around Firefox 7 bug <https://bugzilla.wikimedia.org/show_bug.cgi?id=31643> |
| 23 | 24 | * |
| 24 | 25 | * @param {File} file |
| 25 | 26 | * @return boolean |
| 26 | 27 | */ |
| 27 | 28 | function fileIsPreviewable( file ) { |
| 28 | | - var known = ['image/png', 'image/gif', 'image/jpeg', 'image/svg+xml'], |
| | 29 | + var known = ['image/png', 'image/gif', 'image/jpeg'], |
| 29 | 30 | tooHuge = 10 * 1024 * 1024; |
| 30 | 31 | return ( $.inArray( file.type, known ) !== -1 ) && file.size > 0 && file.size < tooHuge; |
| 31 | 32 | } |
| Property changes on: branches/wmf/1.18wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 32 | 33 | Merged /trunk/phase3:r99653 |