| Index: branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.css |
| — | — | @@ -8,6 +8,12 @@ |
| 9 | 9 | margin-top: 1em; |
| 10 | 10 | } |
| 11 | 11 | |
| | 12 | +@media print { |
| | 13 | + .articleFeedback { |
| | 14 | + display:none; |
| | 15 | + } |
| | 16 | +} |
| | 17 | + |
| 12 | 18 | .articleFeedback-panel { |
| 13 | 19 | background-color: #f9f9f9; |
| 14 | 20 | border: 1px solid #cccccc; |
| Index: branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js |
| — | — | @@ -290,15 +290,20 @@ |
| 291 | 291 | 'action': function() { |
| 292 | 292 | // Mute for 7 days |
| 293 | 293 | mutePitch( 'edit', 7 ); |
| 294 | | - // Go to edit page |
| 295 | | - // Track the click through an API redirect |
| | 294 | + // Setup edit page link |
| | 295 | + var params = { |
| | 296 | + 'title': mw.config.get( 'wgPageName' ), |
| | 297 | + 'action': 'edit' |
| | 298 | + }; |
| | 299 | + if ( tracked ) { |
| | 300 | + // Keep track of tracked users' edits |
| | 301 | + params.clicktrackingsession = $.cookie( 'clicktracking-session' ); |
| | 302 | + params.clicktrackingevent = prefix( 'pitch-edit-save' ); |
| | 303 | + } |
| | 304 | + // Track the click through an API redirect (automatically bypasses if !tracked) |
| 296 | 305 | window.location = trackClickURL( |
| 297 | | - mw.config.get( 'wgScript' ) + '?' + $.param( { |
| 298 | | - 'title': mw.config.get( 'wgPageName' ), |
| 299 | | - 'action': 'edit', |
| 300 | | - 'clicktrackingsession': $.cookie( 'clicktracking-session' ), |
| 301 | | - 'clicktrackingevent': prefix( 'pitch-edit-save' ) |
| 302 | | - } ), 'pitch-edit-accept' ); |
| | 306 | + mw.config.get( 'wgScript' ) + '?' + $.param( params ), 'pitch-edit-accept' |
| | 307 | + ); |
| 303 | 308 | return false; |
| 304 | 309 | }, |
| 305 | 310 | 'title': 'articlefeedback-pitch-thanks', |
| Index: branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.startup.js |
| — | — | @@ -13,6 +13,10 @@ |
| 14 | 14 | // Current revision |
| 15 | 15 | && mw.util.getParamValue( 'diff' ) == null |
| 16 | 16 | && mw.util.getParamValue( 'oldid' ) == null |
| | 17 | + // Not viewing a redirect |
| | 18 | + && mw.util.getParamValue( 'redirect' ) != 'no' |
| | 19 | + // Not viewing the printable version |
| | 20 | + && mw.util.getParamValue( 'printable' ) != 'yes' |
| 17 | 21 | ) { |
| 18 | 22 | var trackingBucket = mw.user.bucket( |
| 19 | 23 | 'ext.articleFeedback-tracking', mw.config.get( 'wgArticleFeedbackTracking' ) |