catrope at svn
Nov 20, 2009, 4:43 AM
Post #1 of 1
(58 views)
Permalink
|
|
SVN: [59284] branches/wmf-deployment/extensions/UsabilityInitiative/ ClickTracking
|
|
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/59284
Revision: 59284
Author: catrope
Date: 2009-11-20 12:43:34 +0000 (Fri, 20 Nov 2009)
Log Message:
-----------
wmf-deployment: Merge r59253 (ClickTracking bugfix) from trunk
Modified Paths:
--------------
branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking/ClickTracking.js
branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php
Property Changed:
----------------
branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking/
branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php
Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/UsabilityInitiative/ClickTracking:51646
/branches/usability/acaifix/ClickTracking:59192-59203
/trunk/extensions/UsabilityInitiative/ClickTracking:56151-57234,58926,58973-58974,59048,59202,59212
/trunk/phase3/extensions/UsabilityInitiative/ClickTracking:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
+ /branches/REL1_15/phase3/extensions/UsabilityInitiative/ClickTracking:51646
/branches/usability/acaifix/ClickTracking:59192-59203
/trunk/extensions/UsabilityInitiative/ClickTracking:56151-57234,58926,58973-58974,59048,59202,59212,59253
/trunk/phase3/extensions/UsabilityInitiative/ClickTracking:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php:51646
/branches/usability/acaifix/ClickTracking/ClickTracking.hooks.php:59192-59203
/trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php:56151-57234,58926,58973-58974,59048,59202,59205,59212
/trunk/phase3/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
+ /branches/REL1_15/phase3/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php:51646
/branches/usability/acaifix/ClickTracking/ClickTracking.hooks.php:59192-59203
/trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php:56151-57234,58926,58973-58974,59048,59202,59205,59212,59253
/trunk/phase3/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
Modified: branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking/ClickTracking.js
===================================================================
--- branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking/ClickTracking.js 2009-11-20 12:38:26 UTC (rev 59283)
+++ branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking/ClickTracking.js 2009-11-20 12:43:34 UTC (rev 59284)
@@ -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: branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php
===================================================================
--- branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php 2009-11-20 12:38:26 UTC (rev 59283)
+++ branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php 2009-11-20 12:43:34 UTC (rev 59284)
@@ -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
|
