http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73014
Revision: 73014
Author: dale
Date: 2010-09-14 20:17:05 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
bumped version minor and minor space formating
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.EmbedPlayerSmil.js
branches/MwEmbedStandAlone/remotes/mediaWiki.js
Modified:
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
===================================================================
---
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
2010-09-14 20:12:56 UTC (rev 73013)
+++
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
2010-09-14 20:17:05 UTC (rev 73014)
@@ -972,6 +972,7 @@
// Show the big play button:
embedPlayer.$interface.find( '.play-btn-large' ).fadeIn( 'slow'
);
+
$j(embedPlayer).trigger( 'closeMenuOverlay' );
return false; // onclick action return false
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
2010-09-14 20:12:56 UTC (rev 73013)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
2010-09-14 20:17:05 UTC (rev 73014)
@@ -7,6 +7,7 @@
/*
* Setup the sequencer jQuery binding:
*/
+
( function( $ ) {
$.fn.sequencer = function( options ) {
// Debugger
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
2010-09-14 20:12:56 UTC (rev 73013)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
2010-09-14 20:17:05 UTC (rev 73014)
@@ -283,7 +283,7 @@
updateSequenceFileDescription: function( callback ){
var _this = this;
mw.getToken( _this.getApiUrl(), 'File:' +
_this.getVideoFileName(), function( token ){
- var pageText = ''
+ var pageText = '';
// Check if we should use commons asset
description template:
if( mw.parseUri( _this.getApiUrl() ).host ==
'commons.wikimedia.org' ){
pageText =
_this.getCommonsDescriptionText()
@@ -301,26 +301,27 @@
if( data && data.edit &&
data.edit.result == "Success"){
callback( true );
} else {
- callback( false )
+ callback( false );
}
});
})
},
+
getBaseFileDescription: function(){
var _this = this;
return 'Published sequence for [['+ _this.getTitleKey()
+ ']]';
},
+
getCommonsDescriptionText: function(){
var _this = this;
var descText = '<!-- ' +
"Note: this is an automated file description for a
published video sequence. \n"
"Changes to this wikitext will be overwiten. Please add
metadata and categories to\n" +
- _this.getTitleKey() + " instead --> \n";
-
- descText += "{{Information\n" +
- "|Description=" +
_this.getBaseFileDescription() + "\n" +
- "|Source= Sequence Sources assets include:\n";
+ _this.getTitleKey() + " instead --> \n" +
+ "{{Information\n" +
+ "|Description=" + _this.getBaseFileDescription() + "\n"
+
+ "|Source= Sequence Sources assets include:\n";
// loop over every asset:
this.sequencer.getSmil().getBody().getRefElementsRecurse(null, 0, function(
$node ){
@@ -346,6 +347,7 @@
// Add Published Sequence category ( for now )
descText += "\n[[Category:Published Sequence]]\n";
+
return descText;
},
@@ -376,7 +378,7 @@
*/
getSequenceEditUrl: function( titleKey ){
var viewUrl = this.getSequenceViewUrl( titleKey );
- return mw.replaceUrlParams(viewUrl, {'action':'edit'})
+ return mw.replaceUrlParams(viewUrl, {'action':'edit'});
},
/**
@@ -392,7 +394,7 @@
var _this = this;
mw.getToken( this.getApiUrl(), 'File:' +
this.getVideoFileName(), function( saveToken ){
// xxx Get the latest save comment
- _this.getSaveSummary(function( saveSummary ){
+ _this.getSaveSummary( function( saveSummary ){
var request = {
'token' : saveToken,
'action' : 'upload',
@@ -410,7 +412,7 @@
sequencePublishUploadDone: function(){
this.sequencePublished = true;
}
- }
+ };
} )( window.mw );
\ No newline at end of file
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
===================================================================
---
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
2010-09-14 20:12:56 UTC (rev 73013)
+++
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
2010-09-14 20:17:05 UTC (rev 73014)
@@ -316,7 +316,7 @@
.css( {'cursor': 'pointer', 'font-size':'x-small' })
);
// load the sequence editor with the sequencerContainer target
- mw.load( 'Sequencer', function(){
+ mw.load( 'Sequencer', function(){
$j('#sequencerContainer').sequencer(
_this.getSequencerConfig() );
});
},
@@ -496,7 +496,7 @@
.css( {'width':'200px', 'margin':'auto'})
)
)
- mw.load( 'Sequencer', function(){
+ mw.load( 'Sequencer', function(){
// Send a jquery ui style destroy command ( in case the
editor is re-invoked )
$j('#edit_sequence_container').sequencer( 'destroy');
$j('#edit_sequence_container').sequencer(
_this.getSequencerConfig() );
@@ -544,21 +544,6 @@
return mw.absoluteUrl( wgScript.replace('index.php', 'api.php')
);
}
- // Check page type
+};
- // "view" page
-
- // set page content to "loading"
- // get wikitext of page via api
- // grab xml
- // update page with sequence and
-
-
- //"edit" page
- // grab textbox text,
- // set page to loading
- // display sequence editor in "body" with -> full-screen link
-}; //Setup the remote configuration
-
-
} )( window.mw );
\ No newline at end of file
Modified: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.EmbedPlayerSmil.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SmilPlayer/mw.EmbedPlayerSmil.js
2010-09-14 20:12:56 UTC (rev 73013)
+++ branches/MwEmbedStandAlone/modules/SmilPlayer/mw.EmbedPlayerSmil.js
2010-09-14 20:17:05 UTC (rev 73014)
@@ -102,6 +102,7 @@
} );
});
},
+
/**
* Issue a seeking request.
*
Modified: branches/MwEmbedStandAlone/remotes/mediaWiki.js
===================================================================
--- branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-14 20:12:56 UTC
(rev 73013)
+++ branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-14 20:17:05 UTC
(rev 73014)
@@ -4,7 +4,7 @@
*/
var urlparts = getRemoteEmbedPath();
var mwEmbedHostPath = urlparts[0];
-var mwRemoteVersion = 'r144';
+var mwRemoteVersion = 'r145';
var mwUseScriptLoader = true;
// Log the mwRemote version makes it easy to debug cache issues
@@ -35,8 +35,9 @@
mwUseScriptLoader = false;
}
-//mwReqParam['debug'] =false;
+//mwReqParam['debug'] = false;
//mwUseScriptLoader = true;
+//mwRemoteVersion = Math.random();
// Setup up some globals to wrap mwEmbed mw.ready and mw.setConfig functions
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
