https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113570
Revision: 113570
Author: nikerabbit
Date: 2012-03-11 09:52:31 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
Everything can't use the embedded editor. Make sure that dialog editor is used
when it is the only alternative.
Modified Paths:
--------------
trunk/extensions/Translate/utils/TranslationEditPage.php
trunk/extensions/Translate/utils/TranslationHelpers.php
Modified: trunk/extensions/Translate/utils/TranslationEditPage.php
===================================================================
--- trunk/extensions/Translate/utils/TranslationEditPage.php 2012-03-11
09:27:01 UTC (rev 113569)
+++ trunk/extensions/Translate/utils/TranslationEditPage.php 2012-03-11
09:52:31 UTC (rev 113570)
@@ -184,16 +184,18 @@
* @param $title Title Title object for the translatable message.
* @param $group \string The group in which this message belongs to.
* Optional, but avoids a lookup later if provided.
+ * @param $type \string Force the type of editor to be used. Use dialog
+ * where embedded editor is no applicable.
* @return \array
*/
- public static function jsEdit( Title $title, $group = "" ) {
+ public static function jsEdit( Title $title, $group = "", $type =
'default' ) {
global $wgUser, $wgRequest;
if ( !$wgUser->getOption( 'translate-jsedit' ) ) {
return array();
}
- if ( $wgRequest->getVal( 'translate-beta' ) ) {
+ if ( $type === 'default' && $wgRequest->getVal(
'translate-beta' ) ) {
$text = 'tqe-anchor-' . substr( sha1(
$title->getPrefixedText() ), 0, 12 );
$onclick = "jQuery( '#$text' ).dblclick(); return
false;";
} else {
Modified: trunk/extensions/Translate/utils/TranslationHelpers.php
===================================================================
--- trunk/extensions/Translate/utils/TranslationHelpers.php 2012-03-11
09:27:01 UTC (rev 113569)
+++ trunk/extensions/Translate/utils/TranslationHelpers.php 2012-03-11
09:52:31 UTC (rev 113570)
@@ -1214,7 +1214,7 @@
$params['action'] = 'edit';
$params['loadgroup'] = $groupId;
- $jsEdit = TranslationEditPage::jsEdit( $target, $groupId );
+ $jsEdit = TranslationEditPage::jsEdit( $target, $groupId,
'dialog' );
return Linker::link( $target, $text, $jsEdit, $params );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
