Fix bug in mw.Map + fix bug 26801 + wrapper mediawiki.special.upload.js

[lhc/web/wiklou.git] / resources / mediawiki.special / mediawiki.special.upload.js

diff --git a/resources/mediawiki.special/mediawiki.special.upload.js b/resources/mediawiki.special/mediawiki.special.upload.js
index aa26a9e..468a0c6 100644 (file)
--- a/resources/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/mediawiki.special/mediawiki.special.upload.js
@@ -3,7 +3,7 @@
  * Note that additional code still lives in skins/common/upload.js
  */
 
-$( function() {
+jQuery( function( $ ) {
        /**
         * Is the FileAPI available with sufficient functionality?
         */
@@ -21,9 +21,9 @@ $( function() {
         * @return boolean
         */
        function fileIsPreviewable( file ) {
-               var known = ['image/png', 'image/gif', 'image/jpeg', 'image/svg+xml'];
-               var tooHuge = 10 * 1024 * 1024;
-               return ($.inArray( file.type, known ) !== -1) && file.size > 0 && file.size < tooHuge;
+               var     known = ['image/png', 'image/gif', 'image/jpeg', 'image/svg+xml'],
+                       tooHuge = 10 * 1024 * 1024;
+               return ( $.inArray( file.type, known ) !== -1 ) && file.size > 0 && file.size < tooHuge;
        }
 
        /**
@@ -39,9 +39,8 @@ $( function() {
         * @param {File} file
         */
        function showPreview( file ) {
-               var previewSize = 180;
-               
-               var thumb = $( '<div id="mw-upload-thumbnail" class="thumb tright">' +
+               var     previewSize = 180,
+                       thumb = $( '<div id="mw-upload-thumbnail" class="thumb tright">' +
                                                '<div class="thumbinner">' +
                                                        '<canvas width="' + previewSize + '" height="' + previewSize + '" ></canvas>' +
                                                        '<div class="thumbcaption"><div class="filename"></div><div class="fileinfo"></div></div>' +
@@ -50,18 +49,18 @@ $( function() {
                thumb.find( '.filename' ).text( file.name ).end()
                        .find( '.fileinfo' ).text( prettySize( file.size ) ).end();
                
-               var ctx = thumb.find( 'canvas' )[0].getContext( '2d' );
-               var spinner = new Image();
+               var     ctx = thumb.find( 'canvas' )[0].getContext( '2d' ),
+                       spinner = new Image();
                spinner.onload = function() { 
                        ctx.drawImage( spinner, (previewSize - spinner.width) / 2, 
                                        (previewSize - spinner.height) / 2 ); 
                };
-               spinner.src = wgScriptPath + '/skins/common/images/spinner.gif';
+               spinner.src = mw.config.get( 'wgScriptPath' ) + '/skins/common/images/spinner.gif';
                $( '#mw-htmlform-source' ).parent().prepend( thumb );
 
                fetchPreview( file, function( dataURL ) {       
-                       var img = new Image();
-                       var rotation = 0;
+                       var     img = new Image(),
+                               rotation = 0;
                        img.onload = function() {
                                // Fit the image within the previewSizexpreviewSize box
                                if ( img.width > img.height ) {