| Index: branches/js2-work/phase3/js/mwEmbed/tests/Player_Themable.html |
| — | — | @@ -11,13 +11,17 @@ |
| 12 | 12 | <link rel="stylesheet" href="../skins/kskin/EmbedPlayer.css" type="text/css" media="screen" /> |
| 13 | 13 | <script type="text/javascript" src="../mwEmbed.js?debug=true"></script> |
| 14 | 14 | |
| 15 | | - --> |
| | 15 | + --> |
| | 16 | + <script type="text/javascript" src="http://cdn.jquerytools.org/1.1.2/full/jquery.tools.min.js"></script> |
| 16 | 17 | <script type="text/javascript" src="../jsScriptLoader.php?debug=true&class=mwEmbed"></script> |
| 17 | 18 | |
| 18 | 19 | </head> |
| 19 | 20 | <script type="text/javascript"> |
| 20 | 21 | </script> |
| 21 | 22 | <body> |
| | 23 | +<video width="480" height="360" controls="controls" autobuffer="autobuffer" > |
| | 24 | + <source src="http://upload.wikimedia.org/wikipedia/commons/0/03/JohnWatts_2010-03-07_Q24-Pir.ogg" type="video/theora"> |
| | 25 | +</video> |
| 22 | 26 | <h3> Sample Themable Player:</h3> |
| 23 | 27 | To play with dynamic Themes install <a href="http://jqueryui.com/themeroller/developertool/">Themeroller</a><p><p> |
| 24 | 28 | |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/searchLibs/mediaWikiSearch.js |
| — | — | @@ -200,8 +200,7 @@ |
| 201 | 201 | |
| 202 | 202 | // Get the url safe titleKey from the descriptionurl |
| 203 | 203 | var titleKey = page.imageinfo[0].descriptionurl.split( '/' ); |
| 204 | | - titleKey = unescape( titleKey[ titleKey.length - 1 ] ); |
| 205 | | - titleKey = titleKey.replace( /File:|Image:/, '' ); |
| | 204 | + titleKey = unescape( titleKey[ titleKey.length - 1 ] ); |
| 206 | 205 | |
| 207 | 206 | var resource = { |
| 208 | 207 | 'id' : page_id, |
| — | — | @@ -314,7 +313,7 @@ |
| 315 | 314 | // Set the width: |
| 316 | 315 | if ( size.width ) { |
| 317 | 316 | request['iiurlwidth'] = size.width; |
| 318 | | - } |
| | 317 | + } |
| 319 | 318 | |
| 320 | 319 | mw.getJSON( this.provider.apiUrl, request, function( data ) { |
| 321 | 320 | var imObj = { }; |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/searchLibs/baseRemoteSearch.js |
| — | — | @@ -258,7 +258,8 @@ |
| 259 | 259 | |
| 260 | 260 | // Add the api title key if available: |
| 261 | 261 | if( resource.titleKey ) { |
| 262 | | - ahtml+= 'apiTitleKey="' + mw.escapeQuotesHTML( resource.titleKey ) + '" '; |
| | 262 | + ahtml+= 'apiTitleKey="' + |
| | 263 | + mw.escapeQuotesHTML( resource.titleKey.replace('File:', '') ) + '" '; |
| 263 | 264 | } |
| 264 | 265 | |
| 265 | 266 | // Add the commons apiProvider if the resource is from commons |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.RemoteSearchDriver.js |
| — | — | @@ -2228,8 +2228,7 @@ |
| 2229 | 2229 | } |
| 2230 | 2230 | var embedHtml = resource.pSobj.getEmbedHTML( resource, |
| 2231 | 2231 | { |
| 2232 | | - 'id' : 'embed_vid', |
| 2233 | | - 'apiTitleKey' : resource.title |
| | 2232 | + 'id' : 'embed_vid' |
| 2234 | 2233 | } |
| 2235 | 2234 | ); |
| 2236 | 2235 | mw.log( 'append html: ' + embedHtml ); |
| Index: branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js |
| — | — | @@ -4,7 +4,7 @@ |
| 5 | 5 | */ |
| 6 | 6 | var urlparts = getRemoteEmbedPath(); |
| 7 | 7 | var mwEmbedHostPath = urlparts[0]; |
| 8 | | -var mwRemoteVersion = 'r110'; |
| | 8 | +var mwRemoteVersion = 'r111'; |
| 9 | 9 | |
| 10 | 10 | // Log the mwRemote version ( will determine what version of js we get ) |
| 11 | 11 | if( window.console ){ |