| Index: branches/MwEmbedStandAlone/skins/common/common.css |
| — | — | @@ -85,7 +85,7 @@ |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | ui-widget-overlay{ |
| 89 | | - background: url("images/ui-bg_diagonals-thick_20_666666_40x40.png") repeat scroll 50% 50% #666666; |
| | 89 | + background: url('images/ui-bg_diagonals-thick_20_666666_40x40.png') repeat scroll 50% 50% #666666; |
| 90 | 90 | opacity:0.5; |
| 91 | 91 | } |
| 92 | 92 | |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js |
| — | — | @@ -2648,14 +2648,18 @@ |
| 2649 | 2649 | // Update the playerElement volume |
| 2650 | 2650 | this.setPlayerElementVolume( percent ); |
| 2651 | 2651 | |
| 2652 | | - mw.log(" setVolume:: " + percent + ' this.volume is: ' + this.volume); |
| | 2652 | + //mw.log(" setVolume:: " + percent + ' this.volume is: ' + this.volume); |
| 2653 | 2653 | }, |
| 2654 | 2654 | |
| 2655 | 2655 | /** |
| 2656 | | - * Updates the interface volume |
| | 2656 | + * Updates the interface volume |
| | 2657 | + * TODO should move to ctrlBuilder |
| | 2658 | + * @param |
| 2657 | 2659 | */ |
| 2658 | 2660 | setInterfaceVolume: function( percent ) { |
| 2659 | | - this.$interface.find( '.volume-slider' ).slider( 'value', percent * 100 ); |
| | 2661 | + if( this.supports[ 'volumeControl' ] ) { |
| | 2662 | + this.$interface.find( '.volume-slider' ).slider( 'value', percent * 100 ); |
| | 2663 | + } |
| 2660 | 2664 | }, |
| 2661 | 2665 | |
| 2662 | 2666 | /** |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/javaEmbed.js |
| — | — | @@ -83,7 +83,7 @@ |
| 84 | 84 | */ |
| 85 | 85 | |
| 86 | 86 | // Start the monitor: |
| 87 | | - this.monitor(); |
| | 87 | + _this.monitor(); |
| 88 | 88 | }, |
| 89 | 89 | |
| 90 | 90 | /** |
| — | — | @@ -187,15 +187,20 @@ |
| 188 | 188 | /** |
| 189 | 189 | * Update the playerElement instance with a pointer to the embed object |
| 190 | 190 | */ |
| 191 | | - getPlayerElement:function() { |
| 192 | | - //this.playerElement = $j( '#' + this.pid ).get( 0 ); |
| 193 | | - this.playerElement = document.applets[ 0 ]; |
| | 191 | + getPlayerElement: function() { |
| | 192 | + if( !$j( '#' + this.pid ).length ) { |
| | 193 | + return false; |
| | 194 | + } |
| | 195 | + //mw.log( 'getPlayerElement::' + this.pid ); |
| | 196 | + this.playerElement = $j( '#' + this.pid ).get( 0 ); |
| | 197 | + //this.playerElement = document.applets[ 0 ]; |
| 194 | 198 | // NOTE we are currently not using the iframe embed method: |
| 195 | 199 | //if ( $j.browser.mozilla ) { |
| 196 | 200 | // this.playerElement = $j('#cframe_' + this.id).contents().find( '#' + this.pid ); |
| 197 | 201 | //} else { |
| 198 | 202 | // this.playerElement = $j( '#' + this.pid ).get( 0 ); |
| 199 | 203 | //} |
| | 204 | + return this.playerElement; |
| 200 | 205 | }, |
| 201 | 206 | |
| 202 | 207 | /** |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/nativeEmbed.js |
| — | — | @@ -68,8 +68,9 @@ |
| 69 | 69 | |
| 70 | 70 | $j( this ).html( |
| 71 | 71 | _this.getNativePlayerHtml() |
| 72 | | - ) |
| 73 | | - // directly run postEmbedJS ( if playerElement is not avaliable it will retry ) |
| | 72 | + ); |
| | 73 | + |
| | 74 | + // Directly run postEmbedJS ( if playerElement is not available it will retry ) |
| 74 | 75 | _this.postEmbedJS(); |
| 75 | 76 | }, |
| 76 | 77 | |
| — | — | @@ -190,6 +191,7 @@ |
| 191 | 192 | |
| 192 | 193 | /** |
| 193 | 194 | * Do a native seek by updating the currentTime |
| | 195 | + * @param {float} percentage Percent to seek to of full time |
| 194 | 196 | */ |
| 195 | 197 | doNativeSeek:function( percentage ) { |
| 196 | 198 | var _this = this; |
| Index: branches/MwEmbedStandAlone/mwEmbed.js |
| — | — | @@ -1961,8 +1961,9 @@ |
| 1962 | 1962 | // Set up mvEmbed utility jQuery bindings |
| 1963 | 1963 | mw.dojQueryBindings(); |
| 1964 | 1964 | |
| 1965 | | - // Speical Hack for condtional jquery ui inclution ( once Usability extension |
| 1966 | | - // registers the jquery.ui skin in mw.sytle this won't be needed: |
| | 1965 | + |
| | 1966 | + // Special Hack for conditional jquery ui inclusion ( once Usability extension |
| | 1967 | + // registers the jquery.ui skin in mw.style this won't be needed: |
| 1967 | 1968 | if( mw.hasJQueryUiCss() ){ |
| 1968 | 1969 | mw.style[ mw.getConfig( 'jQueryUISkin' ) ] = true; |
| 1969 | 1970 | } |
| — | — | @@ -1995,8 +1996,8 @@ |
| 1996 | 1997 | |
| 1997 | 1998 | /** |
| 1998 | 1999 | * Checks for jquery ui css by name jquery-ui-1.7.2.css |
| 1999 | | - * NOTE: this is kind of a hack for usability jquery-ui |
| 2000 | | - * in the future usability should register the class in mw.skin |
| | 2000 | + * NOTE: this is a hack for usability jquery-ui |
| | 2001 | + * in the future usability should register a class in mw.skin |
| 2001 | 2002 | * |
| 2002 | 2003 | * @return true if found, return false if not found |
| 2003 | 2004 | */ |
| — | — | @@ -2004,7 +2005,7 @@ |
| 2005 | 2006 | var hasUiCss = false; |
| 2006 | 2007 | // Load the jQuery ui skin if usability skin not set |
| 2007 | 2008 | $j( 'link' ).each( function( na, linkNode ){ |
| 2008 | | - if( $j( linkNode ).attr( 'href' ).indexOf('jquery-ui-1.7.2.css') != -1 ) { |
| | 2009 | + if( $j( linkNode ).attr( 'href' ).indexOf( 'jquery-ui-1.7.2.css' ) != -1 ) { |
| 2009 | 2010 | hasUiCss = true; |
| 2010 | 2011 | return false; |
| 2011 | 2012 | } |
| — | — | @@ -2250,7 +2251,7 @@ |
| 2251 | 2252 | ' class="ui-state-default ui-corner-all ui-icon_link ' + |
| 2252 | 2253 | className + '"><span class="ui-icon ui-icon-' + iconId + '" ></span>' + |
| 2253 | 2254 | '<span class="btnText">' + msg + '</span></a>'; |
| 2254 | | - } |
| | 2255 | + }; |
| 2255 | 2256 | |
| 2256 | 2257 | // Shortcut to jQuery button ( should replace all btnHtml with button ) |
| 2257 | 2258 | var mw_default_button_options = { |
| — | — | @@ -2265,7 +2266,8 @@ |
| 2266 | 2267 | |
| 2267 | 2268 | // The icon id that precceeds the button link: |
| 2268 | 2269 | 'icon_id' : 'carat-1-n' |
| 2269 | | - } |
| | 2270 | + }; |
| | 2271 | + |
| 2270 | 2272 | $.button = function( options ) { |
| 2271 | 2273 | var options = $j.extend( mw_default_button_options, options); |
| 2272 | 2274 | |
| — | — | @@ -2288,7 +2290,7 @@ |
| 2289 | 2291 | .text( options.text ) |
| 2290 | 2292 | ); |
| 2291 | 2293 | return $btn; |
| 2292 | | - } |
| | 2294 | + }; |
| 2293 | 2295 | |
| 2294 | 2296 | // Shortcut to bind hover state |
| 2295 | 2297 | $.fn.buttonHover = function() { |
| — | — | @@ -2301,7 +2303,7 @@ |
| 2302 | 2304 | } |
| 2303 | 2305 | ) |
| 2304 | 2306 | return this; |
| 2305 | | - } |
| | 2307 | + }; |
| 2306 | 2308 | |
| 2307 | 2309 | /** |
| 2308 | 2310 | * Resize a dialog to fit the window |
| — | — | @@ -2322,9 +2324,9 @@ |
| 2323 | 2325 | 'right':'0px', |
| 2324 | 2326 | 'bottom':'0px' |
| 2325 | 2327 | } ); |
| 2326 | | - } |
| | 2328 | + }; |
| 2327 | 2329 | |
| 2328 | | - } )( jQuery ); |
| | 2330 | + } )( $j ); |
| 2329 | 2331 | } |
| 2330 | 2332 | |
| 2331 | 2333 | } )( window.mw ); |
| — | — | @@ -2443,4 +2445,4 @@ |
| 2444 | 2446 | if( dollarFlag ) { |
| 2445 | 2447 | window[ '$' ] = jQuery.noConflict(); |
| 2446 | 2448 | } |
| 2447 | | -} |
| \ No newline at end of file |
| | 2449 | +} |
| Index: branches/MwEmbedStandAlone/remotes/mediaWiki.js |
| — | — | @@ -4,7 +4,7 @@ |
| 5 | 5 | */ |
| 6 | 6 | var urlparts = getRemoteEmbedPath(); |
| 7 | 7 | var mwEmbedHostPath = urlparts[0]; |
| 8 | | -var mwRemoteVersion = 'r125'; |
| | 8 | +var mwRemoteVersion = 'r126'; |
| 9 | 9 | var mwUseScriptLoader = true; |
| 10 | 10 | |
| 11 | 11 | // Log the mwRemote version ( will determine what version of js we get ) |
| — | — | @@ -21,9 +21,10 @@ |
| 22 | 22 | mwReqParam[ p[0] ] = p[1]; |
| 23 | 23 | } |
| 24 | 24 | } |
| | 25 | + |
| 25 | 26 | |
| 26 | 27 | // Use wikibits onLoad hook: ( since we don't have js2 / mw object loaded ) |
| 27 | | -addOnloadHook( function() { |
| | 28 | +addOnloadHook( function() { |
| 28 | 29 | doPageSpecificRewrite(); |
| 29 | 30 | } ); |
| 30 | 31 | |
| — | — | @@ -355,8 +356,11 @@ |
| 356 | 357 | rurl += 'window.jQuery'; |
| 357 | 358 | coma = ','; |
| 358 | 359 | } |
| 359 | | - // Add Core mwEmbed lib: |
| 360 | | - rurl += coma + 'mwEmbed'; |
| | 360 | + // Add Core mwEmbed lib ( if not already defined ) |
| | 361 | + if( typeof MW_EMBED_VERSION == 'undefined' ){ |
| | 362 | + rurl += coma + 'mwEmbed'; |
| | 363 | + coma = ','; |
| | 364 | + } |
| 361 | 365 | |
| 362 | 366 | // Add requested classSet to scriptLoader request |
| 363 | 367 | for( var i=0; i < classSet.length; i++ ){ |