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

Revision: 99639
Author:   jeroendedauw
Date:     2011-10-12 17:30:11 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
use jQuery instead of onclick

Modified Paths:
--------------
    trunk/extensions/Contest/resources/contest.special.editcontest.js
    trunk/extensions/Contest/specials/SpecialContestSignup.php
    trunk/extensions/Contest/specials/SpecialEditContest.php

Modified: trunk/extensions/Contest/resources/contest.special.editcontest.js
===================================================================
--- trunk/extensions/Contest/resources/contest.special.editcontest.js   
2011-10-12 17:22:20 UTC (rev 99638)
+++ trunk/extensions/Contest/resources/contest.special.editcontest.js   
2011-10-12 17:30:11 UTC (rev 99639)
@@ -127,6 +127,10 @@
        
        $( document ).ready( function() {
 
+               $( '#cancelEdit' ).click( function() {
+                       window.location = $( this ).attr( 'target-url' );
+               } );
+               
                $table = $( '#contest-name-field' ).closest( 'tbody' );
                
                $( '#bodyContent' ).find( '[type="submit"]' ).button();

Modified: trunk/extensions/Contest/specials/SpecialContestSignup.php
===================================================================
--- trunk/extensions/Contest/specials/SpecialContestSignup.php  2011-10-12 
17:22:20 UTC (rev 99638)
+++ trunk/extensions/Contest/specials/SpecialContestSignup.php  2011-10-12 
17:30:11 UTC (rev 99639)
@@ -183,7 +183,8 @@
        }
        
        /**
-        * Display a success message and helpfull links for further contest 
participation. 
+        * Redirect the user to the contest page and add the "new" argument to 
the URL
+        * so they get a success message. 
         * 
         * @since 0.1
         * 

Modified: trunk/extensions/Contest/specials/SpecialEditContest.php
===================================================================
--- trunk/extensions/Contest/specials/SpecialEditContest.php    2011-10-12 
17:22:20 UTC (rev 99638)
+++ trunk/extensions/Contest/specials/SpecialEditContest.php    2011-10-12 
17:30:11 UTC (rev 99639)
@@ -138,9 +138,8 @@
                        'cancelEdit',
                        wfMsg( 'cancel' ),
                        'cancelEdit',
-                       // FIXME: don't use onclick, use jQuery
                        array(
-                               'onclick' => 'window.location="' . 
SpecialPage::getTitleFor( 'Contests' )->getFullURL() . '";return false;'
+                               'target-url' => SpecialPage::getTitleFor( 
'Contests' )->getFullURL()
                        )
                );
                


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

Reply via email to