http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99654
Revision: 99654
Author: reedy
Date: 2011-10-12 22:55:15 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
MFT r99653
Modified Paths:
--------------
branches/wmf/1.18wmf1/extensions/UploadWizard/resources/mw.fileApi.js
branches/wmf/1.18wmf1/resources/mediawiki.special/mediawiki.special.upload.js
Property Changed:
----------------
branches/wmf/1.18wmf1/
branches/wmf/1.18wmf1/extensions/
branches/wmf/1.18wmf1/extensions/UploadWizard/
Property changes on: branches/wmf/1.18wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,97810,98578,98598,98656
+ /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,97810,98578,98598,98656,99653
Property changes on: branches/wmf/1.18wmf1/extensions
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/trunk/extensions:99592
/trunk/phase3/extensions:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656
+ /branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/trunk/extensions:99592,99653
/trunk/phase3/extensions:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656
Property changes on: branches/wmf/1.18wmf1/extensions/UploadWizard
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/uploadwizard/extensions/UploadWizard:73550-75905
/trunk/extensions/UploadWizard:98286
/trunk/phase3/extensions/UploadWizard:85939
+ /branches/uploadwizard/extensions/UploadWizard:73550-75905
/trunk/extensions/UploadWizard:98286,99653
/trunk/phase3/extensions/UploadWizard:85939
Modified: branches/wmf/1.18wmf1/extensions/UploadWizard/resources/mw.fileApi.js
===================================================================
--- branches/wmf/1.18wmf1/extensions/UploadWizard/resources/mw.fileApi.js
2011-10-12 22:46:31 UTC (rev 99653)
+++ branches/wmf/1.18wmf1/extensions/UploadWizard/resources/mw.fileApi.js
2011-10-12 22:55:15 UTC (rev 99654)
@@ -16,12 +16,13 @@
* Also excludes files over 10M to avoid going insane on memory
usage.
*
* @todo is there a way we can ask the browser what's supported
in <img>s?
+ * @todo put SVG back after working around Firefox 7 bug
<https://bugzilla.wikimedia.org/show_bug.cgi?id=31643>
*
* @param {File} file
* @return boolean
*/
isPreviewableFile: function( file ) {
- var known = [ 'image/png', 'image/gif',
'image/jpeg', 'image/svg+xml'],
+ var known = [ 'image/png', 'image/gif',
'image/jpeg'],
tooHuge = 10 * 1024 * 1024;
return ( $.inArray( file.type, known ) !== -1 ) &&
file.size > 0 && file.size < tooHuge;
}
Modified:
branches/wmf/1.18wmf1/resources/mediawiki.special/mediawiki.special.upload.js
===================================================================
---
branches/wmf/1.18wmf1/resources/mediawiki.special/mediawiki.special.upload.js
2011-10-12 22:46:31 UTC (rev 99653)
+++
branches/wmf/1.18wmf1/resources/mediawiki.special/mediawiki.special.upload.js
2011-10-12 22:55:15 UTC (rev 99654)
@@ -19,12 +19,13 @@
* Also excludes files over 10M to avoid going insane on memory usage.
*
* @todo is there a way we can ask the browser what's supported in
<img>s?
+ * @todo put SVG back after working around Firefox 7 bug
<https://bugzilla.wikimedia.org/show_bug.cgi?id=31643>
*
* @param {File} file
* @return boolean
*/
function fileIsPreviewable( file ) {
- var known = ['image/png', 'image/gif', 'image/jpeg',
'image/svg+xml'],
+ var known = ['image/png', 'image/gif', 'image/jpeg'],
tooHuge = 10 * 1024 * 1024;
return ( $.inArray( file.type, known ) !== -1 ) && file.size >
0 && file.size < tooHuge;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
