r61701 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r61700‎ | r61701 | r61702 >
Date:00:13, 30 January 2010
Author:dale
Status:deferred
Tags:
Comment:
* some metavidWiki js2 fixes ( incomplete )
Modified paths:
  • /trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php (modified) (history)
  • /trunk/extensions/MetavidWiki/languages/MV_Messages.php (modified) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_allpages.js (modified) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_search.js (modified) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_stream.js (modified) (history)

Diff [purge]

Index: trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php
@@ -302,7 +302,7 @@
303303 */
304304 function mvfAutoAllPageHeader() {
305305 global $mvgScriptPath, $wgJsMimeType, $wgOut, $mvExtraHeader, $wgTitle;
306 - global $mvgJSDebug, $wgEnableScriptLoader, $wgRequest, $wgEnableJS2system;
 306+ global $mvgJSDebug, $wgEnableScriptLoader, $wgRequest;
307307
308308 $mvgScriptPath = htmlspecialchars( $mvgScriptPath );
309309 $wgJsMimeType = htmlspecialchars( $wgJsMimeType ) ;
@@ -313,12 +313,11 @@
314314 //@@todo should read form svn version file info
315315 $unique_req_param = MV_VERSION;
316316 }
317 - if( $wgEnableJS2system ){
318 - $wgOut->addScriptClass( "mv_allpages" );
319 - $wgOut->addScriptClass( "mv_search" );
320 - }
321317
 318+ $wgOut->addScriptClass( "mv_allpages" );
 319+ $wgOut->addScriptClass( "mv_search" );
322320
 321+
323322 $mvCssUrl = $mvgScriptPath . '/skins/mv_custom.css';
324323 $wgOut->addLink( array(
325324 'rel' => 'stylesheet',
Index: trunk/extensions/MetavidWiki/languages/MV_Messages.php
@@ -14,7 +14,7 @@
1515
1616 'mv-desc' => '[http://metavid.org/wiki/MetaVidWiki_Software Video Metadata Editor & Media Search]',
1717
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)
1919
2020 # normal php based msg keys:
2121 'metavid' => 'MetaVid page',
@@ -5480,7 +5480,7 @@
54815481 'mv_file_with_same_desc' => 'Fähler: Mer han ald en Dahteshtrohm-Dattei met dämsellve Beschrievungsschlössel: <i>$1</i>',
54825482 'mv_updated_stream_files' => 'Dahtesaz övver Dahteshtrohm-Datteije op der neuste Shtand jebraat',
54835483 '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
54855485 stream
54865486 <b>$1</b> es nit ze han.<br />
54875487 Looer ens op dä <a href="$2">Leß met de
@@ -5563,7 +5563,7 @@
55645564 'mv_mvd_linkback' => 'Deil ussem Daateshtrohm $1<br />
55655565 Jangk op di Aansech als Dahteshtrohm: $2',
55665566 '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:
55685568 <code>mvd:''Zoot'':''Dahteshtrohm_Name''/''Aanfangs_Zick''/''Engk_Zick''</code>",
55695569 'mv_play' => 'Afshpelle',
55705570 '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);
33 var mvSearchSetupFlag =false;
44 var maxFilters = 8;
55 var mv_search_action='';
Index: trunk/extensions/MetavidWiki/skins/mv_allpages.js
@@ -14,7 +14,7 @@
1515 var wgScriptPath = '/w';
1616
1717 var gMvd={};
18 -mw.addOnloadHook(function(){
 18+mw.ready(function(){
1919 mw.log("mv embed done loading now setup 'all page'");
2020 //make sure we have jQuery and any base required libs:
2121 mw.log('allpage_ did jquery check');
Index: trunk/extensions/MetavidWiki/skins/mv_stream.js
@@ -49,7 +49,7 @@
5050
5151 //@@todo context sensitive init scripts
5252 //init the interface on page load
53 -mw.addOnloadHook( function(){
 53+mw.ready( function(){
5454 mw.log( 'f:mv_load_interface_libs');
5555 mw.log( 'load stream js');
5656 //load some additional plugins/components:

Status & tagging log