| Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js |
| — | — | @@ -247,7 +247,7 @@ |
| 248 | 248 | <div class="articleFeedbackv5-form-flyover">\ |
| 249 | 249 | <div class="articleFeedbackv5-disable-flyover-help" >\ |
| 250 | 250 | <p class="articleFeedbackv5-disable-flyover-help-goto"></p>\ |
| 251 | | - <a class="articleFeedbackv5-disable-flyover-goto-link" target="_blank"><html:msg key="disable-flyover-help-location" /></a>\ |
| | 251 | + <p>"<html:msg key="disable-flyover-help-location" />"</p>\ |
| 252 | 252 | <p><html:msg key="disable-flyover-help-direction" /></p>\ |
| 253 | 253 | <p>"<html:msg key="disable-preference" />"</p>\ |
| 254 | 254 | </div>\ |
| — | — | @@ -457,7 +457,7 @@ |
| 458 | 458 | $block.find( '.articleFeedbackv5-submit' ) |
| 459 | 459 | .click( function ( e ) { |
| 460 | 460 | e.preventDefault(); |
| 461 | | - $.articleFeedbackv5.trackClick( 'option1-submit-' + |
| | 461 | + $.articleFeedbackv5.trackClick( $.articleFeedbackv5.bucketName() + '-submit-' + |
| 462 | 462 | ( $.articleFeedbackv5.inDialog ? 'overlay' : 'bottom' ) ); |
| 463 | 463 | $.articleFeedbackv5.submitForm(); |
| 464 | 464 | } ); |
| — | — | @@ -714,7 +714,7 @@ |
| 715 | 715 | $block.find( '.articleFeedbackv5-submit' ) |
| 716 | 716 | .click( function ( e ) { |
| 717 | 717 | e.preventDefault(); |
| 718 | | - $.articleFeedbackv5.trackClick( 'option2-submit-' + |
| | 718 | + $.articleFeedbackv5.trackClick( $.articleFeedbackv5.bucketName() + '-submit-' + |
| 719 | 719 | ( $.articleFeedbackv5.inDialog ? 'overlay' : 'bottom' ) ); |
| 720 | 720 | $.articleFeedbackv5.submitForm(); |
| 721 | 721 | } ); |
| — | — | @@ -1042,7 +1042,7 @@ |
| 1043 | 1043 | $block.find( '.articleFeedbackv5-submit' ) |
| 1044 | 1044 | .click( function ( e ) { |
| 1045 | 1045 | e.preventDefault(); |
| 1046 | | - $.articleFeedbackv5.trackClick( 'option3-submit-' + |
| | 1046 | + $.articleFeedbackv5.trackClick( $.articleFeedbackv5.bucketName() + 'submit-' + |
| 1047 | 1047 | ( $.articleFeedbackv5.inDialog ? 'overlay' : 'bottom' ) ); |
| 1048 | 1048 | $.articleFeedbackv5.submitForm(); |
| 1049 | 1049 | } ); |
| — | — | @@ -3006,7 +3006,7 @@ |
| 3007 | 3007 | * @return string the bucket name |
| 3008 | 3008 | */ |
| 3009 | 3009 | $.articleFeedbackv5.bucketName = function () { |
| 3010 | | - return 'option' + $.articleFeedbackv5.bucketId; |
| | 3010 | + return 'option' + $.articleFeedbackv5.bucketId + $.articleFeedbackv5.floatingLinkId; |
| 3011 | 3011 | }; |
| 3012 | 3012 | |
| 3013 | 3013 | // }}} |
| — | — | @@ -3546,24 +3546,28 @@ |
| 3547 | 3547 | $flyover.localize( { 'prefix': 'articlefeedbackv5-' } ); |
| 3548 | 3548 | $flyover.find( '.articleFeedbackv5-disable-flyover' ) |
| 3549 | 3549 | .addClass( 'articleFeedbackv5-disable-flyover-' + linkId ); |
| 3550 | | - var prefLink = mw.config.get( 'wgScript' ) + '?' + |
| 3551 | | - $.param( { title: 'Special:Preferences' } ) + |
| 3552 | | - '#mw-prefsection-rendering'; |
| | 3550 | + |
| 3553 | 3551 | $flyover.find( '.articleFeedbackv5-disable-flyover-help-goto' ) |
| 3554 | 3552 | .html( $.articleFeedbackv5.buildLink( |
| 3555 | 3553 | 'articlefeedbackv5-disable-flyover-help-goto', { |
| 3556 | 3554 | tag: 'strong', |
| 3557 | 3555 | text: 'articlefeedbackv5-disable-flyover-help-emphasis-text' |
| 3558 | 3556 | } ) ); |
| 3559 | | - $flyover.find( '.articleFeedbackv5-disable-flyover-goto-link' ) |
| 3560 | | - .attr( 'href', prefLink ) |
| | 3557 | + |
| | 3558 | + var prefLink = mw.config.get( 'wgScript' ) + '?' + |
| | 3559 | + $.param( { title: 'Special:Preferences' } ) + |
| | 3560 | + '#mw-prefsection-rendering'; |
| | 3561 | + var prefTrackId = $.articleFeedbackv5.bucketName() + '-disable_gotoprefs_click'; |
| 3561 | 3562 | $flyover.find( '.articleFeedbackv5-disable-flyover-button' ) |
| 3562 | | - .attr( 'href', prefLink ) |
| | 3563 | + .attr( 'href', $.articleFeedbackv5.trackingUrl( prefLink, prefTrackId ) ) |
| 3563 | 3564 | .button() |
| 3564 | 3565 | .addClass( 'ui-button-blue' ); |
| | 3566 | + |
| 3565 | 3567 | $flyover.find('.articleFeedbackv5-form-flyover-closebutton') |
| 3566 | 3568 | .attr( 'href', '#hello' ) |
| 3567 | 3569 | .attr( 'rel', linkId ); |
| | 3570 | + |
| | 3571 | + $.articleFeedbackv5.trackClick( $.articleFeedbackv5.bucketName() + '-disable_flyover-impression' ); |
| 3568 | 3572 | return $flyover.html(); |
| 3569 | 3573 | } |
| 3570 | 3574 | } ) |
| — | — | @@ -3577,6 +3581,7 @@ |
| 3578 | 3582 | } else { |
| 3579 | 3583 | $host.tipsy( 'show' ); |
| 3580 | 3584 | $wrap.addClass( 'articleFeedbackv5-tipsy-active' ); |
| | 3585 | + $.articleFeedbackv5.trackClick( $.articleFeedbackv5.bucketName() + '-disable_button_click' ); |
| 3581 | 3586 | } |
| 3582 | 3587 | } ); |
| 3583 | 3588 | }; |