catrope at svn
Nov 19, 2009, 8:47 AM
Post #1 of 1
(68 views)
Permalink
|
|
SVN: [59253] trunk/extensions/UsabilityInitiative/ClickTracking
|
|
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/59253
Revision: 59253
Author: catrope
Date: 2009-11-19 16:47:57 +0000 (Thu, 19 Nov 2009)
Log Message:
-----------
ClickTracking: Fix bug with handling javascript: links that caused ClickTracking to be disabled on WMF wikis
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.js
trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php
Modified: trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.js
===================================================================
--- trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.js 2009-11-19 16:00:38 UTC (rev 59252)
+++ trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.js 2009-11-19 16:47:57 UTC (rev 59253)
@@ -10,10 +10,15 @@
$( '#p-logo a, #p-navigation a, #p-tb a' ).click( function() {
var id = 'leftnav-' + skin + '-' +
( $(this).attr( 'id' ) || $(this).parent().attr( 'id' ) );
- window.location = wgScriptPath +
- '/api.php?action=clicktracking&eventid=' + id + '&token=' +
- wgTrackingToken +
- '&redirectto=' + escape( $(this).attr( 'href' ) );
+ var href = $(this).attr( 'href' );
+ // Don't attach to javascript: URLs and the like,
+ // only to local URLs (start with a /), http:// ,
+ // https:// and same-protocol URLs (start with //)
+ if ( href[0] == '/' || href.match( /^https?:\/\// ) )
+ window.location = wgScriptPath +
+ '/api.php?action=clicktracking&eventid=' +
+ id + '&token=' + wgTrackingToken +
+ '&redirectto=' + escape( href );
});
});
}
Modified: trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php
===================================================================
--- trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php 2009-11-19 16:00:38 UTC (rev 59252)
+++ trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php 2009-11-19 16:47:57 UTC (rev 59253)
@@ -19,7 +19,7 @@
/* Configuration */
// Increment this value when you change ClickTracking.js
-$wgClickTrackingStyleVersion = 2;
+$wgClickTrackingStyleVersion = 3;
// click throttle, should be seen as "1 out of every $wgClickTrackThrottle users will have it enabled"
// setting this to 1 means all users will have it enabled
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS [at] lists
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
