Browse Source

Merge pull request #5478 from Snuffleupagus/bug-1018882

Prevent text selection in Presentation Mode (bug 1018882)
Yury Delendik 11 years ago
parent
commit
bb91aa5e38
  1. 5
      web/presentation_mode.js
  2. 6
      web/viewer.css

5
web/presentation_mode.js

@ -150,6 +150,11 @@ var PresentationMode = {
HandTool.enterPresentationMode(); HandTool.enterPresentationMode();
this.contextMenuOpen = false; this.contextMenuOpen = false;
this.container.setAttribute('contextmenu', 'viewerContextMenu'); this.container.setAttribute('contextmenu', 'viewerContextMenu');
// Text selection is disabled in Presentation Mode, thus it's not possible
// for the user to deselect text that is selected (e.g. with "Select all")
// when entering Presentation Mode, hence we remove any active selection.
window.getSelection().removeAllRanges();
}, },
exit: function presentationModeExit() { exit: function presentationModeExit() {

6
web/viewer.css

@ -55,6 +55,7 @@ select {
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
cursor: none; cursor: none;
-webkit-user-select: none;
} }
#viewerContainer:-moz-full-screen { #viewerContainer:-moz-full-screen {
@ -65,6 +66,7 @@ select {
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
cursor: none; cursor: none;
-moz-user-select: none;
} }
#viewerContainer:-ms-fullscreen { #viewerContainer:-ms-fullscreen {
@ -74,6 +76,7 @@ select {
height: 100%; height: 100%;
overflow: hidden !important; overflow: hidden !important;
cursor: none; cursor: none;
-ms-user-select: none;
} }
#viewerContainer:-ms-fullscreen::-ms-backdrop { #viewerContainer:-ms-fullscreen::-ms-backdrop {
@ -88,6 +91,9 @@ select {
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
cursor: none; cursor: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
} }
:-webkit-full-screen a:not(.internalLink) { :-webkit-full-screen a:not(.internalLink) {

Loading…
Cancel
Save