| Index: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js |
| — | — | @@ -229,11 +229,11 @@ |
| 230 | 230 | videoSeekTime += this.smil.parseTime( $j( smilElement ).attr( 'clipBegin') ); |
| 231 | 231 | } |
| 232 | 232 | |
| 233 | | - mw.log( "SmilAnimate::transformVideoForTime:" + assetId + " ct:" +vid.currentTime + ' should be: ' + videoSeekTime ); |
| | 233 | + //mw.log( "SmilAnimate::transformVideoForTime:" + assetId + " ct:" +vid.currentTime + ' should be: ' + videoSeekTime ); |
| 234 | 234 | |
| 235 | 235 | // Register a buffer ready callback |
| 236 | 236 | this.smil.getBuffer().videoBufferSeek( smilElement, videoSeekTime, function() { |
| 237 | | - mw.log( "transformVideoForTime:: seek complete "); |
| | 237 | + //mw.log( "transformVideoForTime:: seek complete "); |
| 238 | 238 | }); |
| 239 | 239 | }, |
| 240 | 240 | |
| Index: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.EmbedPlayerSmil.js |
| — | — | @@ -238,10 +238,10 @@ |
| 239 | 239 | if( !this.pausedForBuffer ){ |
| 240 | 240 | // Update playtime if not pausedForBuffer |
| 241 | 241 | this.smilPlayTime = this.smilPauseTime + ( ( new Date().getTime() - this.clockStartTime ) / 1000 ); |
| 242 | | - mw.log(" update smilPlayTime: " + this.smilPauseTime + " getTime: " + new Date().getTime() + |
| | 242 | + /*mw.log(" update smilPlayTime: " + this.smilPauseTime + " getTime: " + new Date().getTime() + |
| 243 | 243 | ' - clockStartTime: ' + this.clockStartTime + ' = ' + |
| 244 | 244 | ( ( new Date().getTime() - this.clockStartTime ) / 1000 ) + |
| 245 | | - " \n time:" + this.smilPlayTime ); |
| | 245 | + " \n time:" + this.smilPlayTime );*/ |
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | // Done with sync delay: |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js |
| — | — | @@ -3474,7 +3474,10 @@ |
| 3475 | 3475 | this.players.addPlayer( htmlPlayer ); |
| 3476 | 3476 | // In Mozilla, navigator.javaEnabled() only tells us about preferences, we need to |
| 3477 | 3477 | // search navigator.mimeTypes to see if it's installed |
| 3478 | | - var javaEnabled = navigator.javaEnabled(); |
| | 3478 | + try{ |
| | 3479 | + var javaEnabled = navigator.javaEnabled(); |
| | 3480 | + } catch ( e ){ |
| | 3481 | + } |
| 3479 | 3482 | // Some browsers filter out duplicate mime types, hiding some plugins |
| 3480 | 3483 | var uniqueMimesOnly = $j.browser.opera || $j.browser.safari; |
| 3481 | 3484 | // Opera will switch off javaEnabled in preferences if java can't be found. |
| Index: branches/MwEmbedStandAlone/modules/SequenceEdit/mw.SequenceEditMenu.js |
| — | — | @@ -13,37 +13,37 @@ |
| 14 | 14 | }, |
| 15 | 15 | drawMenu:function(){ |
| 16 | 16 | var _this = this; |
| 17 | | - var $menuTarget = this.sequenceEdit.getMenuTarget(); |
| | 17 | + var $menuTarget = this.sequenceEdit.getMenuTarget(); |
| | 18 | + $menuTarget.empty() |
| | 19 | + // check if we should have a save button |
| | 20 | + if(false){ |
| | 21 | + $menuTarget.append( |
| | 22 | + $j.button({ |
| | 23 | + 'text' : gM('mwe-sequenceedit-save-sequence'), |
| | 24 | + 'icon_id': 'disk' |
| | 25 | + }) |
| | 26 | + .buttonHover() |
| | 27 | + ) |
| | 28 | + } |
| | 29 | + |
| | 30 | + // check if we should have a render button |
| | 31 | + if(true){ |
| | 32 | + $menuTarget.append( |
| | 33 | + $j.button({ |
| | 34 | + 'text' : gM('mwe-sequenceedit-render-sequence'), |
| | 35 | + 'icon_id': 'video' |
| | 36 | + }) |
| | 37 | + .buttonHover() |
| | 38 | + .click(function(){ |
| | 39 | + _this.sequenceEdit.getRender().renderDialog(); |
| | 40 | + }) |
| | 41 | + ) |
| | 42 | + } |
| | 43 | + |
| | 44 | + // check if we should include credits |
| 18 | 45 | if( mw.getConfig( 'SequenceEdit.KalturaAttribution' ) ){ |
| 19 | | - $menuTarget.empty() |
| 20 | | - // check if we should have a save button |
| 21 | | - if(false){ |
| | 46 | + if( true ){ |
| 22 | 47 | $menuTarget.append( |
| 23 | | - $j.button({ |
| 24 | | - 'text' : gM('mwe-sequenceedit-save-sequence'), |
| 25 | | - 'icon_id': 'disk' |
| 26 | | - }) |
| 27 | | - .buttonHover() |
| 28 | | - ) |
| 29 | | - } |
| 30 | | - |
| 31 | | - // check if we should have a render button |
| 32 | | - if(true){ |
| 33 | | - $menuTarget.append( |
| 34 | | - $j.button({ |
| 35 | | - 'text' : gM('mwe-sequenceedit-render-sequence'), |
| 36 | | - 'icon_id': 'video' |
| 37 | | - }) |
| 38 | | - .buttonHover() |
| 39 | | - .click(function(){ |
| 40 | | - _this.sequenceEdit.getRender().renderDialog(); |
| 41 | | - }) |
| 42 | | - ) |
| 43 | | - } |
| 44 | | - |
| 45 | | - // check if we should include credits |
| 46 | | - if(true){ |
| 47 | | - $menuTarget.append( |
| 48 | 48 | $j('<span />') |
| 49 | 49 | .css( 'float', 'right' ) |
| 50 | 50 | .append( |
| Index: branches/MwEmbedStandAlone/modules/SequenceEdit/mw.FirefoggRender.js |
| — | — | @@ -152,7 +152,7 @@ |
| 153 | 153 | _this.doNextFrame(); |
| 154 | 154 | },1 ) |
| 155 | 155 | } |
| 156 | | - } ); |
| | 156 | + }, true /* hide the buffer overlay */ ); |
| 157 | 157 | }, |
| 158 | 158 | |
| 159 | 159 | /** |