| Index: trunk/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js |
| — | — | @@ -350,7 +350,7 @@ |
| 351 | 351 | $tp.find('.k-options').click(function(){ |
| 352 | 352 | if($j('#' + embedObj.id + ' .k-menu').length == 0 ) |
| 353 | 353 | addMvOptions(); |
| 354 | | - |
| | 354 | + //set up the text and menu: |
| 355 | 355 | var $ktxt = $j(this).find('.ui-icon-k-menu'); |
| 356 | 356 | var $kmenu = $tp.find('.k-menu'); |
| 357 | 357 | if( $kmenu.is(':visible') ){ |
| — | — | @@ -639,8 +639,8 @@ |
| 640 | 640 | } |
| 641 | 641 | } |
| 642 | 642 | //string -> boolean: |
| 643 | | - if(embed_video[method]=="false")embed_video[method]=false; |
| 644 | | - if(embed_video[method]=="true")embed_video[method]=true; |
| | 643 | + if( embed_video[method] == "false") embed_video[method] = false; |
| | 644 | + if( embed_video[method] == "true") embed_video[method] = true; |
| 645 | 645 | } |
| 646 | 646 | ///js_log('did vI style'); |
| 647 | 647 | //now swap out the video element for the embed_video obj: |
| — | — | @@ -1757,8 +1757,10 @@ |
| 1758 | 1758 | html_code += this.getControlsHTML(); |
| 1759 | 1759 | html_code +='</div>'; |
| 1760 | 1760 | //block out some space by encapulating the top level div |
| 1761 | | - $j(this).wrap('<div style="width:'+parseInt(this.width)+'px;height:' |
| | 1761 | + if($j(this).parents('.k-player').length==0){ |
| | 1762 | + $j(this).wrap('<div style="width:'+parseInt(this.width)+'px;height:' |
| 1762 | 1763 | + (parseInt(this.height) + ctrlBuilder.height )+'px" id="k-player_' + this.id + '" class="k-player ui-widget"></div>'); |
| | 1764 | + } |
| 1763 | 1765 | } |
| 1764 | 1766 | |
| 1765 | 1767 | //js_log('should set: '+this.id); |