Fixes for remoteSearchDriver.js and related. Untested, probably doesn't work. Somewha...

[lhc/web/wiklou.git] / js2 / uploadPage.js

diff --git a/js2/uploadPage.js b/js2/uploadPage.js
index a41b2dd..dbe8e04 100644 (file)
--- a/js2/uploadPage.js
+++ b/js2/uploadPage.js
@@ -3,30 +3,27 @@
  * It controls the invocation of the mvUploader class based on local config.
  */
 
-js2AddOnloadHook( function() {
-       js_log("never ran js2hook");
-       mwUploadHelper.init();
-});
-
-var mwUploadFormTarget = '#mw-upload-form';
+var mwUploadFormSelector = '#mw-upload-form';
 // Set up the upload form bindings once all DOM manipulation is done
 var mwUploadHelper = {
        init: function() {
                var _this = this;
                // If wgEnableFirefogg is not boolean false, set to true
-               if( typeof wgEnableFirefogg == 'undefined' )
-               wgEnableFirefogg = true;
+               if ( typeof wgEnableFirefogg == 'undefined' )
+                       wgEnableFirefogg = true;
 
-               if( wgEnableFirefogg ) {
+               if ( wgEnableFirefogg ) {
                        // Set up the upload handler to Firefogg. Should work with the HTTP uploads too.
                        $j( '#wpUploadFile' ).firefogg( {
                                // An API URL (we won't submit directly to action of the form)
                                'api_url': wgServer + wgScriptPath + '/api.php',
                                'form_rewrite': true,
-                               'target_edit_from': mwUploadFormTarget,
-                               'new_source_cb': function( orgFilename, oggName ) {                                     
+                               // MediaWiki API supports chunk uploads: 
+                               'enable_chunks' : true, 
+                               'edit_form_selector': mwUploadFormSelector,
+                               'new_source_cb': function( orgFilename, oggName ) {
                                        $j( '#wpDestFile' ).val( oggName );
-                                       $j( '#wpDestFile' ).doDestCheck({
+                                       $j( '#wpDestFile' ).doDestCheck( {
                                                'warn_target': '#wpDestFile-warning'
                                        } );
                                }
@@ -34,25 +31,25 @@ var mwUploadHelper = {
                } else {
                        // Add basic upload profile support ( http status monitoring, progress box for
                        // browsers that support it, etc.)
-                       if( $j( '#wpUploadFileURL' ).length != 0 ) {
+                       if ( $j( '#wpUploadFileURL' ).length != 0 ) {
                                $j( '#wpUploadFileURL' ).baseUploadInterface( {
                                        'api_url': wgServer + wgScriptPath + '/api.php',
-                                       'target_edit_from': mwUploadFormTarget
+                                       'edit_form_selector': mwUploadFormSelector
                                } );
                        }
                }
 
-               if( wgAjaxUploadDestCheck ) {
+               if ( wgAjaxUploadDestCheck ) {
                        // Do destination check
                        $j( '#wpDestFile' ).change( function() {
-                               $j( '#wpDestFile' ).doDestCheck({
+                               $j( '#wpDestFile' ).doDestCheck( {
                                        'warn_target':'#wpDestFile-warning'
                                } );
                        } );
                }
 
                // Check if we have HTTP enabled & setup enable/disable toggle:
-               if( $j( '#wpUploadFileURL' ).length != 0 ) {
+               if ( $j( '#wpUploadFileURL' ).length != 0 ) {
                        // Set the initial toggleUpType
                        _this.toggleUpType( true );
 
@@ -63,7 +60,7 @@ var mwUploadHelper = {
                $j( '#wpUploadFile,#wpUploadFileURL' )
                .focus( function() {
                        _this.toggleUpType( this.id == 'wpUploadFile' );
-               })
+               } )
                // Also setup the onChange event binding:
                .change( function() {
                        if ( wgUploadAutoFill ) {
@@ -74,7 +71,7 @@ var mwUploadHelper = {
        /**
        * Set the upload radio buttons
        *
-       * boolean set
+       * @boolean set
        */
        toggleUpType: function( set ) {
                $j( '#wpSourceTypeFile' ).attr( 'checked', set );
@@ -84,8 +81,8 @@ var mwUploadHelper = {
                $j( '#wpUploadFileURL' ).attr( 'disabled', set );
 
                // If Firefogg is enabled, toggle action according to wpSourceTypeFile selection
-               if( wgEnableFirefogg ) {                        
-                       $j( '#wpUploadFile' ).firefogg({
+               if ( wgEnableFirefogg ) {
+                       $j( '#wpUploadFile' ).firefogg( {
                                'firefogg_form_action': $j( '#wpSourceTypeFile' ).attr( 'checked' )
                        } );
                }
@@ -106,21 +103,21 @@ var mwUploadHelper = {
                if ( slash == -1 && backslash == -1 ) {
                        fname = path;
                } else if ( slash > backslash ) {
-                       fname = path.substring( slash+1, 10000 );
+                       fname = path.substring( slash + 1, 10000 );
                } else {
-                       fname = path.substring( backslash+1, 10000 );
+                       fname = path.substring( backslash + 1, 10000 );
                }
                // URLs are less likely to have a useful extension. Don't include them in the extension check.
-               if( wgFileExtensions && $j( targetElm ).attr( 'id' ) != 'wpUploadFileURL' ) {
+               if ( wgFileExtensions && $j( targetElm ).attr( 'id' ) != 'wpUploadFileURL' ) {
                        var found = false;
-                       if( fname.lastIndexOf( '.' ) != -1 ) {
+                       if ( fname.lastIndexOf( '.' ) != -1 ) {
                                var ext = fname.substr( fname.lastIndexOf( '.' ) + 1 );
-                               for( var i = 0; i < wgFileExtensions.length; i++ ) {
-                                       if( wgFileExtensions[i].toLowerCase() == ext.toLowerCase() )
+                               for ( var i = 0; i < wgFileExtensions.length; i++ ) {
+                                       if ( wgFileExtensions[i].toLowerCase() == ext.toLowerCase() )
                                        found = true;
                                }
                        }
-                       if( !found ) {
+                       if ( !found ) {
                                // Clear the upload. Set mw-upload-permitted to error.
                                $j( targetElm ).val( '' );
                                $j( '#mw-upload-permitted,#mw-upload-prohibited' ).show().addClass( 'error' );
@@ -129,13 +126,18 @@ var mwUploadHelper = {
                        }
                }
                // Capitalise first letter and replace spaces by underscores
-               fname = fname.charAt( 0 ).toUpperCase().concat( fname.substring( 1, 10000 ) ).replace( / /g, '_' );
+               fname = fname.charAt( 0 ).toUpperCase().concat( fname.substring( 1, 10000 ) ).replace(/ /g, '_' );
                // Output result
                $j( '#wpDestFile' ).val( fname );
 
                // Do a destination check
-               $j( '#wpDestFile' ).doDestCheck({
+               $j( '#wpDestFile' ).doDestCheck( {
                        'warn_target': '#wpDestFile-warning'
                } );
        }
-}
\ No newline at end of file
+}
+
+
+js2AddOnloadHook( function() {
+       mwUploadHelper.init();
+} );
\ No newline at end of file