[MediaWiki-CVS] SVN: [108225] trunk/extensions/SemanticForms/libs

[nikerabbit]

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/108225

Revision: 108225
Author:   nikerabbit
Date:     2012-01-06 12:29:22 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
Blind search and replace to get rid of legacy globals - untested

Modified Paths:
--------------
    trunk/extensions/SemanticForms/libs/SF_ajax_form_preview.js
    trunk/extensions/SemanticForms/libs/SF_autoedit.js
    trunk/extensions/SemanticForms/libs/SF_imagePreview.js
    trunk/extensions/SemanticForms/libs/SF_submit.js

Modified: trunk/extensions/SemanticForms/libs/SF_ajax_form_preview.js
===================================================================
--- trunk/extensions/SemanticForms/libs/SF_ajax_form_preview.js 2012-01-06 
12:24:44 UTC (rev 108224)
+++ trunk/extensions/SemanticForms/libs/SF_ajax_form_preview.js 2012-01-06 
12:29:22 UTC (rev 108225)
@@ -10,7 +10,7 @@
 
 function ajaxFormPreviewInit(){
 
-       if ((wgNamespaceNumber % 2 == 0) && /\.(js|css)$/.test(wgTitle)) return;
+       if ((mw.config.get( 'mw.config.get( 'wgNamespaceNumber' )' ) % 2 == 0) 
&& /\.(js|css)$/.test(mw.config.get( 'wgTitle' ))) return;
 
        if(!document.getElementById('wikiPreview')) return;
 
@@ -63,7 +63,7 @@
 
        //prepare
        var action = document.URL;
-       if (wgAction=='formedit') action += '&live';
+       if (mw.config.get( 'wgAction' )=='formedit') action += '&live';
 
        var boundary = '--------123xyz';
        var data = '';
@@ -253,7 +253,7 @@
        }
 }
 
-if (wgAction=='formedit' || wgCanonicalSpecialPageName == 'FormEdit') {
+if (mw.config.get( 'wgAction' )=='formedit' || mw.config.get( 
'wgCanonicalSpecialPageName' ) == 'FormEdit') {
        if ( typeof( addOnloadHook ) != 'undefined' ) 
addOnloadHook(ajaxFormPreviewInit);
        else if ( typeof( jQuery ) != 'undefined' ) jQuery(function(){
                ajaxFormPreviewInit()

Modified: trunk/extensions/SemanticForms/libs/SF_autoedit.js
===================================================================
--- trunk/extensions/SemanticForms/libs/SF_autoedit.js  2012-01-06 12:24:44 UTC 
(rev 108224)
+++ trunk/extensions/SemanticForms/libs/SF_autoedit.js  2012-01-06 12:29:22 UTC 
(rev 108225)
@@ -8,7 +8,7 @@
 
        $('.autoedit-trigger').click(function(){
 
-               if ( wgUserName == null ) {
+               if ( mw.config.get( 'wgUserName' ) == null ) {
                        if ( confirm( sfgAnonEditWarning ) ) {
                                handleAutoEdit( this );
                        }

Modified: trunk/extensions/SemanticForms/libs/SF_imagePreview.js
===================================================================
--- trunk/extensions/SemanticForms/libs/SF_imagePreview.js      2012-01-06 
12:24:44 UTC (rev 108224)
+++ trunk/extensions/SemanticForms/libs/SF_imagePreview.js      2012-01-06 
12:29:22 UTC (rev 108225)
@@ -11,7 +11,7 @@
 
        this.getPreviewImage = function( args, callback ) {
                $.getJSON(
-                       wgScriptPath + '/api.php',
+                       mw.config.get( 'wgScriptPath' ) + '/api.php',
                        {
                                'action': 'query',
                                'format': 'json',

Modified: trunk/extensions/SemanticForms/libs/SF_submit.js
===================================================================
--- trunk/extensions/SemanticForms/libs/SF_submit.js    2012-01-06 12:24:44 UTC 
(rev 108224)
+++ trunk/extensions/SemanticForms/libs/SF_submit.js    2012-01-06 12:29:22 UTC 
(rev 108225)
@@ -7,7 +7,7 @@
        var sacButtons;
        var form;
 
-       if ( wgAction == "formedit"     || wgCanonicalSpecialPageName == 
"FormEdit" ) {
+       if ( mw.config.get( 'wgAction' ) == "formedit"  || mw.config.get( 
'wgCanonicalSpecialPageName' ) == "FormEdit" ) {
 
                form = $('#sfForm');
 
@@ -132,16 +132,16 @@
 
                }
 
-               if (wgAction == "formedit") {
-                       params += "&target=" + encodeURIComponent( wgPageName );
-               } else if ( wgCanonicalSpecialPageName == "FormEdit") {
+               if (mw.config.get( 'wgAction' ) == "formedit") {
+                       params += "&target=" + encodeURIComponent( 
mw.config.get( 'wgPageName' ) );
+               } else if ( mw.config.get( 'wgCanonicalSpecialPageName' ) == 
"FormEdit") {
 
                        var url = String(window.location);
 
                        var stop = url.indexOf("?");
                        if ( stop > 0 ) url = url.substring(0, stop);
 
-                       var start = url.indexOf( wgPageName ); // find start of 
page name
+                       var start = url.indexOf( mw.config.get( 'wgPageName' ) 
); // find start of page name
                        start = url.indexOf("/", start) + 1; // find start of 
subpage
 
                        if ( start >= 0 ) {


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs