| Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/playerSkin.css |
| — | — | @@ -140,7 +140,7 @@ |
| 141 | 141 | float: left; |
| 142 | 142 | display: inline; |
| 143 | 143 | height: 10px; |
| 144 | | - margin-left:10px; |
| | 144 | + margin-left:8px; |
| 145 | 145 | margin-top:10px; |
| 146 | 146 | position:relative; |
| 147 | 147 | } |
| Index: trunk/phase3/js2/remoteMwEmbed.js |
| — | — | @@ -62,15 +62,9 @@ |
| 63 | 63 | } |
| 64 | 64 | // will be depreciated in favor of updates to OggHandler |
| 65 | 65 | function rewrite_for_OggHandler( vidIdList ){ |
| 66 | | - function procVidId(vidId){ |
| 67 | | - if( $j( '#'+vidId).length == 0){ |
| 68 | | - if(vidIdList.length != 0){ |
| 69 | | - setTimeout( function(){ |
| 70 | | - procVidId( vidIdList.pop() ) |
| 71 | | - }, 1); |
| 72 | | - } |
| 73 | | - return ; |
| 74 | | - } |
| | 66 | + function procVidId( vidId ){ |
| | 67 | + js_log('vidIdList length: ' + vidIdList.length + ' left in the set: ' + vidIdList ); |
| | 68 | + |
| 75 | 69 | // Grab the thumbnail and src of the video |
| 76 | 70 | var pimg = $j( '#' + vidId + ' img' ); |
| 77 | 71 | var poster_attr = 'poster = "' + pimg.attr( 'src' ) + '" '; |
| — | — | @@ -90,9 +84,8 @@ |
| 91 | 85 | |
| 92 | 86 | // Parsed values: |
| 93 | 87 | var src = ''; |
| 94 | | - var duration = ''; |
| 95 | | - var wikiTitleKey = $j( '#'+vidId + ' img').attr('alt').replace(' ', '_'); |
| 96 | | - |
| | 88 | + var duration = ''; |
| | 89 | + var wikiTitleKey = $j( '#'+vidId + ' img').filter(':first').attr('alt').replace(/ /g, '_'); |
| 97 | 90 | var re = new RegExp( /videoUrl(":?\s*)*([^&]*)/ ); |
| 98 | 91 | src = re.exec( $j( '#'+vidId ).html() )[2]; |
| 99 | 92 | |
| — | — | @@ -117,24 +110,24 @@ |
| 118 | 111 | }else{ |
| 119 | 112 | html_out='<video' + common_attr + |
| 120 | 113 | poster_attr + ' ' + |
| 121 | | - 'style="width:' + pwidth + 'px;height:' + |
| 122 | | - pheight + 'px;">' |
| | 114 | + 'style="width:' + pwidth + 'px;height:' + pheight + 'px;">' + |
| 123 | 115 | '</video>'; |
| 124 | 116 | } |
| 125 | 117 | //set the video tag inner html and update the height |
| 126 | 118 | $j( '#' + vidId ).html( html_out ) |
| 127 | 119 | .css('height', pheight + 30); |
| 128 | 120 | |
| 129 | | - } |
| 130 | | - rewrite_by_id( 'vid_' + i, function(){ |
| | 121 | + } |
| | 122 | + rewrite_by_id( vidId, function(){ |
| 131 | 123 | if(vidIdList.length != 0){ |
| | 124 | + alert('did first rewite now doing another'); |
| 132 | 125 | setTimeout( function(){ |
| 133 | 126 | procVidId( vidIdList.pop() ) |
| 134 | 127 | }, 1); |
| 135 | 128 | } |
| 136 | 129 | }); |
| 137 | 130 | }; |
| 138 | | - //proccess each item in the vidIdList (with setTimeout to avoid locking) |
| | 131 | + //process each item in the vidIdList (with setTimeout to avoid locking) |
| 139 | 132 | setTimeout( function(){ |
| 140 | 133 | procVidId( vidIdList.pop() ) |
| 141 | 134 | }, 1); |