jenkins-bot has submitted this change and it was merged.
Change subject: TimedText: Fix the create/edit selector script
......................................................................
TimedText: Fix the create/edit selector script
Another element that broke after the RL async changes
Change-Id: I698c1d5d70acd2ee09d51f1f460b9060fc55cfda
---
M TimedMediaHandler.hooks.php
M TimedTextPage.php
A resources/ext.tmh.TimedTextSelector.js
3 files changed, 12 insertions(+), 16 deletions(-)
Approvals:
Brion VIBBER: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index d838fb0..6acfe41 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -90,6 +90,9 @@
'timedmedia-reset-confirm'
)
),
+ 'ext.tmh.TimedTextSelector' => $baseExtensionResource
+ array(
+ 'scripts' =>
'resources/ext.tmh.TimedTextSelector.js',
+ ),
"mw.MediaWikiPlayerSupport" => $baseExtensionResource
+ array(
'scripts' =>
'resources/mw.MediaWikiPlayerSupport.js',
'dependencies'=> 'mw.Api',
diff --git a/TimedTextPage.php b/TimedTextPage.php
index 95cc01b..361c2eb 100644
--- a/TimedTextPage.php
+++ b/TimedTextPage.php
@@ -144,22 +144,7 @@
)
)
);
- $timedTextExtension = '.srt';
- $timedTextTile = Title::newFromText(
$this->getTitle()->getDBkey() . '.'.
- 'LANG' . $timedTextExtension, NS_TIMEDTEXT
)->getFullText();
- $out->addScript(
- Html::InlineScript(
- '$(function() {' .
-
'$("#timedmedia-tt-go").click(function(){' .
- 'var articlePath =
mw.config.get( "wgArticlePath" );' .
- 'var paramSep =
(articlePath.indexOf("?")===-1) ? "?" : "&";' .
- 'var title = ' . json_encode(
$timedTextTile ) . '.replace("LANG", $("#timedmedia-tt-input").val());'.
- 'window.location =
articlePath.replace(/\$1/, mw.util.wikiUrlencode( title ) + ' .
- ' paramSep + "action=edit" ) '
.
- '});' .
- '});'
- )
- );
+ $out->addModules( 'ext.tmh.TimedTextSelector' );
}
/**
diff --git a/resources/ext.tmh.TimedTextSelector.js
b/resources/ext.tmh.TimedTextSelector.js
new file mode 100644
index 0000000..b53bb6f
--- /dev/null
+++ b/resources/ext.tmh.TimedTextSelector.js
@@ -0,0 +1,8 @@
+( function ( $, mw ) {
+ $( function () {
+ $( '#timedmedia-tt-go' ).click( function () {
+ window.location = mw.config.get( 'wgScript' ) +
'?title=' + mw.util.wikiUrlencode( mw.config.get( 'wgPageName' ) ) + '.' + $(
'#timedmedia-tt-input' ).val() + '.srt&action=edit';
+ } );
+ } );
+
+} )( jQuery, mediaWiki );
--
To view, visit https://gerrit.wikimedia.org/r/231861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I698c1d5d70acd2ee09d51f1f460b9060fc55cfda
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
