| Index: branches/js2-work/phase3/js2/js2stopgap.js |
| — | — | @@ -9459,6 +9459,16 @@ |
| 9460 | 9460 | * the JavaScript space. As such, if we get to the point of merging that stuff |
| 9461 | 9461 | * into the main branch this code will be uneeded and probably cause issues. |
| 9462 | 9462 | */ |
| | 9463 | + |
| | 9464 | +/** |
| | 9465 | + * Mimics the no-conflict method used by the js2 stuff |
| | 9466 | +*/ |
| | 9467 | +$j = jQuery.noConflict(); |
| | 9468 | + |
| | 9469 | +if( !mw ) |
| | 9470 | + mw = { }; |
| | 9471 | + |
| | 9472 | + |
| 9463 | 9473 | // Creates global message object if not already in existence |
| 9464 | 9474 | if ( !gMsg ) var gMsg = {}; |
| 9465 | 9475 | /** |
| — | — | @@ -9493,14 +9503,7 @@ |
| 9494 | 9504 | return '[' + key + ']'; |
| 9495 | 9505 | } |
| 9496 | 9506 | } |
| 9497 | | -/** |
| 9498 | | - * Mimics the no-conflict method used by the js2 stuff |
| 9499 | | - */ |
| 9500 | | -$j = jQuery.noConflict(); |
| 9501 | 9507 | |
| 9502 | | -if( !mw ) |
| 9503 | | - mw = { }; |
| 9504 | | - |
| 9505 | 9508 | /** |
| 9506 | 9509 | * Provides js2 compatible onload hook |
| 9507 | 9510 | * @param func Function to call when ready |
| Index: branches/js2-work/phase3/js2/editPage.js |
| — | — | @@ -23,7 +23,7 @@ |
| 24 | 24 | mw.addOnloadHook( function() { |
| 25 | 25 | js_log( "edit page mw.addOnloadHook::" ); |
| 26 | 26 | var amwConf = $j.extend( true, defaultAddMediaConfig, mwAddMediaConfig ); |
| 27 | | - // kind of tricky, it would be nice to use run on ready "loader" call here |
| | 27 | + // Kind of tricky, it would be nice to use run on ready "loader" call here |
| 28 | 28 | var didWikiEditorBind = false; |
| 29 | 29 | |
| 30 | 30 | // Set-up the drag drop binding (will only work for html5 upload browsers) |