http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72888
Revision: 72888 Author: dale Date: 2010-09-13 00:00:11 +0000 (Mon, 13 Sep 2010) Log Message: ----------- tab memory ( keeps the selected tab open across default edit actions on clips ) Modified Paths: -------------- branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTools.js branches/MwEmbedStandAlone/remotes/mediaWiki.js Modified: branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php =================================================================== --- branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php 2010-09-12 23:32:32 UTC (rev 72887) +++ branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php 2010-09-13 00:00:11 UTC (rev 72888) @@ -61,7 +61,7 @@ 'mwe-sequencer-preview-continue' => 'Continue preview', 'mwe-sequencer-apply-changes' => 'Apply changes', 'mwe-sequencer-start-time' => 'Start time', - 'mwe-sequencer-asset-source' => 'Source page', + 'mwe-sequencer-asset-source' => 'Source asset page', 'mwe-sequencer-loading_user_rights' => 'Loading user rights ...', Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js =================================================================== --- branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js 2010-09-12 23:32:32 UTC (rev 72887) +++ branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js 2010-09-13 00:00:11 UTC (rev 72888) @@ -15,7 +15,8 @@ return; } var seqContainer = $j( this.selector ).get(0); - // support jquery ui style 'destroy' call + + // Support jquery ui style 'destroy' call if( options == 'destroy' ){ if( seqContainer['sequencer'] ) delete seqContainer['sequencer']; Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTools.js =================================================================== --- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTools.js 2010-09-12 23:32:32 UTC (rev 72887) +++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTools.js 2010-09-13 00:00:11 UTC (rev 72888) @@ -718,17 +718,18 @@ this.getCurrentsmilElement() ) ); - mw.log( 'Adding ' + toolSet.length + ' tools for ' + this.sequencer.getSmil().getRefType( this.getCurrentsmilElement() ) ); + mw.log( 'Adding ' + toolSet.length + ' tools for ' + + this.sequencer.getSmil().getRefType( this.getCurrentsmilElement() ) + + ' current tool: ' + _this.getCurrentToolId() + ); + var toolTabIndex = 0; $j.each( toolSet, function( inx, toolId ){ - var tool = _this.tools[ toolId ]; - - // set the currentTool if not already set - if(!_this.currentToolId){ - _this.currentToolId = toolId; + var tool = _this.tools[ toolId ]; + if( _this.getCurrentToolId() == toolId){ + toolTabIndex = inx; } - // Append the title to the ul list $toolsContainer.find( 'ul').append( $j('<li />').append( @@ -786,7 +787,12 @@ }); // Add tab bindings - $toolsContainer.tabs(); + $toolsContainer.tabs({ + select: function(event, ui) { + _this.setCurrentToolId( $j( ui.tab ).attr('href').replace('#tooltab_', '') ); + }, + selected : toolTabIndex + }); // Build out global edit Actions buttons after the container for( var editActionId in this.editActions ){ Modified: branches/MwEmbedStandAlone/remotes/mediaWiki.js =================================================================== --- branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-12 23:32:32 UTC (rev 72887) +++ branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-13 00:00:11 UTC (rev 72888) @@ -162,7 +162,7 @@ window.mwSequencerRemote = new mw.MediaWikiRemoteSequencer({ 'action': wgAction, - 'title' : wgTitle, + 'titleKey' : wgTitle, 'target' : '#bodyContent' }); window.mwSequencerRemote.drawUI(); _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs