MediaWiki r84778 - Code Review

Jump to: navigation, search
Repository:MediaWiki
Revision:r84777‎ | r84778 (on ViewVC)‎ | r84779 >
Date:23:30, 25 March 2011
Author:dale
Status:ok
Tags:
Comment:
replaced instances of $j. with $. and $j( with $(
Modified paths:

Diff [purge]

Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/tests/Player_Timed_Text.html
@@ -9,10 +9,10 @@
1010 <script type="text/javascript">
1111 $( document ).ready(function(){
1212 $('#inlineTracksTextArea').text(
13 - $j.trim( $('#inlineTracks').html() )
 13+ $.trim( $('#inlineTracks').html() )
1414 );
1515 $('#apiExampleTextArea').text(
16 - $j.trim( $('#apiExample').html() )
 16+ $.trim( $('#apiExample').html() )
1717 )
1818 });
1919
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/TimedText.loader.js
@@ -14,7 +14,7 @@
1515 // includes timedText tracks.
1616 $( mw ).bind( 'EmbedPlayerUpdateDependencies', function( event, playerElement, classRequest ) {
1717 if( mw.isTimedTextSupported( playerElement ) ) {
18 - classRequest = $j.merge( classRequest, ['mw.TimedText'] );
 18+ classRequest = $.merge( classRequest, ['mw.TimedText'] );
1919 }
2020 } );
2121
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js
@@ -641,18 +641,18 @@
642642 // Show text menu item ( if there are sources)
643643 if( _this.textSources.length != 0 ) {
644644 $menu.append(
645 - $j.getLineItem( gM( 'mwe-timedtext-choose-text'), 'comment' ).append(
 645+ $.getLineItem( gM( 'mwe-timedtext-choose-text'), 'comment' ).append(
646646 _this.getLanguageMenu()
647647 ),
648648 // Layout Menu option
649 - $j.getLineItem( gM( 'mwe-timedtext-layout' ), 'image' ).append(
 649+ $.getLineItem( gM( 'mwe-timedtext-layout' ), 'image' ).append(
650650 _this.getLayoutMenu()
651651 )
652652 );
653653 } else {
654654 // Add a link to request timed text for this clip:
655655 $menu.append(
656 - $j.getLineItem( gM( 'mwe-timedtext-request-subs'), 'comment', function(){
 656+ $.getLineItem( gM( 'mwe-timedtext-request-subs'), 'comment', function(){
657657 _this.getAddSubRequest();
658658 })
659659 );
@@ -786,7 +786,7 @@
787787 */
788788 getLiAddText: function() {
789789 var _this = this;
790 - return $j.getLineItem( gM( 'mwe-timedtext-upload-timed-text'), 'script', function() {
 790+ return $.getLineItem( gM( 'mwe-timedtext-upload-timed-text'), 'script', function() {
791791 _this.showTimedTextEditUI( 'add' );
792792 } );
793793 },
@@ -801,14 +801,14 @@
802802 var source_icon = ( this.isSourceEnabled( source ) )? 'bullet' : 'radio-on';
803803
804804 if( source.title ) {
805 - return $j.getLineItem( source.title, source_icon, function() {
 805+ return $.getLineItem( source.title, source_icon, function() {
806806 _this.selectTextSource( source );
807807 });
808808 }
809809 if( source.srclang ) {
810810 var langKey = source.srclang.toLowerCase();
811811 var cat = gM('mwe-timedtext-key-language', langKey, _this.getLanguageName ( langKey ) );
812 - return $j.getLineItem(
 812+ return $.getLineItem(
813813 gM('mwe-timedtext-key-language', langKey, _this.getLanguageName ( langKey ) ),
814814 source_icon,
815815 function() {
@@ -847,10 +847,10 @@
848848 layoutOptions.push( 'off' );
849849
850850 $ul = $('<ul>');
851 - $j.each( layoutOptions, function( na, layoutMode ) {
 851+ $.each( layoutOptions, function( na, layoutMode ) {
852852 var icon = ( _this.config.layout == layoutMode ) ? 'bullet' : 'radio-on';
853853 $ul.append(
854 - $j.getLineItem(
 854+ $.getLineItem(
855855 gM( 'mwe-timedtext-layout-' + layoutMode),
856856 icon,
857857 function() {
@@ -992,7 +992,7 @@
993993 }
994994 // Append a cat menu item for each category list
995995 $langMenu.append(
996 - $j.getLineItem( gM( 'mwe-timedtext-textcat-' + catKey.toLowerCase() ) ).append(
 996+ $.getLineItem( gM( 'mwe-timedtext-textcat-' + catKey.toLowerCase() ) ).append(
997997 $catChildren
998998 )
999999 );
@@ -1251,7 +1251,7 @@
12521252 mw.log("Error: cant load crossDomain src:" + this.getSrc() );
12531253 return ;
12541254 }
1255 - $j.get( this.getSrc(), function( data ) {
 1255+ $.get( this.getSrc(), function( data ) {
12561256 // Parse and load captions:
12571257 _this.captions = handler( data );
12581258 mw.log("mw.TimedText:: loaded from srt file: " + _this.captions.length + ' captions');
@@ -1333,7 +1333,7 @@
13341334 (parseInt(m[6], 10) * 60) +
13351335 (parseInt(m[7], 10)) +
13361336 endMs,
1337 - 'content': $j.trim( m[9] )
 1337+ 'content': $.trim( m[9] )
13381338 });
13391339 return true;
13401340 }
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedTextEdit.js
@@ -225,7 +225,7 @@
226226 }
227227 }),
228228 // Get a jQuery button object with language menu:
229 - $j.button( {
 229+ $.button( {
230230 'style': { 'float' : 'left' },
231231 'class': 'language-select-btn',
232232 'text': gM('mwe-timedtext-select-language'),
@@ -302,7 +302,7 @@
303303 .css('clear', 'both'),
304304 $('<br />'),
305305 $('<br />'),
306 - $j.button( {
 306+ $.button( {
307307 'style': { 'float' : 'left' },
308308 'text': gM('mwe-timedtext-upload-text'),
309309 'icon': 'disk'
@@ -408,7 +408,7 @@
409409 },
410410
411411 getLangMenuItem: function( langKey , source_icon) {
412 - return $j.getLineItem(
 412+ return $.getLineItem(
413413 langKey + ' - ' + mw.Language.names[ langKey ],
414414 source_icon,
415415 function() {
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/tests/Player_Native_Bindings.html
@@ -184,7 +184,7 @@
185185
186186 // note we should do a complete event maping:
187187 // var playerEvents = ['play', 'pause', 'seeking', 'seeked' ];
188 - // $j.each(playerEvents, function( na, eventName ){
 188+ // $.each(playerEvents, function( na, eventName ){
189189 // $('#myVid').bind(eventName, function(){
190190 // $('#playerLog').append( eventName + "\n");
191191 });
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/MediaElement.js
@@ -62,7 +62,7 @@
6363 */
6464 updateSourceTimes: function( start_npt, end_npt ) {
6565 var _this = this;
66 - $j.each( this.sources, function( inx, mediaSource ) {
 66+ $.each( this.sources, function( inx, mediaSource ) {
6767 mediaSource.updateSrcTime( start_npt, end_npt );
6868 } );
6969 },
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
@@ -420,7 +420,7 @@
421421 // Make sure the video tag was not generated by our library:
422422 if( $( playerElement ).hasClass( 'nativeEmbedPlayerPid' ) ){
423423 $('#loadingSpinner_' + $( playerElement ).attr('id') ).remove();
424 - mw.log( 'EmbedPlayer::$j.embedPlayer skip embedPlayer gennerated video: ' + playerElement );
 424+ mw.log( 'EmbedPlayer::$.embedPlayer skip embedPlayer gennerated video: ' + playerElement );
425425 } else {
426426 addedToPlayerManager = true;
427427 // Add the player
@@ -1659,7 +1659,7 @@
16601660 if( this.duration ) {
16611661 params['data-durationhint'] = parseFloat( this.duration );
16621662 }
1663 - iframeUrl += $j.param( params );
 1663+ iframeUrl += $.param( params );
16641664 return iframeUrl;
16651665 },
16661666
@@ -1830,7 +1830,7 @@
18311831 // special per browser check for autoTrigger events
18321832 // ideally jQuery would not have this inconsistency.
18331833 doMethodsAutoTrigger: function(){
1834 - if( $j.browser.mozilla && ! mw.versionIsAtLeast('2.0', $j.browser.version ) ){
 1834+ if( $.browser.mozilla && ! mw.versionIsAtLeast('2.0', $.browser.version ) ){
18351835 return true;
18361836 }
18371837 return false;
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
@@ -73,7 +73,7 @@
7474 if ( mw['PlayerSkin' + skinClass ]) {
7575
7676 // Clone as to not override prototype with the skin config
77 - var _this = $j.extend( true, { }, this, mw['PlayerSkin' + skinClass ] );
 77+ var _this = $.extend( true, { }, this, mw['PlayerSkin' + skinClass ] );
7878 return _this;
7979 }
8080 // Return the controlBuilder Object:
@@ -162,7 +162,7 @@
163163
164164 mw.log( 'PlayerControlsBuilder:: addControlComponents into:' + this.available_width );
165165 // Build the supportedComponets list
166 - this.supportedComponets = $j.extend( this.supportedComponets, embedPlayer.supports );
 166+ this.supportedComponets = $.extend( this.supportedComponets, embedPlayer.supports );
167167
168168 $( embedPlayer ).trigger( 'addControlBarComponent', this);
169169
@@ -596,7 +596,7 @@
597597 });
598598
599599 // Restore absolute layout of parents:
600 - $j.each( _this.parentsAbsolute, function( na, element ){
 600+ $.each( _this.parentsAbsolute, function( na, element ){
601601 $( element ).css( 'position', 'absolute' );
602602 } );
603603 _this.parentsAbsolute = null;
@@ -714,7 +714,7 @@
715715 }
716716
717717 // Do png fix for ie6
718 - if ( $j.browser.msie && $j.browser.version <= 6 ) {
 718+ if ( $.browser.msie && $.browser.version <= 6 ) {
719719 $( '#' + embedPlayer.id + ' .play-btn-large' ).pngFix();
720720 }
721721
@@ -967,7 +967,7 @@
968968 .click( function() {
969969 mw.log("WarningBindinng:: set " + preferenceId + ' to hidewarning ' );
970970 // Set up a cookie for 30 days:
971 - $j.cookie( preferenceId, 'hidewarning', { expires: 30 } );
 971+ $.cookie( preferenceId, 'hidewarning', { expires: 30 } );
972972 // Set the current instance
973973 mw.setConfig( preferenceId, false );
974974 $( '#warningOverlay_' + embedPlayer.id ).fadeOut( 'slow' );
@@ -991,8 +991,8 @@
992992 }
993993
994994 // Check the global config before showing the warning
995 - if ( mw.getConfig( preferenceId ) === true && $j.cookie( preferenceId ) != 'hidewarning' ){
996 - mw.log("WarningBindinng:: show warning " + mw.getConfig( preferenceId ) + ' cookie: '+ $j.cookie( preferenceId ) + 'typeof:' + typeof $j.cookie( preferenceId ));
 995+ if ( mw.getConfig( preferenceId ) === true && $.cookie( preferenceId ) != 'hidewarning' ){
 996+ mw.log("WarningBindinng:: show warning " + mw.getConfig( preferenceId ) + ' cookie: '+ $.cookie( preferenceId ) + 'typeof:' + typeof $.cookie( preferenceId ));
997997 $targetWarning.fadeIn( 'slow' );
998998 };
999999 },
@@ -1127,7 +1127,7 @@
11281128 optionMenuItems: {
11291129 // Player select menu item
11301130 'playerSelect': function( ctrlObj ){
1131 - return $j.getLineItem(
 1131+ return $.getLineItem(
11321132 gM( 'mwe-embedplayer-choose_player' ),
11331133 'gear',
11341134 function( ) {
@@ -1140,7 +1140,7 @@
11411141
11421142 // Download the file menu
11431143 'download': function( ctrlObj ) {
1144 - return $j.getLineItem(
 1144+ return $.getLineItem(
11451145 gM( 'mwe-embedplayer-download' ),
11461146 'disk',
11471147 function( ) {
@@ -1156,7 +1156,7 @@
11571157
11581158 // Share the video menu
11591159 'share': function( ctrlObj ) {
1160 - return $j.getLineItem(
 1160+ return $.getLineItem(
11611161 gM( 'mwe-embedplayer-share' ),
11621162 'mail-closed',
11631163 function( ) {
@@ -1169,7 +1169,7 @@
11701170 },
11711171
11721172 'aboutPlayerLibrary' : function( ctrlObj ){
1173 - return $j.getLineItem(
 1173+ return $.getLineItem(
11741174 gM( 'mwe-embedplayer-about-library' ),
11751175 'info',
11761176 function( ) {
@@ -1407,7 +1407,7 @@
14081408 .text( gM( 'mwe-embedplayer-choose_player' ) )
14091409 );
14101410
1411 - $j.each( embedPlayer.mediaElement.getPlayableSources(), function( sourceIndex, source ) {
 1411+ $.each( embedPlayer.mediaElement.getPlayableSources(), function( sourceIndex, source ) {
14121412
14131413 var isPlayable = (typeof mw.EmbedTypes.getMediaPlayers().defaultPlayer( source.getMIMEType() ) == 'object' );
14141414 var is_selected = ( source.getSrc() == embedPlayer.mediaElement.selectedSource.getSrc() );
@@ -1543,7 +1543,7 @@
15441544
15451545 var $mediaList = $( '<ul />' );
15461546 var $textList = $( '<ul />' );
1547 - $j.each( embedPlayer.mediaElement.getSources(), function( index, source ) {
 1547+ $.each( embedPlayer.mediaElement.getSources(), function( index, source ) {
15481548 if( source.getSrc() ) {
15491549 mw.log("PlayerControlBuilder::showDownloadWithSources:: Add src: " + source.getTitle() );
15501550 var $dl_line = $( '<li />').append(
@@ -1595,7 +1595,7 @@
15961596 var _this = this;
15971597 var embedPlayer = this.embedPlayer;
15981598 // for each source with "native playback"
1599 - $sourceMenu = $j('<ul />');
 1599+ $sourceMenu = $('<ul />');
16001600
16011601 // local function to closure the source variable scope:
16021602 function addToSourceMenu( source ){
@@ -1624,7 +1624,7 @@
16251625 })
16261626 )
16271627 }
1628 - $j.each( this.embedPlayer.mediaElement.getPlayableSources(), function( sourceIndex, source ) {
 1628+ $.each( this.embedPlayer.mediaElement.getPlayableSources(), function( sourceIndex, source ) {
16291629 // Output the player select code:
16301630 var supportingPlayers = mw.EmbedTypes.getMediaPlayers().getMIMETypePlayers( source.getMIMEType() );
16311631 for ( var i = 0; i < supportingPlayers.length ; i++ ) {
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerJava.js
@@ -65,7 +65,7 @@
6666
6767 // Wrap it in an iframe to avoid hanging the event thread in FF 2/3 and similar
6868 // NOTE: This breaks reference to the applet so disabled for now:
69 - /*if ( $j.browser.mozilla ) {
 69+ /*if ( $.browser.mozilla ) {
7070 var iframe = document.createElement( 'iframe' );
7171 iframe.setAttribute( 'width', this.getWidth() );
7272 iframe.setAttribute( 'height', this.getHeight() );
@@ -206,7 +206,7 @@
207207 this.playerElement = $( '#' + this.pid ).get( 0 );
208208 //this.playerElement = document.applets[ 0 ];
209209 // NOTE we are currently not using the iframe embed method:
210 - //if ( $j.browser.mozilla ) {
 210+ //if ( $.browser.mozilla ) {
211211 // this.playerElement = $('#cframe_' + this.id).contents().find( '#' + this.pid );
212212 //} else {
213213 // this.playerElement = $( '#' + this.pid ).get( 0 );
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/MediaPlayers.js
@@ -89,7 +89,7 @@
9090 var mimePlayers = new Array();
9191 var _this = this;
9292 if ( this.defaultPlayers[mimeType] ) {
93 - $j.each( this.defaultPlayers[ mimeType ], function( d, lib ) {
 93+ $.each( this.defaultPlayers[ mimeType ], function( d, lib ) {
9494 var library = _this.defaultPlayers[ mimeType ][ d ];
9595 for ( var i = 0; i < _this.players.length; i++ ) {
9696 if ( _this.players[i].library == library && _this.players[i].supportsMIMEType( mimeType ) ) {
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/iframeApi/mw.IFramePlayerApiClient.js
@@ -39,18 +39,18 @@
4040 // Allow modules to extend the list of iframeExported bindings
4141 $( mw ).trigger( 'AddIframePlayerMethods', [ this.exportedMethods ]);
4242
43 - $j.each( this.exportedMethods, function(na, method){
 43+ $.each( this.exportedMethods, function(na, method){
4444 _this.playerProxy[ method ] = function(){
4545 _this.postMessage( {
4646 'method' : method,
47 - 'args' : $j.makeArray( arguments )
 47+ 'args' : $.makeArray( arguments )
4848 } );
4949 };
5050 });
5151 },
5252 'addPlayerReciveApi': function(){
5353 var _this = this;
54 - $j.receiveMessage( function( event ){
 54+ $.receiveMessage( function( event ){
5555 _this.hanldeReciveMsg( event );
5656 }, this.iframeServer);
5757 },
@@ -65,7 +65,7 @@
6666 };
6767
6868 // Bind orientation change to resize player ( if fullscreen )
69 - $j(window).bind( 'orientationchange', function(e){
 69+ $(window).bind( 'orientationchange', function(e){
7070 if( _this.inFullScreenMode ){
7171 doFullscreen();
7272 }
@@ -151,7 +151,7 @@
152152 /*mw.log( "IFramePlayerApiClient:: postMessage(): " + JSON.stringify( msgObject ) +
153153 ' iframe: ' + this.iframe + ' cw:' + this.iframe.contentWindow +
154154 ' src: ' + mw.absoluteUrl( $( this.iframe ).attr('src') ) );*/
155 - $j.postMessage(
 155+ $.postMessage(
156156 JSON.stringify( msgObject ),
157157 mw.absoluteUrl( $( this.iframe ).attr('src') ),
158158 this.iframe.contentWindow
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/iframeApi/mw.IFramePlayerApiServer.js
@@ -67,7 +67,7 @@
6868 'addIframeListener': function(){
6969 var _this = this;
7070 mw.log('IFramePlayerApiServer::_addIframeListener');
71 - $j.receiveMessage( function( event ) {
 71+ $.receiveMessage( function( event ) {
7272 _this.hanldeMsg( event );
7373 }, this.getParentUrl() );
7474 },
@@ -96,9 +96,9 @@
9797 _this.sendPlayerAttributes();
9898 })
9999
100 - $j.each( this.exportedBindings, function( inx, bindName ){
 100+ $.each( this.exportedBindings, function( inx, bindName ){
101101 $( _this.embedPlayer ).bind( bindName, function( event ){
102 - var argSet = $j.makeArray( arguments );
 102+ var argSet = $.makeArray( arguments );
103103 // remove the event from the arg set
104104 argSet.shift();
105105 // protect against a jQuery event getting past as an arguments:
@@ -143,7 +143,7 @@
144144 return ;
145145 }
146146 // By default postMessage sends the message to the parent frame:
147 - $j.postMessage(
 147+ $.postMessage(
148148 messageString,
149149 this.getParentUrl(),
150150 window.parent
@@ -172,7 +172,7 @@
173173
174174 // Call a method:
175175 if( msgObject.method && this.embedPlayer[ msgObject.method ] ){
176 - this.embedPlayer[ msgObject.method ].apply( this.embedPlayer, $j.makeArray( msgObject.args ) );
 176+ this.embedPlayer[ msgObject.method ].apply( this.embedPlayer, $.makeArray( msgObject.args ) );
177177 }
178178 // Update a attribute
179179 if( typeof msgObject.attrName != 'undefined' && typeof msgObject.attrValue != 'undefined' ){
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
@@ -193,10 +193,10 @@
194194 mw.log( " Error: applyMediaElementBindings without player elemnet");
195195 return ;
196196 }
197 - $j.each( _this.nativeEvents, function( inx, eventName ){
 197+ $.each( _this.nativeEvents, function( inx, eventName ){
198198 $( vid ).bind( eventName , function(){
199199 if( _this._propagateEvents ){
200 - var argArray = $j.makeArray( arguments );
 200+ var argArray = $.makeArray( arguments );
201201 // Check if there is local handler:
202202 if( _this['on' + eventName ] ){
203203 _this['on' + eventName ].apply( _this, argArray);
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerKplayer.js
@@ -120,7 +120,7 @@
121121 };
122122
123123 if (this.playerElement && this.playerElement.addJsListener) {
124 - $j.each( bindEventMap, function( bindName, localMethod ) {
 124+ $.each( bindEventMap, function( bindName, localMethod ) {
125125 _this.bindPlayerFunction(bindName, localMethod);
126126 } );
127127 // Start the monitor
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
@@ -62,7 +62,7 @@
6363
6464 }
6565 // Some browsers filter out duplicate mime types, hiding some plugins
66 - var uniqueMimesOnly = $j.browser.opera || $j.browser.safari;
 66+ var uniqueMimesOnly = $.browser.opera || $.browser.safari;
6767
6868 // Opera will switch off javaEnabled in preferences if java can't be
6969 // found. And it doesn't register an application/x-java-applet mime type like
@@ -72,7 +72,7 @@
7373 }
7474
7575 // ActiveX plugins
76 - if ( $j.browser.msie ) {
 76+ if ( $.browser.msie ) {
7777 // check for flash
7878 if ( this.testActiveX( 'ShockwaveFlash.ShockwaveFlash' ) ) {
7979 this.mediaPlayers.addPlayer( kplayer );

Status & tagging log

  • 21:19, 30 April 2011 Catrope (talk | contribs) changed the status of r84778 [removed: new added: ok]