| Index: branches/js2-work/phase3/js/mwEmbed/tests/Player_Themable.html |
| — | — | @@ -9,7 +9,6 @@ |
| 10 | 10 | <link rel="stylesheet" href="../skins/mvpcf/EmbedPlayer.css" type="text/css" media="screen" /> |
| 11 | 11 | <link rel="stylesheet" href="../skins/kskin/EmbedPlayer.css" type="text/css" media="screen" /> |
| 12 | 12 | --> |
| 13 | | - |
| 14 | 13 | <script type="text/javascript" src="../mwEmbed.js?debug=true"></script> |
| 15 | 14 | |
| 16 | 15 | |
| — | — | @@ -27,7 +26,7 @@ |
| 28 | 27 | apiTitleKey="Charles_Lindbergh_flight_to_Brussels.ogg" |
| 29 | 28 | apiProvider="commons" |
| 30 | 29 | durationHint="60"> |
| 31 | | -</video> |
| | 30 | +</video> |
| 32 | 31 | |
| 33 | 32 | <video |
| 34 | 33 | style="width:208px;height:160px;float:left" |
| Index: branches/js2-work/phase3/js/mwEmbed/tests/Player_Timed_Text.html |
| — | — | @@ -19,6 +19,7 @@ |
| 20 | 20 | src="http://upload.wikimedia.org/wikipedia/commons/d/d6/Yochai_Benkler_-_On_Autonomy%2C_Control_and_Cultureal_Experience.ogg" |
| 21 | 21 | poster="http://upload.wikimedia.org/wikipedia/commons/thumb/d/d6/Yochai_Benkler_-_On_Autonomy%2C_Control_and_Cultureal_Experience.ogg/mid-Yochai_Benkler_-_On_Autonomy%2C_Control_and_Cultureal_Experience.ogg.jpg" |
| 22 | 22 | apiTitleKey="Yochai_Benkler_-_On_Autonomy,_Control_and_Cultureal_Experience.ogg" |
| | 23 | + apiProvider="commons" |
| 23 | 24 | class="kskin"></video> |
| 24 | 25 | <td valign="top"> |
| 25 | 26 | Commons Video API based timedText discovery<br> |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/searchLibs/kalturaSearch.js |
| — | — | @@ -81,7 +81,7 @@ |
| 82 | 82 | * Create an HTML representation of the available search filters and append |
| 83 | 83 | * them to the given element. |
| 84 | 84 | * |
| 85 | | - * @param {jQuery element} The base element to which HTML items should be |
| | 85 | + * @return {jQuery element} The base element to which HTML items should be |
| 86 | 86 | * appended. |
| 87 | 87 | */ |
| 88 | 88 | |
| — | — | @@ -123,6 +123,8 @@ |
| 124 | 124 | * @id {string} unique id for this filter box an residing elements |
| 125 | 125 | * @title {string} title of the filter box |
| 126 | 126 | * @options {array} array of strings describing the options in the filter box |
| | 127 | + * |
| | 128 | + * @return {jQuery element} The filter box |
| 127 | 129 | * |
| 128 | 130 | */ |
| 129 | 131 | |
| — | — | @@ -282,6 +284,7 @@ |
| 283 | 285 | searchLib.getImageObj( resource, size, callback ); |
| 284 | 286 | }); |
| 285 | 287 | }, |
| | 288 | + |
| 286 | 289 | /* |
| 287 | 290 | * Get extra resource info via a library specific callback |
| 288 | 291 | * NOTE: this info should be included in the original kaltura search results |
| — | — | @@ -292,6 +295,7 @@ |
| 293 | 296 | searchLib.addResourceInfoCallback( resource, callback ); |
| 294 | 297 | }); |
| 295 | 298 | }, |
| | 299 | + |
| 296 | 300 | /** |
| 297 | 301 | * Get and load provider via id |
| 298 | 302 | * @param {String} provider_id The id of the content provider |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/ApiProxy/mw.proxy.js |
| — | — | @@ -132,14 +132,14 @@ |
| 133 | 133 | |
| 134 | 134 | // add an onLoad hook: |
| 135 | 135 | $j( '#frame_proxy' ).get( 0 ).onload = function() { |
| 136 | | - // add a 5 second timeout for setting up the nested child callback (after page load) |
| | 136 | + // add a 8 second timeout for setting up the nested child callback (after page load) |
| 137 | 137 | setTimeout( function() { |
| 138 | 138 | if ( !frameProxyOk ) { |
| 139 | 139 | // we timmed out no api proxy (should make sure the user is "logged in") |
| 140 | 140 | mw.log( "Error:: api proxy timeout are we logged in? mwEmbed is on?" ); |
| 141 | 141 | $.proxy.proxyNotReadyDialog(); |
| 142 | 142 | } |
| 143 | | - }, 5000 ); |
| | 143 | + }, 8000 ); |
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | 146 | var lastApiReq = { }; |
| Index: branches/js2-work/phase3/js/mwEmbed/mwEmbed.js |
| — | — | @@ -1428,7 +1428,7 @@ |
| 1429 | 1429 | // NOTE:: we need to setup a special page rather than the rewrite hack I use bellow: |
| 1430 | 1430 | // The rewrite hack is very slow cuz it loads the whole mediaWiki interface & skin |
| 1431 | 1431 | 'server_frame' : server_frame, |
| 1432 | | - 'client_frame_path' : mw.getMwEmbedPath() + 'modules/ApiProxy/NestedCallbackIframe.html', |
| | 1432 | + 'client_frame_path' : mw.getMwEmbedPath() + 'modules/ApiProxy/NestedCallbackIframe.html' |
| 1433 | 1433 | }, |
| 1434 | 1434 | function(){ |
| 1435 | 1435 | mw.proxy.doRequest( data, callback ) |
| Index: branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php |
| — | — | @@ -180,7 +180,7 @@ |
| 181 | 181 | if( !is_file( $wgJavaPath ) || ! is_file( $wgClosureCompilerPath ) ){ |
| 182 | 182 | return false; |
| 183 | 183 | } |
| 184 | | - // Update the requestKey with a random value if no provided |
| | 184 | + // Update the requestKey with a random value if not provided |
| 185 | 185 | // requestKey is used for the temporary file |
| 186 | 186 | // ( There are problems with using standard output and Closure compile ) |
| 187 | 187 | if( $requestKey == '') |
| Index: branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js |
| — | — | @@ -4,10 +4,10 @@ |
| 5 | 5 | */ |
| 6 | 6 | var urlparts = getRemoteEmbedPath(); |
| 7 | 7 | var mwEmbedHostPath = urlparts[0]; |
| 8 | | -var mwRemoteVersion = 'r86'; |
| | 8 | +var mwRemoteVersion = 'r87'; |
| 9 | 9 | var mwUseScriptLoader = true; |
| 10 | 10 | |
| 11 | | -//Log the mwRemote version ( will determin what version of js we get ) |
| | 11 | +//Log the mwRemote version ( will determine what version of js we get ) |
| 12 | 12 | if( window.console ){ |
| 13 | 13 | window.console.log( 'mwEmbed:remote:' + mwRemoteVersion ); |
| 14 | 14 | } |