diff --git a/src/js/buttons.js b/src/js/buttons.js index 6e7d295..836841d 100644 --- a/src/js/buttons.js +++ b/src/js/buttons.js @@ -13,7 +13,7 @@ function Buttons(session) { }; document.addEventListener('keydown', function(event) { - var button = session.get('options').layout[event.key]; + var button = session.get().options.layout[event.key]; if(button != undefined && mapping != undefined && mapping[button] != undefined) { event.preventDefault(); mapping[button](); @@ -30,7 +30,7 @@ function Buttons(session) { function assign(key, button) { var layoutDiff = {}; - var layout = session.get('options').layout; + var layout = session.get().options.layout; for(var currentKey in layout) { if(layout[currentKey] == button) { layoutDiff[currentKey] = undefined; diff --git a/src/js/session.js b/src/js/session.js index d24f256..ee2d2a3 100644 --- a/src/js/session.js +++ b/src/js/session.js @@ -30,18 +30,8 @@ function Session(async, messaging) { return o; } - function get(path, obj) { - obj = obj == undefined ? session : obj; - if(Array.isArray(path)) { - if(path.length == 0) { - return obj; - } else { - var key = path.shift(); - return get(path, obj[key]); - } - } else { - return obj[path]; - } + function get() { + return session; } function save(key, value) { diff --git a/src/js/ui.js b/src/js/ui.js index 691069c..17d3d85 100644 --- a/src/js/ui.js +++ b/src/js/ui.js @@ -5,7 +5,7 @@ function UI(async, buttons, cache, dom, messaging, screen, session) { medium: 50, fast: 20 }; - var textSpeed = session.get('options').textSpeed; + var textSpeed = session.get().options.textSpeed; return { animation: animation, @@ -212,7 +212,7 @@ function UI(async, buttons, cache, dom, messaging, screen, session) { } function setLayout() { - var layout = session.get('options').layout + var layout = session.get().options.layout; var buttonsMenu = { cancel: function() {}, entries: [],