scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added ability to turn keyboard shortcuts off

Browse Source
This commit is contained in:
Marcin Kurczewski
2015-05-14 23:04:30 +02:00
parent 8d119d2b62
commit c569504ce7
6 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public_html/js/BrowsingSettings.js
View File

@ -32,6 +32,7 @@ App.BrowsingSettings = function(
sketchy: true,
unsafe: true,
},
keyboardShortcuts: true,
};
}

13
public_html/js/Keyboard.js
View File

@ -1,7 +1,8 @@
var App = App || {};
App.Keyboard = function(jQuery, mousetrap) {
App.Keyboard = function(jQuery, mousetrap, browsingSettings) {
var enabled = browsingSettings.getSettings().keyboardShortcuts;
var oldStopCallback = mousetrap.stopCallback;
mousetrap.stopCallback = function(e, element, combo, sequence) {
if (combo.indexOf('ctrl') === -1 && e.ctrlKey) {
@ -28,12 +29,16 @@ App.Keyboard = function(jQuery, mousetrap) {
function keyup(key, callback) {
unbind(key);
mousetrap.bind(key, callback, 'keyup');
if (enabled) {
mousetrap.bind(key, callback, 'keyup');
}
}
function keydown(key, callback) {
unbind(key);
mousetrap.bind(key, callback);
if (enabled) {
mousetrap.bind(key, callback);
}
}
function reset() {
@ -53,4 +58,4 @@ App.Keyboard = function(jQuery, mousetrap) {
};
};
App.DI.register('keyboard', ['jQuery', 'mousetrap'], App.Keyboard);
App.DI.register('keyboard', ['jQuery', 'mousetrap', 'browsingSettings'], App.Keyboard);

1
public_html/js/Presenters/UserBrowsingSettingsPresenter.js
View File

@ -51,6 +51,7 @@ App.Presenters.UserBrowsingSettingsPresenter = function(
sketchy: $el.find('[name=listSketchyPosts]').is(':checked'),
unsafe: $el.find('[name=listUnsafePosts]').is(':checked'),
},
keyboardShortcuts: $el.find('[name=keyboardShortcuts]').is(':checked'),
};
promise.wait(browsingSettings.setSettings(newSettings))