Implement hand tool
The logic for the hand tool is implemented in a separate project, maintained at https://github.com/Rob--W/grab-to-pan.js Integration notes - Added toggle as an entry under the Secondary toolbar - Added shortcut "h" to toggle hand tool (to-do: document this in wiki after merge). This shortcut is also used in Adobe's Acrobat Reader. To-do: localizations for: hand_tool_enable.title= hand_tool_enable_label= hand_tool_disable.title= hand_tool_disable_label= To-do (wish): persistence of hand tool preference, preferably a global setting. secondaryToolbarButton-handTool.png created by Stephen Horlander <shorlander@mozilla.com>
This commit is contained in:
parent
f0c830dba2
commit
3914768085
@ -57,6 +57,11 @@ page_rotate_ccw.title=Rotate Counterclockwise
|
||||
page_rotate_ccw.label=Rotate Counterclockwise
|
||||
page_rotate_ccw_label=Rotate Counterclockwise
|
||||
|
||||
hand_tool_enable.title=Enable hand tool
|
||||
hand_tool_enable_label=Enable hand tool
|
||||
hand_tool_disable.title=Disable hand tool
|
||||
hand_tool_disable_label=Disable hand tool
|
||||
|
||||
# Tooltips and alt text for side panel toolbar buttons
|
||||
# (the _label strings are alt text for the buttons, the .title strings are
|
||||
# tooltips)
|
||||
|
212
web/grab_to_pan.js
Normal file
212
web/grab_to_pan.js
Normal file
@ -0,0 +1,212 @@
|
||||
/* Copyright 2013 Rob Wu <gwnRob@gmail.com>
|
||||
* https://github.com/Rob--W/grab-to-pan.js
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
var GrabToPan = (function GrabToPanClosure() {
|
||||
/**
|
||||
* Construct a GrabToPan instance for a given HTML element.
|
||||
* @param options.element {Element}
|
||||
* @param options.ignoreTarget {function} optional. See `ignoreTarget(node)`
|
||||
* @param options.onActiveChanged {function(boolean)} optional. Called
|
||||
* when grab-to-pan is (de)activated. The first argument is a boolean that
|
||||
* shows whether grab-to-pan is activated.
|
||||
*/
|
||||
function GrabToPan(options) {
|
||||
this.element = options.element;
|
||||
this.document = options.element.ownerDocument;
|
||||
if (typeof options.ignoreTarget === 'function') {
|
||||
this.ignoreTarget = options.ignoreTarget;
|
||||
}
|
||||
this.onActiveChanged = options.onActiveChanged;
|
||||
|
||||
// Bind the contexts to ensure that `this` always points to
|
||||
// the GrabToPan instance.
|
||||
this.activate = this.activate.bind(this);
|
||||
this.deactivate = this.deactivate.bind(this);
|
||||
this.toggle = this.toggle.bind(this);
|
||||
this._onmousedown = this._onmousedown.bind(this);
|
||||
this._onmousemove = this._onmousemove.bind(this);
|
||||
this._endPan = this._endPan.bind(this);
|
||||
}
|
||||
GrabToPan.prototype = {
|
||||
/**
|
||||
* Class name of element which can be grabbed
|
||||
*/
|
||||
CSS_CLASS_GRAB: 'grab-to-pan-grab',
|
||||
/**
|
||||
* Class name of element which is being dragged & panned
|
||||
*/
|
||||
CSS_CLASS_GRABBING: 'grab-to-pan-grabbing',
|
||||
|
||||
/**
|
||||
* Bind a mousedown event to the element to enable grab-detection.
|
||||
*/
|
||||
activate: function GrabToPan_activate() {
|
||||
if (!this.active) {
|
||||
this.active = true;
|
||||
this.element.addEventListener('mousedown', this._onmousedown, true);
|
||||
this.element.classList.add(this.CSS_CLASS_GRAB);
|
||||
if (this.onActiveChanged) {
|
||||
this.onActiveChanged(true);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Removes all events. Any pending pan session is immediately stopped.
|
||||
*/
|
||||
deactivate: function GrabToPan_deactivate() {
|
||||
if (this.active) {
|
||||
this.active = false;
|
||||
this.element.removeEventListener('mousedown', this._onmousedown, true);
|
||||
this._endPan();
|
||||
this.element.classList.remove(this.CSS_CLASS_GRAB);
|
||||
if (this.onActiveChanged) {
|
||||
this.onActiveChanged(false);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
toggle: function GrabToPan_toggle() {
|
||||
if (this.active) {
|
||||
this.deactivate();
|
||||
} else {
|
||||
this.activate();
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Whether to not pan if the target element is clicked.
|
||||
* Override this method to change the default behaviour.
|
||||
*
|
||||
* @param node {Element} The target of the event
|
||||
* @return {boolean} Whether to not react to the click event.
|
||||
*/
|
||||
ignoreTarget: function GrabToPan_ignoreTarget(node) {
|
||||
// Use matchesSelector to check whether the clicked element
|
||||
// is (a child of) an input element / link
|
||||
return node[matchesSelector](
|
||||
'a[href], a[href] *, input, textarea, button, button *, select, option'
|
||||
);
|
||||
},
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_onmousedown: function GrabToPan__onmousedown(event) {
|
||||
if (event.button !== 0 || this.ignoreTarget(event.target)) {
|
||||
return;
|
||||
}
|
||||
if (event.originalTarget) {
|
||||
try {
|
||||
/* jshint expr:true */
|
||||
event.originalTarget.tagName;
|
||||
} catch (e) {
|
||||
// Mozilla-specific: element is a scrollbar (XUL element)
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
this.scrollLeftStart = this.element.scrollLeft;
|
||||
this.scrollTopStart = this.element.scrollTop;
|
||||
this.clientXStart = event.clientX;
|
||||
this.clientYStart = event.clientY;
|
||||
this.document.addEventListener('mousemove', this._onmousemove, true);
|
||||
this.document.addEventListener('mouseup', this._endPan, true);
|
||||
// When a scroll event occurs before a mousemove, assume that the user
|
||||
// dragged a scrollbar (necessary for Opera Presto, Safari and IE)
|
||||
// (not needed for Chrome/Firefox)
|
||||
this.element.addEventListener('scroll', this._endPan, true);
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
this.element.classList.remove(this.CSS_CLASS_GRAB);
|
||||
this.document.documentElement.classList.add(this.CSS_CLASS_GRABBING);
|
||||
},
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_onmousemove: function GrabToPan__onmousemove(event) {
|
||||
this.element.removeEventListener('scroll', this._endPan, true);
|
||||
if (isLeftMouseReleased(event)) {
|
||||
this.document.removeEventListener('mousemove', this._onmousemove, true);
|
||||
return;
|
||||
}
|
||||
var xDiff = event.clientX - this.clientXStart;
|
||||
var yDiff = event.clientY - this.clientYStart;
|
||||
this.element.scrollTop = this.scrollTopStart - yDiff;
|
||||
this.element.scrollLeft = this.scrollLeftStart - xDiff;
|
||||
},
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_endPan: function GrabToPan__endPan() {
|
||||
this.element.removeEventListener('scroll', this._endPan, true);
|
||||
this.document.removeEventListener('mousemove', this._onmousemove, true);
|
||||
this.document.removeEventListener('mouseup', this._endPan, true);
|
||||
this.document.documentElement.classList.remove(this.CSS_CLASS_GRABBING);
|
||||
this.element.classList.add(this.CSS_CLASS_GRAB);
|
||||
}
|
||||
};
|
||||
|
||||
// Get the correct (vendor-prefixed) name of the matches method.
|
||||
var matchesSelector;
|
||||
['webkitM', 'mozM', 'msM', 'oM', 'm'].some(function(prefix) {
|
||||
var name = prefix + 'atches';
|
||||
if (name in document.documentElement) {
|
||||
matchesSelector = name;
|
||||
}
|
||||
name += 'Selector';
|
||||
if (name in document.documentElement) {
|
||||
matchesSelector = name;
|
||||
}
|
||||
return matchesSelector; // If found, then truthy, and [].some() ends.
|
||||
});
|
||||
|
||||
// Browser sniffing because it's impossible to feature-detect
|
||||
// whether event.which for onmousemove is reliable
|
||||
var isNotIEorIsIE10plus = !document.documentMode || document.documentMode > 9;
|
||||
var chrome = window.chrome;
|
||||
var isChrome15OrOpera15plus = chrome && (chrome.webstore || chrome.app);
|
||||
// ^ Chrome 15+ ^ Opera 15+
|
||||
var isSafari6plus = /Apple/.test(navigator.vendor) &&
|
||||
/Version\/([6-9]\d*|[1-5]\d+)/.test(navigator.userAgent);
|
||||
|
||||
/**
|
||||
* Whether the left mouse is not pressed.
|
||||
* @param event {MouseEvent}
|
||||
* @return {boolean} True if the left mouse button is not pressed.
|
||||
* False if unsure or if the left mouse button is pressed.
|
||||
*/
|
||||
function isLeftMouseReleased(event) {
|
||||
if ('buttons' in event && isNotIEorIsIE10plus) {
|
||||
// http://www.w3.org/TR/DOM-Level-3-Events/#events-MouseEvent-buttons
|
||||
// Firefox 15+
|
||||
// Internet Explorer 10+
|
||||
return !(event.buttons | 1);
|
||||
}
|
||||
if (isChrome15OrOpera15plus || isSafari6plus) {
|
||||
// Chrome 14+
|
||||
// Opera 15+
|
||||
// Safari 6.0+
|
||||
return event.which === 0;
|
||||
}
|
||||
}
|
||||
|
||||
return GrabToPan;
|
||||
})();
|
62
web/hand_tool.js
Normal file
62
web/hand_tool.js
Normal file
@ -0,0 +1,62 @@
|
||||
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
|
||||
/* Copyright 2013 Mozilla Foundation
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
/* globals mozL10n, GrabToPan, PDFView */
|
||||
|
||||
'use strict';
|
||||
|
||||
//#include grab_to_pan.js
|
||||
var HandTool = {
|
||||
initialize: function handToolInitialize(options) {
|
||||
var toggleHandTool = options.toggleHandTool;
|
||||
this.handTool = new GrabToPan({
|
||||
element: options.container,
|
||||
onActiveChanged: function(isActive) {
|
||||
if (isActive) {
|
||||
toggleHandTool.title =
|
||||
mozL10n.get('hand_tool_disable.title', null, 'Disable hand tool');
|
||||
toggleHandTool.firstElementChild.textContent =
|
||||
mozL10n.get('hand_tool_disable_label', null, 'Disable hand tool');
|
||||
} else {
|
||||
toggleHandTool.title =
|
||||
mozL10n.get('hand_tool_enable.title', null, 'Enable hand tool');
|
||||
toggleHandTool.firstElementChild.textContent =
|
||||
mozL10n.get('hand_tool_enable_label', null, 'Enable hand tool');
|
||||
}
|
||||
}
|
||||
});
|
||||
toggleHandTool.addEventListener('click', this.handTool.toggle, false);
|
||||
// TODO: Read global prefs and call this.handTool.activate() if needed.
|
||||
},
|
||||
|
||||
toggle: function handToolToggle() {
|
||||
this.handTool.toggle();
|
||||
},
|
||||
|
||||
enterPresentationMode: function handToolEnterPresentationMode() {
|
||||
if (this.handTool.active) {
|
||||
this.wasActive = true;
|
||||
this.handTool.deactivate();
|
||||
}
|
||||
},
|
||||
|
||||
exitPresentationMode: function handToolExitPresentationMode() {
|
||||
if (this.wasActive) {
|
||||
this.wasActive = null;
|
||||
this.handTool.activate();
|
||||
}
|
||||
}
|
||||
};
|
BIN
web/images/grab.cur
Normal file
BIN
web/images/grab.cur
Normal file
Binary file not shown.
After Width: | Height: | Size: 326 B |
BIN
web/images/grabbing.cur
Normal file
BIN
web/images/grabbing.cur
Normal file
Binary file not shown.
After Width: | Height: | Size: 326 B |
BIN
web/images/secondaryToolbarButton-handTool.png
Normal file
BIN
web/images/secondaryToolbarButton-handTool.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 250 B |
@ -14,7 +14,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
/* globals PDFView, scrollIntoView */
|
||||
/* globals PDFView, scrollIntoView, HandTool */
|
||||
|
||||
'use strict';
|
||||
|
||||
@ -103,6 +103,7 @@ var PresentationMode = {
|
||||
window.addEventListener('contextmenu', this.contextMenu, false);
|
||||
|
||||
this.showControls();
|
||||
HandTool.enterPresentationMode();
|
||||
this.contextMenuOpen = false;
|
||||
this.container.setAttribute('contextmenu', 'viewerContextMenu');
|
||||
},
|
||||
@ -121,6 +122,7 @@ var PresentationMode = {
|
||||
this.hideControls();
|
||||
this.args = null;
|
||||
PDFView.clearMouseScrollState();
|
||||
HandTool.exitPresentationMode();
|
||||
this.container.removeAttribute('contextmenu');
|
||||
this.contextMenuOpen = false;
|
||||
|
||||
|
@ -983,6 +983,10 @@ html[dir="rtl"] .secondaryToolbarButton > span {
|
||||
content: url(images/secondaryToolbarButton-rotateCw.png);
|
||||
}
|
||||
|
||||
.secondaryToolbarButton.handTool::before {
|
||||
content: url(images/secondaryToolbarButton-handTool.png);
|
||||
}
|
||||
|
||||
.verticalToolbarSeparator {
|
||||
display: block;
|
||||
padding: 8px 0;
|
||||
@ -1494,6 +1498,30 @@ canvas {
|
||||
color: black;
|
||||
}
|
||||
|
||||
.grab-to-pan-grab * {
|
||||
cursor: url("images/grab.cur"), move !important;
|
||||
cursor: -webkit-grab !important;
|
||||
cursor: -moz-grab !important;
|
||||
}
|
||||
.grab-to-pan-grabbing,
|
||||
.grab-to-pan-grabbing * {
|
||||
cursor: url("images/grabbing.cur"), move !important;
|
||||
cursor: -webkit-grabbing !important;
|
||||
cursor: -moz-grabbing !important;
|
||||
}
|
||||
.grab-to-pan-grab input,
|
||||
.grab-to-pan-grab textarea,
|
||||
.grab-to-pan-grab button,
|
||||
.grab-to-pan-grab button *,
|
||||
.grab-to-pan-grab select,
|
||||
.grab-to-pan-grab option {
|
||||
cursor: auto !important;
|
||||
}
|
||||
.grab-to-pan-grab a[href],
|
||||
.grab-to-pan-grab a[href] * {
|
||||
cursor: pointer !important;
|
||||
}
|
||||
|
||||
@page {
|
||||
margin: 0;
|
||||
}
|
||||
|
@ -75,6 +75,8 @@ limitations under the License.
|
||||
<script type="text/javascript" src="secondary_toolbar.js"></script>
|
||||
<script type="text/javascript" src="password_prompt.js"></script>
|
||||
<script type="text/javascript" src="presentation_mode.js"></script>
|
||||
<script type="text/javascript" src="grab_to_pan.js"></script>
|
||||
<script type="text/javascript" src="hand_tool.js"></script>
|
||||
<!--#endif-->
|
||||
|
||||
<script type="text/javascript" src="debugger.js"></script>
|
||||
@ -163,6 +165,12 @@ limitations under the License.
|
||||
<button id="pageRotateCcw" class="secondaryToolbarButton rotateCcw" title="Rotate Counterclockwise" tabindex="26" data-l10n-id="page_rotate_ccw">
|
||||
<span data-l10n-id="page_rotate_ccw_label">Rotate Counterclockwise</span>
|
||||
</button>
|
||||
|
||||
<div class="horizontalToolbarSeparator"></div>
|
||||
|
||||
<button id="toggleHandTool" class="secondaryToolbarButton handTool" title="Enable hand tool" tabindex="27" data-l10n-id="hand_tool_enable">
|
||||
<span data-l10n-id="hand_tool_enable_label">Enable hand tool</span>
|
||||
</button>
|
||||
</div>
|
||||
</div> <!-- secondaryToolbar -->
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
PDFFindController, ProgressBar, TextLayerBuilder, DownloadManager,
|
||||
getFileName, scrollIntoView, getPDFFileNameFromURL, PDFHistory,
|
||||
Preferences, Settings, PageView, ThumbnailView, noContextMenuHandler,
|
||||
SecondaryToolbar, PasswordPrompt, PresentationMode */
|
||||
SecondaryToolbar, PasswordPrompt, PresentationMode, HandTool */
|
||||
|
||||
'use strict';
|
||||
|
||||
@ -87,6 +87,7 @@ var currentPageNumber = 1;
|
||||
//#include secondary_toolbar.js
|
||||
//#include password_prompt.js
|
||||
//#include presentation_mode.js
|
||||
//#include hand_tool.js
|
||||
|
||||
var PDFView = {
|
||||
pages: [],
|
||||
@ -140,6 +141,11 @@ var PDFView = {
|
||||
integratedFind: this.supportsIntegratedFind
|
||||
});
|
||||
|
||||
HandTool.initialize({
|
||||
container: container,
|
||||
toggleHandTool: document.getElementById('toggleHandTool')
|
||||
});
|
||||
|
||||
SecondaryToolbar.initialize({
|
||||
toolbar: document.getElementById('secondaryToolbar'),
|
||||
presentationMode: PresentationMode,
|
||||
@ -2138,6 +2144,11 @@ window.addEventListener('keydown', function keydown(evt) {
|
||||
}
|
||||
break;
|
||||
|
||||
case 72: // 'h'
|
||||
if (!PresentationMode.active) {
|
||||
HandTool.toggle();
|
||||
}
|
||||
break;
|
||||
case 82: // 'r'
|
||||
PDFView.rotatePages(90);
|
||||
break;
|
||||
|
Loading…
x
Reference in New Issue
Block a user