* minor code clean up for remote add-media-wizard

diff --git a/js2/editPage.js b/js2/editPage.js
index 36d2dd5..28279fe 100644 (file)
--- a/js2/editPage.js
+++ b/js2/editPage.js
@@ -23,13 +23,14 @@ var defaultAddMediaConfig = {
 js2AddOnloadHook( function() {
        var amwConf = $j.extend( true, defaultAddMediaConfig, mwAddMediaConfig );
        // kind of tricky, it would be nice to use run on ready "loader" call here
-       var didWikiEditorBind = false;
+       var didWikiEditorBind = false;  
        
        //setup the drag drop binding (will only work for html5 upload browsers) 
-       //$j( 'textarea#wpTextbox1' ).dragFileUpload();
+       //$j('textarea#wpTextbox1').dragFileUpload();
        
        //set up the add-media-wizard binding: 
        if( typeof $j.wikiEditor != 'undefined' ) {
+                       //the below seems to be broken :(
                        $j( 'textarea#wpTextbox1' ).bind( 'wikiEditor-toolbar-buildSection-main',
                    function( e, section ) {
                        didWikiEditorBind = true;
@@ -46,19 +47,20 @@ js2AddOnloadHook( function() {
                );
        }               
        //add to old toolbar if wikiEditor did not remove '#toolbar' from the page:    
-       setTimeout(function(){                  
+       setTimeout(function(){
                if( $j('#btn-add-media-wiz').length == 0 && $j( '#toolbar' ).length != 0 ){
+                       js_log(' old toolbar bind:');
                        $j( '#toolbar' ).append( '<img style="cursor:pointer" id="btn-add-media-wiz" src="' +
                                mv_skin_img_path + 'Button_add_media.png">' );
                        $j( '#btn-add-media-wiz' ).addMediaWiz(
                                amwConf
                        );
                }else{
+                       js_log('failed to bind via build section bind via target:');
                        //make sure the wikieditor got binded: 
                        if( !didWikiEditorBind )
-                               $j(".tool [rel='file']").addMediaWiz( amwConf );
+                               $j(".tool[rel='file']").unbind().addMediaWiz( amwConf );
                }
        }, 120)
-       //drag drop for editbar: 
-       //$j('textarea#wpTextbox1').dragFileUpload();
+
 });

diff --git a/js2/mwEmbed/mv_embed.js b/js2/mwEmbed/mv_embed.js
index 7fc146d..452ded6 100644 (file)
--- a/js2/mwEmbed/mv_embed.js
+++ b/js2/mwEmbed/mv_embed.js
@@ -1175,8 +1175,8 @@ function mwdomReady( force ) {
 }
 
 //js2AddOnloadHook: ensure jQuery and the DOM are ready
-function js2AddOnloadHook( func ) {
-       //js_log('js2AddOnloadHook:: jquery:' + typeof window.jQuery + ' $j: ' + typeof $j);    
+function js2AddOnloadHook( func ) {    
+       js_log('js2AddOnloadHook:: jquery:' +func);     
        //check for jQuery then add the load event (to run after video tag rewrites (if present) 
        mvJsLoader.jQueryCheck( function() {
                if( mvJsLoader.doneReadyEvents ) {

diff --git a/js2/remoteMwEmbed.js b/js2/remoteMwEmbed.js
index 83db985..78275c8 100644 (file)
--- a/js2/remoteMwEmbed.js
+++ b/js2/remoteMwEmbed.js
@@ -10,7 +10,7 @@ var mwRemoteVersion = '1.02';
 reqArguments = urlparts[1];
 
 //setup up request Params: 
-var reqParts = urlparts[1].split('&');
+var reqParts = urlparts[1].substring(1).split('&');
 var reqParam={};
 for(var i=0;i< reqParts.length; i++){
        var p = reqParts[i].split('=');
@@ -28,7 +28,7 @@ addOnloadHook( function(){
 function doPageSpecificRewrite() {
        // Add media wizard
        if( wgAction == 'edit' || wgAction == 'submit' ) {
-               load_mv_embed( function() {                     
+               load_mv_embed( function() {     
                        loadExternalJs( mwEmbedHostPath + '/editPage.js' + reqArguments );
                } );
        }
@@ -177,8 +177,12 @@ function load_mv_embed( callback ) {
                        }else{
                                rurl+='&urid=' + mwRemoteVersion;
                        }
+                       if(reqParam['debug'])
+                               rurl+='&debug=true';
+
                        if(reqParam['uselang'] )
                                rurl+='&uselang=' + reqParam['uselang'];
+                               
                        //do import url:  
                        importScriptURI(rurl); 
                }else{