http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96116
Revision: 96116
Author: nikerabbit
Date: 2011-09-02 16:07:55 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Moved the last js file into RL. This script too needs to be rewritten, but at
least it works (with the other fix I did, the automatic wp prefix addition had
broken it earlier)
Modified Paths:
--------------
trunk/extensions/Translate/Translate.php
trunk/extensions/Translate/utils/JsSelectToInput.php
trunk/extensions/Translate/utils/UserToggles.php
Added Paths:
-----------
trunk/extensions/Translate/resources/ext.translate.selecttoinput.js
Removed Paths:
-------------
trunk/extensions/Translate/utils/JsSelectToInput.js
Modified: trunk/extensions/Translate/Translate.php
===================================================================
--- trunk/extensions/Translate/Translate.php 2011-09-02 16:05:49 UTC (rev
96115)
+++ trunk/extensions/Translate/Translate.php 2011-09-02 16:07:55 UTC (rev
96116)
@@ -168,6 +168,10 @@
'scripts' => 'resources/ext.translate.special.importtranslations.js',
) + $resourcePaths;
+$wgResourceModules['ext.translate.selecttoinput'] = array(
+ 'scripts' => 'resources/ext.translate.selecttoinput.js',
+) + $resourcePaths;
+
$wgResourceModules['jquery.autoresize'] = array(
'scripts' => 'resources/jquery.autoresize.js',
) + $resourcePaths;
Copied: trunk/extensions/Translate/resources/ext.translate.selecttoinput.js
(from rev 96106, trunk/extensions/Translate/utils/JsSelectToInput.js)
===================================================================
--- trunk/extensions/Translate/resources/ext.translate.selecttoinput.js
(rev 0)
+++ trunk/extensions/Translate/resources/ext.translate.selecttoinput.js
2011-09-02 16:07:55 UTC (rev 96116)
@@ -0,0 +1,11 @@
+window.appendFromSelect = function(selectid,targetid) {
+ var select = document.getElementById(selectid);
+ var target = document.getElementById(targetid);
+ if(!target || !select) return;
+ var atxt = select.options[select.selectedIndex].value;
+ if(!atxt) return;
+ /* Ugly hack */
+ target.value = target.value.replace(/default/, '' );
+ if(target.value.replace(/[\s\t\n]/ig,'') != '') atxt = ', ' + atxt;
+ target.value += atxt;
+}
Deleted: trunk/extensions/Translate/utils/JsSelectToInput.js
===================================================================
--- trunk/extensions/Translate/utils/JsSelectToInput.js 2011-09-02 16:05:49 UTC
(rev 96115)
+++ trunk/extensions/Translate/utils/JsSelectToInput.js 2011-09-02 16:07:55 UTC
(rev 96116)
@@ -1,11 +0,0 @@
-function appendFromSelect(selectid,targetid) {
- var select = document.getElementById(selectid);
- var target = document.getElementById(targetid);
- if(!target || !select) return;
- var atxt = select.options[select.selectedIndex].value;
- if(!atxt) return;
- /* Ugly hack */
- target.value = target.value.replace(/default/, '' );
- if(target.value.replace(/[\s\t\n]/ig,'') != '') atxt = ', ' + atxt;
- target.value += atxt;
-}
Modified: trunk/extensions/Translate/utils/JsSelectToInput.php
===================================================================
--- trunk/extensions/Translate/utils/JsSelectToInput.php 2011-09-02
16:05:49 UTC (rev 96115)
+++ trunk/extensions/Translate/utils/JsSelectToInput.php 2011-09-02
16:07:55 UTC (rev 96116)
@@ -112,6 +112,6 @@
if ( $done ) return;
global $wgOut;
- $wgOut->addScriptFile( TranslateUtils::assetPath(
'utils/JsSelectToInput.js' ) );
+ $wgOut->addModules( 'ext.translate.selecttoinput' );
}
}
Modified: trunk/extensions/Translate/utils/UserToggles.php
===================================================================
--- trunk/extensions/Translate/utils/UserToggles.php 2011-09-02 16:05:49 UTC
(rev 96115)
+++ trunk/extensions/Translate/utils/UserToggles.php 2011-09-02 16:07:55 UTC
(rev 96116)
@@ -63,6 +63,7 @@
'help-message' => 'translate-pref-editassistlang-help',
'select' => $select,
'valid-values' => array_keys( $languages ),
+ 'name' => 'translate-editlangs',
);
return true;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
