Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198816
Change subject: Emit activation entry/exit traces at the appropriate times
......................................................................
Emit activation entry/exit traces at the appropriate times
Due to changes in the way VisualEditor is loaded, the
trace.activate.{enter,exit}
events no longer enclose the entire VisualEditor initialization process. This
change ensures that trace.activate.enter is emitted as soon as the user clicks
on an edit link / tab and that the trace.activate.exit is not emitted until the
toolbar has been fully activated.
Change-Id: Ief798faa95a58898b9ae4dcbbbd30506c5dbd9a7
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/16/198816/1
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index dc0a726..a729583 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -424,6 +424,7 @@
return;
}
+ ve.track( 'trace.activate.enter' );
ve.track( 'mwedit.init', { type: 'page', mechanism:
'click' } );
if ( history.pushState && uri.query.veaction !== 'edit'
) {
@@ -448,6 +449,7 @@
return;
}
+ ve.track( 'trace.activate.enter' );
ve.track( 'mwedit.init', { type: 'section', mechanism:
'click' } );
if ( history.pushState && uri.query.veaction !== 'edit'
) {
@@ -538,6 +540,7 @@
if ( isViewPage && uri.query.veaction === 'edit' ) {
isSection = uri.query.vesection !== undefined;
+ ve.track( 'trace.activate.enter' );
ve.track( 'mwedit.init', { type: isSection ?
'section' : 'page', mechanism: 'url' } );
activateTarget();
}
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index fe659b2..b613f84 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -188,6 +188,7 @@
surface.getView().emit( 'position' );
surface.getContext().updateDimensions();
ve.track( 'trace.initializeToolbar.exit' );
+ ve.track( 'trace.activate.exit' );
}
} );
}
@@ -277,7 +278,6 @@
pageTarget = this;
if ( !this.active && !this.activating ) {
- ve.track( 'trace.activate.enter' );
this.activating = true;
this.activatingDeferred = $.Deferred();
this.toolbarSetupDeferred = $.Deferred();
@@ -527,7 +527,6 @@
this.activatingDeferred.resolve();
mw.hook( 've.activationComplete' ).fire();
- ve.track( 'trace.activate.exit' );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/198816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief798faa95a58898b9ae4dcbbbd30506c5dbd9a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
