http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96110

Revision: 96110
Author:   nikerabbit
Date:     2011-09-02 15:54:11 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Moved import.js to RL - the script itself needs to be rewritten (I could use 
help on that!)

Modified Paths:
--------------
    trunk/extensions/Translate/Translate.php
    trunk/extensions/Translate/specials/SpecialImportTranslations.php

Added Paths:
-----------
    
trunk/extensions/Translate/resources/ext.translate.special.importtranslations.js

Removed Paths:
-------------
    trunk/extensions/Translate/resources/import.js

Modified: trunk/extensions/Translate/Translate.php
===================================================================
--- trunk/extensions/Translate/Translate.php    2011-09-02 15:53:56 UTC (rev 
96109)
+++ trunk/extensions/Translate/Translate.php    2011-09-02 15:54:11 UTC (rev 
96110)
@@ -164,6 +164,10 @@
        'styles' => 'resources/ext.translate.special.supportedlanguages.css',
 ) + $resourcePaths;
 
+$wgResourceModules['ext.translate.special.importtranslations'] = array(
+       'scripts' => 'resources/ext.translate.special.importtranslations.js',
+) + $resourcePaths;
+
 $wgResourceModules['jquery.autoresize'] = array(
        'scripts' => 'resources/jquery.autoresize.js',
 ) + $resourcePaths;

Copied: 
trunk/extensions/Translate/resources/ext.translate.special.importtranslations.js
 (from rev 96106, trunk/extensions/Translate/resources/import.js)
===================================================================
--- 
trunk/extensions/Translate/resources/ext.translate.special.importtranslations.js
                            (rev 0)
+++ 
trunk/extensions/Translate/resources/ext.translate.special.importtranslations.js
    2011-09-02 15:54:11 UTC (rev 96110)
@@ -0,0 +1,15 @@
+/** Call this to enable suggestions on input (id=inputId), on a form 
(name=formName) */
+function translateImportInit(){
+       os_initHandlers( 'mw-translate-up-wiki-input', 'mw-translate-import', 
document.getElementById('mw-translate-up-wiki-input') );
+
+       jQuery(".mw-translate-import-inputs").each(function(i) {
+               os_hookEvent(this, "focus", function(event) {
+                       var srcid = os_getTarget(event).id;
+                       var inputid = srcid.replace("-input", "");
+
+                       jQuery("#" + inputid).attr("checked", "checked");
+               });
+       });
+}
+
+hookEvent("load", translateImportInit);
\ No newline at end of file

Deleted: trunk/extensions/Translate/resources/import.js
===================================================================
--- trunk/extensions/Translate/resources/import.js      2011-09-02 15:53:56 UTC 
(rev 96109)
+++ trunk/extensions/Translate/resources/import.js      2011-09-02 15:54:11 UTC 
(rev 96110)
@@ -1,15 +0,0 @@
-/** Call this to enable suggestions on input (id=inputId), on a form 
(name=formName) */
-function translateImportInit(){
-       os_initHandlers( 'mw-translate-up-wiki-input', 'mw-translate-import', 
document.getElementById('mw-translate-up-wiki-input') );
-
-       jQuery(".mw-translate-import-inputs").each(function(i) {
-               os_hookEvent(this, "focus", function(event) {
-                       var srcid = os_getTarget(event).id;
-                       var inputid = srcid.replace("-input", "");
-
-                       jQuery("#" + inputid).attr("checked", "checked");
-               });
-       });
-}
-
-hookEvent("load", translateImportInit);
\ No newline at end of file

Modified: trunk/extensions/Translate/specials/SpecialImportTranslations.php
===================================================================
--- trunk/extensions/Translate/specials/SpecialImportTranslations.php   
2011-09-02 15:53:56 UTC (rev 96109)
+++ trunk/extensions/Translate/specials/SpecialImportTranslations.php   
2011-09-02 15:54:11 UTC (rev 96110)
@@ -117,8 +117,7 @@
        protected function outputForm() {
                global $wgOut;
 
-               $wgOut->includeJQuery();
-               $this->out->addScriptFile( TranslateUtils::assetPath( 
'js/import.js' ) );
+               $wgOut->addModules( 'ext.translate.special.importtranslations' 
);
 
                /**
                 * Ugly but necessary form building ahead, ohoy


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to