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

[yaron]

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

Revision: 112138
Author:   yaron
Date:     2012-02-22 19:37:15 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
Follow-up to r108225 and r109017 - re-did nikerabbit's replacement of JS global 
vars with calls to mw.config.get()

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-02-22 
19:34:08 UTC (rev 112137)
+++ trunk/extensions/SemanticForms/libs/SF_ajax_form_preview.js 2012-02-22 
19:37:15 UTC (rev 112138)
@@ -10,7 +10,7 @@
 
 function ajaxFormPreviewInit(){
 
-       if ((wgNamespaceNumber % 2 == 0) && /\.(js|css)$/.test(wgTitle)) return;
+       if ((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,6 +253,6 @@
        }
 }
 
-if ( wgAction ==='formedit' || wgCanonicalSpecialPageName === 'FormEdit' ) {
+if ( mw.config.get( 'wgAction' ) ==='formedit' || mw.config.get( 
'wgCanonicalSpecialPageName' ) === 'FormEdit' ) {
        jQuery( ajaxFormPreviewInit );
 }

Modified: trunk/extensions/SemanticForms/libs/SF_autoedit.js
===================================================================
--- trunk/extensions/SemanticForms/libs/SF_autoedit.js  2012-02-22 19:34:08 UTC 
(rev 112137)
+++ trunk/extensions/SemanticForms/libs/SF_autoedit.js  2012-02-22 19:37:15 UTC 
(rev 112138)
@@ -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-02-22 
19:34:08 UTC (rev 112137)
+++ trunk/extensions/SemanticForms/libs/SF_imagePreview.js      2012-02-22 
19:37:15 UTC (rev 112138)
@@ -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-02-22 19:34:08 UTC 
(rev 112137)
+++ trunk/extensions/SemanticForms/libs/SF_submit.js    2012-02-22 19:37:15 UTC 
(rev 112138)
@@ -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');
 
@@ -130,16 +130,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