| Index: branches/js2-work/phase3/js2/mwEmbed/mwEmbed.js |
| — | — | @@ -1615,7 +1615,7 @@ |
| 1616 | 1616 | var mwpath = null; |
| 1617 | 1617 | |
| 1618 | 1618 | // Check for direct include of the mwEmbed.js |
| 1619 | | - if ( src.indexOf( 'mwEmbed.js' ) !== -1 ) { |
| | 1619 | + if ( src.indexOf( 'mwEmbed.js' ) !== -1 && src.indexOf( 'MediaWiki:Gadget') == -1) { |
| 1620 | 1620 | mwpath = src.substr( 0, src.indexOf( 'mwEmbed.js' ) ); |
| 1621 | 1621 | } |
| 1622 | 1622 | |
| Index: branches/js2-work/phase3/js2/mwEmbed/jsScriptLoader.php |
| — | — | @@ -468,7 +468,7 @@ |
| 469 | 469 | } |
| 470 | 470 | } |
| 471 | 471 | |
| 472 | | - function getInlineMesgFromClass( $class ){ |
| | 472 | + function getInlineMsgFromClass( $class ){ |
| 473 | 473 | $jsmsg = $this->getMsgKeysFromClass( $class ); |
| 474 | 474 | if( $jsmsg ){ |
| 475 | 475 | self::getMsgKeys ( $jsmsg ); |
| Index: branches/js2-work/phase3/js2/remoteMwEmbed.js |
| — | — | @@ -5,7 +5,7 @@ |
| 6 | 6 | |
| 7 | 7 | var urlparts = getRemoteEmbedPath(); |
| 8 | 8 | var mwEmbedHostPath = urlparts[0]; |
| 9 | | -var mwRemoteVersion = '1.1b'; |
| | 9 | +var mwRemoteVersion = '1.1c'; |
| 10 | 10 | var mwUseScriptLoader = true; |
| 11 | 11 | |
| 12 | 12 | // Setup up request Params: |
| — | — | @@ -29,8 +29,7 @@ |
| 30 | 30 | |
| 31 | 31 | function doPageSpecificRewrite() { |
| 32 | 32 | // Add media wizard |
| 33 | | - if ( wgAction == 'edit' || wgAction == 'submit' ) { |
| 34 | | - var jsSetEdit = |
| | 33 | + if ( wgAction == 'edit' || wgAction == 'submit' ) { |
| 35 | 34 | loadMwEmbed( [ |
| 36 | 35 | 'remoteSearchDriver', |
| 37 | 36 | '$j.fn.textSelection', |