From: Ori Livneh <ori@wikimedia.org>
Date: Mon, 28 Jan 2013 07:20:01 +0000 (-0800)
Subject: Drop ClickTracking integration from mw.user.bucket
X-Git-Tag: 1.31.0-rc.0~20102^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=0f92227cbab2ffd1bd878d183d103e975fd9ed65;p=lhc%2Fweb%2Fwiklou.git

Drop ClickTracking integration from mw.user.bucket

This change set drops the 'tracked' option from mw.user.bucket, which
previous triggered logging via the ClickTracking extension.

Change-Id: I1a57df2ba60dba6041ecad7dd5c87519eb5d143e
---

diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 4366d0daac..257bd6f413 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -25,6 +25,8 @@ changes to languages because of Bugzilla reports.
 
 === Other changes in 1.22 ===
 * redirect.php was removed. It was unused.
+* ClickTracking integration was dropped from the mediaWiki.user.bucket
+  JavaScript function. The 'tracked' option is now ignored.
 * BREAKING CHANGE: Legacy skins Simple, MySkin and Standard were all removed.
   Nostalgia was moved to an extension.
 * Event namespace used by jquery.makeCollapsible has been changed from
diff --git a/resources/mediawiki/mediawiki.user.js b/resources/mediawiki/mediawiki.user.js
index 308e4add2e..9f3ccf43be 100644
--- a/resources/mediawiki/mediawiki.user.js
+++ b/resources/mediawiki/mediawiki.user.js
@@ -176,8 +176,6 @@
 		 * must have at least one pair)
 		 * @param options.version Number: Version of bucket test, changing this forces rebucketing
 		 * (optional, default: 0)
-		 * @param options.tracked Boolean: Track the event of bucketing through the API module of
-		 * the ClickTracking extension (optional, default: false)
 		 * @param options.expires Number: Length of time (in days) until the user gets rebucketed
 		 * (optional, default: 30)
 		 * @return String: Bucket name - the randomly chosen key of the options.buckets object
@@ -186,7 +184,6 @@
 		 *     mw.user.bucket( 'test', {
 		 *         'buckets': { 'ignored': 50, 'control': 25, 'test': 25 },
 		 *         'version': 1,
-		 *         'tracked': true,
 		 *         'expires': 7
 		 *     } );
 		 */
@@ -197,7 +194,6 @@
 			options = $.extend( {
 				buckets: {},
 				version: 0,
-				tracked: false,
 				expires: 30
 			}, options || {} );
 
@@ -232,13 +228,6 @@
 						break;
 					}
 				}
-				if ( options.tracked ) {
-					mw.loader.using( 'jquery.clickTracking', function () {
-						$.trackAction(
-							'mediaWiki.user.bucket:' + key + '@' + version + ':' + bucket
-						);
-					} );
-				}
 				$.cookie(
 					'mediaWiki.user.bucket:' + key,
 					version + ':' + bucket,