WMDE-Fisch has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/323134

Change subject: Improve user-select browser support
......................................................................

Improve user-select browser support

Adds support for IE9/iOS/Konqueror

Change-Id: Id5cf768798fb43b6cd12a2d96b53289b2182be75
---
M includes/TwoColConflictPage.php
M modules/ext.TwoColConflict.css
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/34/323134/1

diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php
index 7acbfae..da31b51 100644
--- a/includes/TwoColConflictPage.php
+++ b/includes/TwoColConflictPage.php
@@ -190,14 +190,14 @@
                                        switch ( $changeSet[ 'action' ] ) {
                                                case 'add':
                                                        $output[] = '<div 
class="mw-twocolconflict-diffchange-own">' .
-                                                               '<div 
class="mw-twocolconflict-diffchange-title">' .
+                                                               '<div 
class="mw-twocolconflict-diffchange-title" unselectable="on">' . // IE9
                                                                
$this->getContext()->msg( 'twoColConflict-diffchange-own-title' ) .
                                                                '</div>';
                                                        $output[] = 
$changeSet['new'] . '</div>';
                                                        break;
                                                case 'delete':
                                                        $output[] = '<div 
class="mw-twocolconflict-diffchange-foreign">' .
-                                                               '<div 
class="mw-twocolconflict-diffchange-title">' .
+                                                               '<div 
class="mw-twocolconflict-diffchange-title" unselectable="on">' . // IE9
                                                                
$this->getContext()->msg(
                                                                        
'twoColConflict-diffchange-foreign-title',
                                                                        
$lastUser
diff --git a/modules/ext.TwoColConflict.css b/modules/ext.TwoColConflict.css
index 94767ac..5d15120 100644
--- a/modules/ext.TwoColConflict.css
+++ b/modules/ext.TwoColConflict.css
@@ -96,7 +96,9 @@
        padding: 1px 2px;
        font-weight: bold;
        border-radius: 2px;
+       -webkit-touch-callout: none; /* iOS Safari */
        -webkit-user-select: none;
+       -khtml-user-select: none; /* Konqueror */
        -moz-user-select: none;
        -ms-user-select: none;
        user-select: none;

-- 
To view, visit https://gerrit.wikimedia.org/r/323134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5cf768798fb43b6cd12a2d96b53289b2182be75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <christoph.jau...@wikimedia.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to