jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348221 )
Change subject: Revert "Dropping IE9: Remove disableUneditableContent from
DesktopArticleTarget"
......................................................................
Revert "Dropping IE9: Remove disableUneditableContent from DesktopArticleTarget"
IE10 also lacks pointer events support.
This reverts commit 52667769532e27ee40f28a8d5d5aedf762b797bf.
Change-Id: I42c9530c45ad98657b403bdb266188368085716b
---
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
2 files changed, 16 insertions(+), 0 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css
index 27c5b00..6fe3171 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css
@@ -44,6 +44,7 @@
.ve-loading #content > :not( .ve-init-mw-desktopArticleTarget-loading-overlay
),
/* Once activated, all uneditable content except catlinks */
.ve-activated .ve-init-mw-desktopArticleTarget-uneditableContent {
+ /* IE10 is supported with JS events */
pointer-events: none;
-webkit-user-select: none;
-moz-user-select: none;
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 75b6417..9403616 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -878,6 +878,7 @@
}
$categories = $( $.parseHTML( response.parse.categorieshtml ) );
target.transformCategoryLinks( $categories );
+ target.disableUneditableContent( $categories );
mw.hook( 'wikipage.categories' ).fire( $categories );
$( '#catlinks' ).replaceWith( $categories );
} );
@@ -1238,6 +1239,8 @@
$content = $content.parent();
}
+ this.disableUneditableContent();
+
this.updateHistoryState();
};
@@ -1264,6 +1267,18 @@
};
/**
+ * Disabling of non-editable content, in a given context
+ *
+ * @param {jQuery|string} [context] Context to disable in
+ */
+ve.init.mw.DesktopArticleTarget.prototype.disableUneditableContent = function
( context ) {
+ $( '.ve-init-mw-desktopArticleTarget-uneditableContent', context ).on(
'click.ve-target', function ( e ) {
+ // Support IE10: Prevent default, but don't stop propagation
+ e.preventDefault();
+ } );
+};
+
+/**
* Update the history state based on the editor mode
*/
ve.init.mw.DesktopArticleTarget.prototype.updateHistoryState = function () {
--
To view, visit https://gerrit.wikimedia.org/r/348221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I42c9530c45ad98657b403bdb266188368085716b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
