Skip to content

Remove use of delite/keys #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove use of delite/keys #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Keyboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** @module dtreemap/Keyboard */
define(["dcl/dcl", "delite/keys", "./_utils", "dpointer/events"],
function (dcl, keys, utils) {
define(["dcl/dcl", "./_utils", "dpointer/events"],
function (dcl, utils) {

/**
* Mixin that specializes TreeMap to support keyboard navigation and accessibility.
Expand Down Expand Up @@ -49,9 +49,9 @@ define(["dcl/dcl", "delite/keys", "./_utils", "dpointer/events"],
var parent = renderer.parentItem;
var children, childrenI, selectedI;
// we also need items to be sorted out
if (e.keyCode !== keys.UP_ARROW && e.keyCode !== keys.NUMPAD_MINUS &&
e.keyCode !== keys.NUMPAD_PLUS) {
children = (e.keyCode === keys.DOWN_ARROW) ? selected.children : parent.children;
if (e.key !== "Up" && e.key !== "Subtract" &&
e.key !== "Add") {
children = (e.key === "Down") ? selected.children : parent.children;
if (children) {
childrenI = utils.initElements(children, this._computeAreaForItem.bind(this)).elements;
selectedI = childrenI[children.indexOf(selected)];
Expand All @@ -68,23 +68,23 @@ define(["dcl/dcl", "delite/keys", "./_utils", "dpointer/events"],

_navigate: function (e, renderer, selected, parent, children, childrenI, selectedI) {
var newSelected;
switch (e.keyCode) {
case keys.LEFT_ARROW:
switch (e.key) {
case "Left":
newSelected = children[childrenI[Math.max(0, childrenI.indexOf(selectedI) - 1)].index];
break;
case keys.RIGHT_ARROW:
case "Right":
newSelected = children[childrenI[Math.min(childrenI.length - 1,
childrenI.indexOf(selectedI) + 1)].index];
break;
case keys.DOWN_ARROW:
case "Down":
newSelected = children[childrenI[0].index];
break;
case keys.UP_ARROW:
case "Up":
newSelected = parent;
break;
// TODO
//case "+":
case keys.NUMPAD_PLUS:
case "Add":
if (!this._isLeaf(selected) && this.drillDown) {
this.drillDown(renderer);
e.preventDefault();
Expand All @@ -93,7 +93,7 @@ define(["dcl/dcl", "delite/keys", "./_utils", "dpointer/events"],
break;
// TODO
//case "-":
case keys.NUMPAD_MINUS:
case "Subtract":
if (!this._isLeaf(selected) && this.drillUp) {
this.drillUp(renderer);
e.preventDefault();
Expand Down