jenkins-bot has submitted this change and it was merged.
Change subject: Fixing shields
......................................................................
Fixing shields
Shields were being added twice. Switched the blank png to gif
because the red IE background couldn't be replicated. Changed
some styles from Alien to Protected.
Change-Id: I9c62665e4e0dc54b8511749b9d2a629db7990a16
---
M modules/ve/ce/styles/ve.ce.Node.css
M modules/ve/ce/ve.ce.ProtectedNode.js
2 files changed, 11 insertions(+), 20 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ce/styles/ve.ce.Node.css
b/modules/ve/ce/styles/ve.ce.Node.css
index e0143ef..6d463fb 100644
--- a/modules/ve/ce/styles/ve.ce.Node.css
+++ b/modules/ve/ce/styles/ve.ce.Node.css
@@ -14,6 +14,15 @@
left: 0 !important;
bottom: 0 !important;
right: 0 !important;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
+
+.ve-ce-protectedNode::-moz-selection,
+.ve-ce-protectedNode *::-moz-selection {
+ background: transparent;
}
.ve-ce-protectedNode {
@@ -104,20 +113,6 @@
}
/* ve.ce.AlienNode */
-
-/* Block aliens are unselectable */
-.ve-ce-alienBlockNode,
-.ve-ce-alienBlockNode * {
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-}
-
-.ve-ce-alienBlockNode::-moz-selection,
-.ve-ce-alienBlockNode *::-moz-selection {
- background: transparent;
-}
/* Fix weird Chrome native selection involving floated elements */
.ve-ce-alienBlockNode:before,
diff --git a/modules/ve/ce/ve.ce.ProtectedNode.js
b/modules/ve/ce/ve.ce.ProtectedNode.js
index 2d70a7c..cc8cacc 100644
--- a/modules/ve/ce/ve.ce.ProtectedNode.js
+++ b/modules/ve/ce/ve.ce.ProtectedNode.js
@@ -33,9 +33,7 @@
/**
* Template for shield elements.
*
- * Uses data URI to inject a 1x1 transparent PNG image into the DOM.
- *
- * Using transparent png instead of gif because IE 10 renders gif as solid red
when used as img src.
+ * Uses data URI to inject a 1x1 transparent GIF image into the DOM.
*
* @property {jQuery}
* @static
@@ -43,8 +41,7 @@
*/
ve.ce.ProtectedNode.static.$shieldTemplate = $( '<img>' )
.addClass( 've-ce-protectedNode-shield' )
- .attr( 'src',
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAFElEQVR4'
+
- 'XgXAAQ0AAABAMP1L30IDCPwC/o5WcS4AAAAASUVORK5CYII=' );
+ .attr( 'src',
'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==' );
/**
* Phantom element template.
@@ -86,7 +83,6 @@
}
$shield = $shieldTemplate.clone().appendTo(
$this );
node.$shields = node.$shields.add( $shield );
- $this.append( $shieldTemplate.clone() );
}
} );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/62861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c62665e4e0dc54b8511749b9d2a629db7990a16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Christian <[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
