You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by fe...@apache.org on 2016/01/24 01:21:12 UTC
incubator-zeppelin git commit: Keyboard Shortcut - Map Alt or Opt
Based on Device
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 882cdead7 -> 5e89e75a7
Keyboard Shortcut - Map Alt or Opt Based on Device
### What is this PR for?
Right now the keyboard shortcut modal shows 'alt' but on macs 'alt' maps to 'opt'. Could be confusing to some people who don't see 'alt' on the keyboard on their macs.
There are many way to achieve this mapping. I used this to minimize code change and take advantage of when paragraphs check for appVersion to set keyboard shortcuts.
Open to suggestions on best approach to solve this problem.
### What type of PR is it?
Improvement
### Todos
### Is there a relevant Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-626
### How should this be tested?
1. Emulate browser to be Mac and open keyboard shortcut
2. Emulate browser to be Windows and open keyboard shortcut
### Screenshots (if appropriate)
Macs:
Windows:
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Michael Chen <mi...@gmail.com>
Closes #665 from MikeTYChen/ZEPPELIN-626 and squashes the following commits:
86153b1 [Michael Chen] change wording opt to option and titles"
ab6be02 [Michael Chen] merge to updated branch
b578e88 [Michael Chen] map alt or opt based on device
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/5e89e75a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/5e89e75a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/5e89e75a
Branch: refs/heads/master
Commit: 5e89e75a7e93448fa33e5b0cb0608f44ba5d2b91
Parents: 882cdea
Author: Michael Chen <mi...@gmail.com>
Authored: Fri Jan 22 09:30:03 2016 -0600
Committer: Felix Cheung <fe...@apache.org>
Committed: Sat Jan 23 16:21:12 2016 -0800
----------------------------------------------------------------------
.../notebook/paragraph/paragraph.controller.js | 2 ++
.../modal-shortcut/modal-shortcut.html | 27 ++++++++++----------
2 files changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/5e89e75a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index 0af25fd..a985f64 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -655,9 +655,11 @@ angular.module('zeppelinWebApp')
if (navigator.appVersion.indexOf('Mac') !== -1 ) {
$scope.editor.setKeyboardHandler('ace/keyboard/emacs');
+ $rootScope.isMac = true;
} else if (navigator.appVersion.indexOf('Win') !== -1 ||
navigator.appVersion.indexOf('X11') !== -1 ||
navigator.appVersion.indexOf('Linux') !== -1) {
+ $rootScope.isMac = false;
// not applying emacs key binding while the binding override Ctrl-v. default behavior of paste text on windows.
}
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/5e89e75a/zeppelin-web/src/components/modal-shortcut/modal-shortcut.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/modal-shortcut/modal-shortcut.html b/zeppelin-web/src/components/modal-shortcut/modal-shortcut.html
index baeb011..863d7dd 100644
--- a/zeppelin-web/src/components/modal-shortcut/modal-shortcut.html
+++ b/zeppelin-web/src/components/modal-shortcut/modal-shortcut.html
@@ -21,7 +21,7 @@ limitations under the License.
</div>
<div class="modal-body">
- <h4>Control in Note</h4>
+ <h4>Note Shortcuts</h4>
<div class="row">
<div class="col-md-4">
@@ -37,7 +37,7 @@ limitations under the License.
<div class="row">
<div class="col-md-4">
<div class="keys">
- <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">Alt</kbd> + <kbd class="kbd-dark">c</kbd>
+ <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-dark">c</kbd>
</div>
</div>
<div class="col-md-8">
@@ -70,7 +70,7 @@ limitations under the License.
<div class="row">
<div class="col-md-4">
<div class="keys">
- <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">Alt</kbd> + <kbd class="kbd-dark">d</kbd>
+ <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-dark">d</kbd>
</div>
</div>
<div class="col-md-8">
@@ -81,7 +81,7 @@ limitations under the License.
<div class="row">
<div class="col-md-4">
<div class="keys">
- <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">Alt</kbd> + <kbd class="kbd-dark">a</kbd>
+ <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-dark">a</kbd>
</div>
</div>
<div class="col-md-8">
@@ -92,7 +92,7 @@ limitations under the License.
<div class="row">
<div class="col-md-4">
<div class="keys">
- <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">Alt</kbd> + <kbd class="kbd-dark">b</kbd>
+ <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-dark">b</kbd>
</div>
</div>
<div class="col-md-8">
@@ -103,7 +103,7 @@ limitations under the License.
<div class="row">
<div class="col-md-4">
<div class="keys">
- <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">Alt</kbd> + <kbd class="kbd-dark">k</kbd>
+ <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-dark">k</kbd>
</div>
</div>
<div class="col-md-8">
@@ -114,7 +114,7 @@ limitations under the License.
<div class="row">
<div class="col-md-4">
<div class="keys">
- <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">Alt</kbd> + <kbd class="kbd-dark">j</kbd>
+ <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-dark">j</kbd>
</div>
</div>
<div class="col-md-8">
@@ -125,6 +125,7 @@ limitations under the License.
<div class="row">
<div class="col-md-4">
<div class="keys">
+ <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-dark">o</kbd>
<kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">Alt</kbd> + <kbd class="kbd-dark">r</kbd>
</div>
</div>
@@ -136,7 +137,7 @@ limitations under the License.
<div class="row">
<div class="col-md-4">
<div class="keys">
- <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">Alt</kbd> + <kbd class="kbd-dark">o</kbd>
+ <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-dark">o</kbd>
</div>
</div>
<div class="col-md-8">
@@ -147,7 +148,7 @@ limitations under the License.
<div class="row">
<div class="col-md-4">
<div class="keys">
- <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">Alt</kbd> + <kbd class="kbd-dark">e</kbd>
+ <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-dark">e</kbd>
</div>
</div>
<div class="col-md-8">
@@ -158,7 +159,7 @@ limitations under the License.
<div class="row">
<div class="col-md-4">
<div class="keys">
- <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">Alt</kbd> + <kbd class="kbd-dark">m</kbd>
+ <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-dark">m</kbd>
</div>
</div>
<div class="col-md-8">
@@ -169,7 +170,7 @@ limitations under the License.
<div class="row">
<div class="col-md-4">
<div class="keys">
- <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">Alt</kbd> + <kbd class="kbd-dark">t</kbd>
+ <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-dark">t</kbd>
</div>
</div>
<div class="col-md-8">
@@ -180,7 +181,7 @@ limitations under the License.
<div class="row">
<div class="col-md-4">
<div class="keys">
- <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">Alt</kbd> + <kbd class="kbd-dark">1</kbd>~<kbd class="kbd-dark">0</kbd>,<kbd class="kbd-dark">-</kbd>,<kbd class="kbd-dark">+</kbd>
+ <kbd class="kbd-dark">Ctrl</kbd> + <kbd class="kbd-dark">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-dark">1</kbd>~<kbd class="kbd-dark">0</kbd>,<kbd class="kbd-dark">-</kbd>,<kbd class="kbd-dark">+</kbd>
</div>
</div>
<div class="col-md-8">
@@ -188,7 +189,7 @@ limitations under the License.
</div>
</div>
- <h4>Control in Note Editor</h4>
+ <h4>Editor Shortcuts</h4>
<div class="row">
<div class="col-md-4">