Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/127667
Change subject: Tidy ext.eventLogging.{subscriber.js,core.js,jsonSchema.css}
......................................................................
Tidy ext.eventLogging.{subscriber.js,core.js,jsonSchema.css}
* Rename 'dfd' to 'deferred', for readability.
* Better comments for ext.eventLogging.subscriber.js.
* Factor out titleCase and handleTrackedEvent.
* Remove a line of dead, commented-out CSS code.
Change-Id: If6027a4cc8f6a83bf72b4f93af44101a3df9aff0
---
M modules/ext.eventLogging.core.js
M modules/ext.eventLogging.jsonSchema.css
M modules/ext.eventLogging.subscriber.js
3 files changed, 33 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/67/127667/1
diff --git a/modules/ext.eventLogging.core.js b/modules/ext.eventLogging.core.js
index 95eb8a5..356a7ea 100644
--- a/modules/ext.eventLogging.core.js
+++ b/modules/ext.eventLogging.core.js
@@ -253,21 +253,21 @@
dispatch: function ( data ) {
var beacon = document.createElement( 'img' ),
baseUri = mw.config.get(
'wgEventLoggingBaseUri' ),
- dfd = $.Deferred();
+ deferred = $.Deferred();
if ( !baseUri ) {
- dfd.rejectWith( data, [ data ] );
- return dfd.promise();
+ deferred.rejectWith( data, [ data ] );
+ return deferred.promise();
}
// Browsers trigger `onerror` event on HTTP 204 replies
to image
// requests. Thus, confusingly, `onerror` indicates
success.
$( beacon ).on( 'error', function () {
- dfd.resolveWith( data, [ data ] );
+ deferred.resolveWith( data, [ data ] );
} );
beacon.src = baseUri + '?' + encodeURIComponent(
$.toJSON( data ) ) + ';';
- return dfd.promise();
+ return deferred.promise();
},
diff --git a/modules/ext.eventLogging.jsonSchema.css
b/modules/ext.eventLogging.jsonSchema.css
index dbe3f35..e5a967a 100644
--- a/modules/ext.eventLogging.jsonSchema.css
+++ b/modules/ext.eventLogging.jsonSchema.css
@@ -86,7 +86,6 @@
.mw-json-schema-code-glyph:hover {
background: #f78088;
- /* color: #666; */
}
/**
diff --git a/modules/ext.eventLogging.subscriber.js
b/modules/ext.eventLogging.subscriber.js
index c326dcb..b78bc1a 100644
--- a/modules/ext.eventLogging.subscriber.js
+++ b/modules/ext.eventLogging.subscriber.js
@@ -13,13 +13,34 @@
* @author Ori Livneh <[email protected]>
*/
( function ( mw, $ ) {
- $( window ).on( 'load', function () {
- mw.trackSubscribe( 'event', function ( topic, eventInstance ) {
- var prefixLength = topic.indexOf( '.' ),
- schemaName = topic.charAt( prefixLength + 1
).toUpperCase() + topic.slice( prefixLength + 2 );
- mw.loader.using( [ 'ext.eventLogging', 'schema.' +
schemaName ], function () {
- mw.eventLog.logEvent( schemaName, eventInstance
);
- } );
+
+ /**
+ * Convert the first letter of a string to uppercase.
+ *
+ * @param {String} word
+ * @return {String}
+ */
+ function titleCase( word ) {
+ return word.charAt( 0 ).toUpperCase() + word.slice( 1 );
+ }
+
+ /**
+ * mw#track handler for EventLogging events.
+ *
+ * @param {String} topic Topic name ('event.*').
+ * @param {Object} event
+ */
+ function handleTrackedEvent( topic, event ) {
+ var schema = titleCase( topic.slice( topic.indexOf( '.' ) ) ),
+ dependencies = [ 'ext.eventLogging', 'schema.' + schema
];
+
+ mediaWiki.loader.using( dependencies, function () {
+ mw.eventLog.logEvent( schema, event );
} );
+ }
+
+ $( window ).on( 'load', function () {
+ mw.trackSubscribe( 'event', handleTrackedEvent );
} );
+
} ( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/127667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If6027a4cc8f6a83bf72b4f93af44101a3df9aff0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
