jenkins-bot has submitted this change and it was merged.
Change subject: mw.ViewPageTarget: Grey-out body content as soon as edit is
clicked
......................................................................
mw.ViewPageTarget: Grey-out body content as soon as edit is clicked
Set 've-activated' as soon as edit is clicked, with a 've-loading' state.
This necessitates moving the relevant styles to mw.ViewPageTarget.init.css.
Change-Id: Ic9757cdbf63a2f72eda0dd03ff5588d79028ba0e
---
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.init.css
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
4 files changed, 45 insertions(+), 40 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
index 89dcffd..0876bd2 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
@@ -5,43 +5,6 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
-/*!
- * State | <html> classes
- * Reading | ve-available
- * Activate editor | ve-available ve-activated ve-activating
- * Active | ve-available ve-activated ve-active
- * Deactivate editor | ve-available ve-deactivating
- * Deactivated | ve-available
- */
-
-.ve-activated #toc,
-.ve-activated #siteNotice,
-.ve-activated .mw-indicators,
-/* Most of bodyContent can be hidden as VE has an equivalent of most children
- in ve-init-target (sibling of #bodyContent). However, we can't hide it
- completely as subs should remain visible (for persistence with read mode),
- and ve-ui-mwTocWidget is also part of #bodyContent. */
-.ve-active #bodyContent >
:not(#siteSub):not(#contentSub):not(.ve-ui-mwTocWidget),
-.ve-activated #t-print,
-.ve-activated #t-permalink,
-.ve-activated #p-coll-print_export,
-.ve-activated #t-cite,
-.ve-activating .ve-ui-surface,
-.ve-deactivating .ve-ui-surface {
- display: none;
-}
-
-.ve-activating #bodyContent,
-.ve-activated #firstHeading,
-.ve-activated #siteSub,
-.ve-activated #contentSub {
- opacity: 0.6;
-}
-
-.ve-activated #firstHeading {
- cursor: default;
-}
-
/* Toolbar */
.ve-activating .ve-init-mw-viewPageTarget-toolbar,
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.init.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.init.css
index 1470bdf..179a60e 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.init.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.init.css
@@ -8,7 +8,47 @@
/*csslint known-properties:false */
/* Bug: https://github.com/stubbornella/csslint/issues/436 */
-/* Visual Editor */
+/*!
+ * State | <html> classes
+ * - mw.ViewPageTarget.init.css is loaded
+ * Reading | ve-available
+ * Loading editor | ve-available ve-activated ve-loading
+ * - mw.ViewPageTarget.css is loaded
+ * Activate editor | ve-available ve-activated ve-activating
+ * Active | ve-available ve-activated ve-active
+ * Deactivate editor | ve-available ve-deactivating
+ * Deactivated | ve-available
+ */
+
+.ve-activated #toc,
+.ve-activated #siteNotice,
+.ve-activated .mw-indicators,
+/* Most of bodyContent can be hidden as VE has an equivalent of most children
+ in ve-init-target (sibling of #bodyContent). However, we can't hide it
+ completely as subs should remain visible (for persistence with read mode),
+ and ve-ui-mwTocWidget is also part of #bodyContent. */
+.ve-active #bodyContent >
:not(#siteSub):not(#contentSub):not(.ve-ui-mwTocWidget),
+.ve-activated #t-print,
+.ve-activated #t-permalink,
+.ve-activated #p-coll-print_export,
+.ve-activated #t-cite,
+.ve-activating .ve-ui-surface,
+.ve-deactivating .ve-ui-surface {
+ display: none;
+}
+
+.ve-activated #bodyContent,
+.ve-activated #firstHeading,
+.ve-activated #siteSub,
+.ve-activated #contentSub {
+ opacity: 0.6;
+}
+
+.ve-activated #firstHeading {
+ cursor: default;
+}
+
+/* Progress bar */
.mw-viewPageTarget-loading {
width: 128px;
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 efdfe22..104ac2e 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
@@ -86,7 +86,6 @@
*
* @private
* @param {jQuery.Promise} [targetPromise] Promise that will be
resolved with a ve.init.mw.Target
- * @return {jQuery.Promise} Resolved when the target has finished
activating
*/
function activateTarget( targetPromise ) {
// The TargetLoader module is loaded in the bottom queue, so it
should have been
@@ -98,6 +97,9 @@
uri.query.oldid
);
} );
+
+ $( 'html' ).addClass( 've-activated ve-loading' );
+
targetPromise = targetPromise || getTarget();
targetPromise
.then( function ( target ) {
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 5a18281..bcd3868 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -281,7 +281,7 @@
this.activatingDeferred = $.Deferred();
this.toolbarSetupDeferred = $.Deferred();
- $( 'html' ).addClass( 've-activating ve-activated' );
+ $( 'html' ).removeClass( 've-loading' ).addClass(
've-activating' );
$.when( this.activatingDeferred, this.toolbarSetupDeferred
).always( function () {
$( 'html' ).removeClass( 've-activating' ).addClass(
've-active' );
// We have to focus the page after hiding the original
content, otherwise
--
To view, visit https://gerrit.wikimedia.org/r/197073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9757cdbf63a2f72eda0dd03ff5588d79028ba0e
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
