Index: trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php |
— | — | @@ -302,7 +302,7 @@ |
303 | 303 | */ |
304 | 304 | function mvfAutoAllPageHeader() { |
305 | 305 | global $mvgScriptPath, $wgJsMimeType, $wgOut, $mvExtraHeader, $wgTitle; |
306 | | - global $mvgJSDebug, $wgEnableScriptLoader, $wgRequest, $wgEnableJS2system; |
| 306 | + global $mvgJSDebug, $wgEnableScriptLoader, $wgRequest; |
307 | 307 | |
308 | 308 | $mvgScriptPath = htmlspecialchars( $mvgScriptPath ); |
309 | 309 | $wgJsMimeType = htmlspecialchars( $wgJsMimeType ) ; |
— | — | @@ -313,12 +313,11 @@ |
314 | 314 | //@@todo should read form svn version file info |
315 | 315 | $unique_req_param = MV_VERSION; |
316 | 316 | } |
317 | | - if( $wgEnableJS2system ){ |
318 | | - $wgOut->addScriptClass( "mv_allpages" ); |
319 | | - $wgOut->addScriptClass( "mv_search" ); |
320 | | - } |
321 | 317 | |
| 318 | + $wgOut->addScriptClass( "mv_allpages" ); |
| 319 | + $wgOut->addScriptClass( "mv_search" ); |
322 | 320 | |
| 321 | + |
323 | 322 | $mvCssUrl = $mvgScriptPath . '/skins/mv_custom.css'; |
324 | 323 | $wgOut->addLink( array( |
325 | 324 | 'rel' => 'stylesheet', |
Index: trunk/extensions/MetavidWiki/languages/MV_Messages.php |
— | — | @@ -14,7 +14,7 @@ |
15 | 15 | |
16 | 16 | 'mv-desc' => '[http://metavid.org/wiki/MetaVidWiki_Software Video Metadata Editor & Media Search]', |
17 | 17 | |
18 | | - # javascript mappings have moved to /js2/mwEmbed/languages (so mwEmbed is more self contained) |
| 18 | + # javascript mappings have moved to /js/mwEmbed/languages (so mwEmbed is more self contained) |
19 | 19 | |
20 | 20 | # normal php based msg keys: |
21 | 21 | 'metavid' => 'MetaVid page', |
— | — | @@ -5480,7 +5480,7 @@ |
5481 | 5481 | 'mv_file_with_same_desc' => 'Fähler: Mer han ald en Dahteshtrohm-Dattei met dämsellve Beschrievungsschlössel: <i>$1</i>', |
5482 | 5482 | 'mv_updated_stream_files' => 'Dahtesaz övver Dahteshtrohm-Datteije op der neuste Shtand jebraat', |
5483 | 5483 | 'mv_removed_file_stream' => 'Dahteshtrohm-Dattei „$1“ fottjeschmeße', |
5484 | | - 'mv_missing_stream_text' => 'Dä jewönschte |
| 5484 | + 'mv_missing_stream_text' => 'Dä jewönschte |
5485 | 5485 | stream |
5486 | 5486 | <b>$1</b> es nit ze han.<br /> |
5487 | 5487 | Looer ens op dä <a href="$2">Leß met de |
— | — | @@ -5563,7 +5563,7 @@ |
5564 | 5564 | 'mv_mvd_linkback' => 'Deil ussem Daateshtrohm $1<br /> |
5565 | 5565 | Jangk op di Aansech als Dahteshtrohm: $2', |
5566 | 5566 | 'mvBadMVDtitle' => 'de Zoot fählt, der Dahteshtrohm fählt, udder et Fomaat vun de Zick eß Jedreße', |
5567 | | - 'mvMVDFormat' => "De MVD Tittelle sullte esu opjebout sin: |
| 5567 | + 'mvMVDFormat' => "De MVD Tittelle sullte esu opjebout sin: |
5568 | 5568 | <code>mvd:''Zoot'':''Dahteshtrohm_Name''/''Aanfangs_Zick''/''Engk_Zick''</code>", |
5569 | 5569 | 'mv_play' => 'Afshpelle', |
5570 | 5570 | 'mv_edit' => 'Ändere', |
Index: trunk/extensions/MetavidWiki/skins/mv_search.js |
— | — | @@ -1,4 +1,4 @@ |
2 | | -mw.addOnloadHook( mv_pre_setup_search); |
| 2 | +mw.ready( mv_pre_setup_search); |
3 | 3 | var mvSearchSetupFlag =false; |
4 | 4 | var maxFilters = 8; |
5 | 5 | var mv_search_action=''; |
Index: trunk/extensions/MetavidWiki/skins/mv_allpages.js |
— | — | @@ -14,7 +14,7 @@ |
15 | 15 | var wgScriptPath = '/w'; |
16 | 16 | |
17 | 17 | var gMvd={}; |
18 | | -mw.addOnloadHook(function(){ |
| 18 | +mw.ready(function(){ |
19 | 19 | mw.log("mv embed done loading now setup 'all page'"); |
20 | 20 | //make sure we have jQuery and any base required libs: |
21 | 21 | mw.log('allpage_ did jquery check'); |
Index: trunk/extensions/MetavidWiki/skins/mv_stream.js |
— | — | @@ -49,7 +49,7 @@ |
50 | 50 | |
51 | 51 | //@@todo context sensitive init scripts |
52 | 52 | //init the interface on page load |
53 | | -mw.addOnloadHook( function(){ |
| 53 | +mw.ready( function(){ |
54 | 54 | mw.log( 'f:mv_load_interface_libs'); |
55 | 55 | mw.log( 'load stream js'); |
56 | 56 | //load some additional plugins/components: |