http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73246
Revision: 73246
Author: tparscal
Date: 2010-09-17 21:15:31 +0000 (Fri, 17 Sep 2010)
Log Message:
-----------
Finished cleaning things up. Now this is tested and working. Also - moved token
generation to the client - allowing click tracking for anonomous users
(finally!)
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php
trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php
trunk/extensions/UsabilityInitiative/ClickTracking/SpecialClickTracking.php
trunk/extensions/UsabilityInitiative/ClickTracking/modules/clickTracking.js
Modified:
trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php
2010-09-17 19:55:53 UTC (rev 73245)
+++ trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php
2010-09-17 21:15:31 UTC (rev 73246)
@@ -51,7 +51,7 @@
public static function beforePageDisplay( $out, $skin ) {
global $wgClickTrackThrottle;
- if ( !( $wgClickTrackThrottle >= 0 && rand() %
$wgClickTrackThrottle == 0 ) ) {
+ if ( $wgClickTrackThrottle >= 0 && rand() %
$wgClickTrackThrottle == 0 ) {
$out->addModules( 'clickTracking' );
}
return true;
@@ -84,8 +84,10 @@
'clickTracking.special' => new
ResourceLoaderFileModule( array(
'scripts' =>
'extensions/UsabilityInitiative/ClickTracking/modules/clickTracking.special.js',
'styles' =>
'extensions/UsabilityInitiative/ClickTracking/modules/clickTracking.special.css',
+ 'dependencies' => array(
'jquery.ui.datepicker', 'jquery.ui.dialog' ),
) ),
) );
+ return true;
}
/**
Modified: trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php
===================================================================
--- trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php
2010-09-17 19:55:53 UTC (rev 73245)
+++ trunk/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php
2010-09-17 21:15:31 UTC (rev 73246)
@@ -38,6 +38,8 @@
$wgAutoloadClasses['ApiSpecialClickTracking'] = dirname( __FILE__ ) .
'/ApiSpecialClickTracking.php';
$wgHooks['LoadExtensionSchemaUpdates'][] =
'ClickTrackingHooks::loadExtensionSchemaUpdates';
$wgHooks['BeforePageDisplay'][] = 'ClickTrackingHooks::beforePageDisplay';
+$wgHooks['MakeGlobalVariablesScript'][] =
'ClickTrackingHooks::makeGlobalVariablesScript';
+$wgHooks['ResourceLoaderRegisterModules'][] =
'ClickTrackingHooks::resourceLoaderRegisterModules';
$wgHooks['ParserTestTables'][] = 'ClickTrackingHooks::parserTestTables';
$wgAPIModules['clicktracking'] = 'ApiClickTracking';
$wgAPIModules['specialclicktracking'] = 'ApiSpecialClickTracking';
Modified:
trunk/extensions/UsabilityInitiative/ClickTracking/SpecialClickTracking.php
===================================================================
--- trunk/extensions/UsabilityInitiative/ClickTracking/SpecialClickTracking.php
2010-09-17 19:55:53 UTC (rev 73245)
+++ trunk/extensions/UsabilityInitiative/ClickTracking/SpecialClickTracking.php
2010-09-17 21:15:31 UTC (rev 73246)
@@ -38,7 +38,7 @@
global $wgOut, $wgUser;
$wgOut->addModules( 'clickTracking.special' );
-
+
// Check permissions
if ( !$this->userCanExecute( $wgUser ) ) {
$this->displayRestrictionError();
Modified:
trunk/extensions/UsabilityInitiative/ClickTracking/modules/clickTracking.js
===================================================================
--- trunk/extensions/UsabilityInitiative/ClickTracking/modules/clickTracking.js
2010-09-17 19:55:53 UTC (rev 73245)
+++ trunk/extensions/UsabilityInitiative/ClickTracking/modules/clickTracking.js
2010-09-17 21:15:31 UTC (rev 73246)
@@ -7,11 +7,11 @@
$(document).ready( function() {
$( '#p-logo a, #p-navigation a, #p-interaction a, #p-tb a'
).each( function() {
var href = $(this).attr( 'href' );
- var token = mediaWiki.config.get( 'wgTrackingToken' );
+ var token = $.cookie( 'clicktracking-session' );
// Only modify local URLs
if ( href.length > 0 && href[0] == '/' && ( href.length
== 1 || href[1] != '/' ) ) {
var id = 'leftnav-' + skin + '-' + (
$(this).attr( 'id' ) || $(this).parent().attr( 'id' ) );
- href = wgScriptPath +
'/api.php?action=clicktracking' +
+ href = mediaWiki.config.get( 'wgScriptPath' ) +
'/api.php?action=clicktracking' +
'&eventid=' + id + '&token=' + token +
'&redirectto=' + escape( href );
$(this).attr( 'href', href );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
