http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61900
Revision: 61900
Author: dale
Date: 2010-02-03 00:49:33 +0000 (Wed, 03 Feb 2010)
Log Message:
-----------
* IE regression fix.
* kaltura search code comment
* bumed mediaWiki remote version
Modified Paths:
--------------
branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php
branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/searchLibs/kalturaSearch.js
branches/js2-work/phase3/js/mwEmbed/modules/ApiProxy/mw.proxy.js
branches/js2-work/phase3/js/mwEmbed/mwEmbed.js
branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js
branches/js2-work/phase3/js/mwEmbed/tests/Player_Themable.html
branches/js2-work/phase3/js/mwEmbed/tests/Player_Timed_Text.html
Modified: branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php
===================================================================
--- branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php 2010-02-03
00:30:20 UTC (rev 61899)
+++ branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php 2010-02-03
00:49:33 UTC (rev 61900)
@@ -180,7 +180,7 @@
if( !is_file( $wgJavaPath ) || ! is_file(
$wgClosureCompilerPath ) ){
return false;
}
- // Update the requestKey with a random value if no provided
+ // Update the requestKey with a random value if not provided
// requestKey is used for the temporary file
// ( There are problems with using standard output and Closure
compile )
if( $requestKey == '')
Modified:
branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/searchLibs/kalturaSearch.js
===================================================================
---
branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/searchLibs/kalturaSearch.js
2010-02-03 00:30:20 UTC (rev 61899)
+++
branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/searchLibs/kalturaSearch.js
2010-02-03 00:49:33 UTC (rev 61900)
@@ -81,7 +81,7 @@
* Create an HTML representation of the available search
filters and append
* them to the given element.
*
- * @param {jQuery element} The base element to which HTML
items should be
+ * @return {jQuery element} The base element to which HTML
items should be
* appended.
*/
@@ -123,6 +123,8 @@
* @id {string} unique id for this filter box an residing
elements
* @title {string} title of the filter box
* @options {array} array of strings describing the options in
the filter box
+ *
+ * @return {jQuery element} The filter box
*
*/
@@ -282,6 +284,7 @@
searchLib.getImageObj( resource, size, callback );
});
},
+
/*
* Get extra resource info via a library specific callback
* NOTE: this info should be included in the original kaltura search
results
@@ -292,6 +295,7 @@
searchLib.addResourceInfoCallback( resource, callback );
});
},
+
/**
* Get and load provider via id
* @param {String} provider_id The id of the content provider
Modified: branches/js2-work/phase3/js/mwEmbed/modules/ApiProxy/mw.proxy.js
===================================================================
--- branches/js2-work/phase3/js/mwEmbed/modules/ApiProxy/mw.proxy.js
2010-02-03 00:30:20 UTC (rev 61899)
+++ branches/js2-work/phase3/js/mwEmbed/modules/ApiProxy/mw.proxy.js
2010-02-03 00:49:33 UTC (rev 61900)
@@ -132,14 +132,14 @@
// add an onLoad hook:
$j( '#frame_proxy' ).get( 0 ).onload = function() {
- // add a 5 second timeout for setting up the nested
child callback (after page load)
+ // add a 8 second timeout for setting up the nested
child callback (after page load)
setTimeout( function() {
if ( !frameProxyOk ) {
// we timmed out no api proxy (should
make sure the user is "logged in")
mw.log( "Error:: api proxy timeout are
we logged in? mwEmbed is on?" );
$.proxy.proxyNotReadyDialog();
}
- }, 5000 );
+ }, 8000 );
}
}
var lastApiReq = { };
Modified: branches/js2-work/phase3/js/mwEmbed/mwEmbed.js
===================================================================
--- branches/js2-work/phase3/js/mwEmbed/mwEmbed.js 2010-02-03 00:30:20 UTC
(rev 61899)
+++ branches/js2-work/phase3/js/mwEmbed/mwEmbed.js 2010-02-03 00:49:33 UTC
(rev 61900)
@@ -1428,7 +1428,7 @@
// NOTE:: we need to
setup a special page rather than the rewrite hack I use bellow:
// The rewrite hack is
very slow cuz it loads the whole mediaWiki interface & skin
'server_frame' :
server_frame,
- 'client_frame_path'
: mw.getMwEmbedPath() + 'modules/ApiProxy/NestedCallbackIframe.html',
+ 'client_frame_path'
: mw.getMwEmbedPath() + 'modules/ApiProxy/NestedCallbackIframe.html'
},
function(){
mw.proxy.doRequest(
data, callback )
Modified: branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js
===================================================================
--- branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js 2010-02-03
00:30:20 UTC (rev 61899)
+++ branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js 2010-02-03
00:49:33 UTC (rev 61900)
@@ -4,10 +4,10 @@
*/
var urlparts = getRemoteEmbedPath();
var mwEmbedHostPath = urlparts[0];
-var mwRemoteVersion = 'r86';
+var mwRemoteVersion = 'r87';
var mwUseScriptLoader = true;
-//Log the mwRemote version ( will determin what version of js we get )
+//Log the mwRemote version ( will determine what version of js we get )
if( window.console ){
window.console.log( 'mwEmbed:remote:' + mwRemoteVersion );
}
Modified: branches/js2-work/phase3/js/mwEmbed/tests/Player_Themable.html
===================================================================
--- branches/js2-work/phase3/js/mwEmbed/tests/Player_Themable.html
2010-02-03 00:30:20 UTC (rev 61899)
+++ branches/js2-work/phase3/js/mwEmbed/tests/Player_Themable.html
2010-02-03 00:49:33 UTC (rev 61900)
@@ -9,7 +9,6 @@
<link rel="stylesheet" href="../skins/mvpcf/EmbedPlayer.css"
type="text/css" media="screen" />
<link rel="stylesheet" href="../skins/kskin/EmbedPlayer.css"
type="text/css" media="screen" />
-->
-
<script type="text/javascript" src="../mwEmbed.js?debug=true"></script>
@@ -27,7 +26,7 @@
apiTitleKey="Charles_Lindbergh_flight_to_Brussels.ogg"
apiProvider="commons"
durationHint="60">
-</video>
+</video>
<video
style="width:208px;height:160px;float:left"
Modified: branches/js2-work/phase3/js/mwEmbed/tests/Player_Timed_Text.html
===================================================================
--- branches/js2-work/phase3/js/mwEmbed/tests/Player_Timed_Text.html
2010-02-03 00:30:20 UTC (rev 61899)
+++ branches/js2-work/phase3/js/mwEmbed/tests/Player_Timed_Text.html
2010-02-03 00:49:33 UTC (rev 61900)
@@ -19,6 +19,7 @@
src="http://upload.wikimedia.org/wikipedia/commons/d/d6/Yochai_Benkler_-_On_Autonomy%2C_Control_and_Cultureal_Experience.ogg";
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";
apiTitleKey="Yochai_Benkler_-_On_Autonomy,_Control_and_Cultureal_Experience.ogg"
+ apiProvider="commons"
class="kskin"></video>
<td valign="top">
Commons Video API based timedText discovery<br>
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
![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"](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"){kind=link}