http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73640
Revision: 73640
Author: dale
Date: 2010-09-23 20:52:24 +0000 (Thu, 23 Sep 2010)
Log Message:
-----------
fixed empty sequence edit display
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
branches/MwEmbedStandAlone/remotes/mediaWiki.js
Modified: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-09-23 20:19:12 UTC (rev 73639)
+++ branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-09-23 20:52:24 UTC (rev 73640)
@@ -1598,11 +1598,12 @@
// Run embedPlayer sources hook
mw.runTriggersCallback( _this,
'checkPlayerSourcesEvent', function(){
_this.checkForTimedText();
- })
- }
+ });
+ };
- // NOTE: Should could be moved to mediaWiki Api support module
- if ( _this.apiTitleKey ) {
+ // NOTE: Should could be moved to mediaWiki Api support module
+ // only load from api if sources are empty:
+ if ( _this.apiTitleKey && this.mediaElement.sources.length ==
0) {
// Load media from external data
mw.log( 'EmbedPlayer::checkPlayerSources: loading
apiTitleKey data' );
_this.loadSourceFromApi( function(){
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
2010-09-23 20:19:12 UTC (rev 73639)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
2010-09-23 20:52:24 UTC (rev 73640)
@@ -166,7 +166,7 @@
_this.getMenu().drawMenu();
// initialize the edit stack to support undo / redo
actions
- _this.getActionsEdit().setupEditStack();
+ _this.getActionsEdit().setupEditStack();
});
},
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
2010-09-23 20:19:12 UTC (rev 73639)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
2010-09-23 20:52:24 UTC (rev 73640)
@@ -110,8 +110,13 @@
// XXX need to support multipe pages in single
context
_this.currentSequencePage =
_this.parseSequencerPage( smilPage );
// Cache the latest serverSmil ( for local
change checks )
- // ( save requests automatically respond with
warnings on other user updates )
- _this.serverSmilXml =
_this.currentSequencePage.sequenceXML ;
+ // ( save requests automatically respond with
warnings on other user updates )
+ if( _this.currentSequencePage.sequenceXML ){
+ _this.serverSmilXml =
_this.currentSequencePage.sequenceXML ;
+ } else {
+ // empty result
+ _this.serverSmilXml = '';
+ }
// Cache the pre / post bits
@@ -143,8 +148,8 @@
var endKey = SEQUENCER_PAYLOADKEY + ' -->';
// If the key is not found fail
if( !pageText || pageText.indexOf( startKey ) == -1 ||
pageText.indexOf(endKey) == -1 ){
- mw.log("Error could not find sequence payload");
- return '';
+ mw.log( "Error could not find sequence payload"
);
+ return {};
}
// trim the output:
return {
Modified: branches/MwEmbedStandAlone/remotes/mediaWiki.js
===================================================================
--- branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-23 20:19:12 UTC
(rev 73639)
+++ branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-23 20:52:24 UTC
(rev 73640)
@@ -363,7 +363,7 @@
poster_attr = '';
pheight = 0;
}else{
- var poster_attr = 'poster = "' + $pimg.attr( 'src' ) +
'" ';
+ var poster_attr = ' poster = "' + $pimg.attr( 'src' ) +
'" ';
var pheight = $pimg.attr( 'height' );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
