Move view and keyboard into user settings dialog

This commit is contained in:
Nick O'Leary
2017-04-28 20:49:01 +01:00
parent 8135da71bd
commit 5938143002
17 changed files with 643 additions and 124 deletions

View File

@@ -170,7 +170,7 @@
var that = this;
var count = 0;
if (!this.activeFilter) {
this.element.children().show();
return this.element.children().show();
}
var items = this.items();
items.each(function (i,el) {

View File

@@ -28,7 +28,17 @@ RED.menu = (function() {
}
function setInitialState() {
var savedStateActive = isSavedStateActive(opt.id);
var savedStateActive = RED.settings.get("menu-" + opt.id);
if (opt.setting) {
// May need to migrate pre-0.17 setting
if (savedStateActive !== null) {
RED.settings.set(opt.setting,savedStateActive);
RED.settings.remove("menu-" + opt.id);
} else {
savedStateActive = RED.settings.get(opt.setting);
}
}
if (savedStateActive) {
link.addClass("active");
triggerAction(opt.id,true);
@@ -176,18 +186,10 @@ RED.menu = (function() {
}
}
function isSavedStateActive(id) {
return RED.settings.get("menu-" + id);
}
function isSelected(id) {
return $("#" + id).hasClass("active");
}
function setSavedState(id, state) {
RED.settings.set("menu-" + id, state);
}
function setSelected(id,state) {
if (isSelected(id) == state) {
return;
@@ -201,7 +203,7 @@ RED.menu = (function() {
if (opt && opt.onselect) {
triggerAction(opt.id,state);
}
setSavedState(id, state);
RED.settings.set(opt.setting||("menu-"+opt.id), state);
}
function toggleSelected(id) {

View File

@@ -26,6 +26,9 @@ RED.tabs = (function() {
var wrapper = ul.wrap( "<div>" ).parent();
var scrollContainer = ul.wrap( "<div>" ).parent();
wrapper.addClass("red-ui-tabs");
if (options.vertical) {
wrapper.addClass("red-ui-tabs-vertical");
}
if (options.addButton && typeof options.addButton === 'function') {
wrapper.addClass("red-ui-tabs-add");
var addButton = $('<div class="red-ui-tab-button"><a href="#"><i class="fa fa-plus"></i></a></div>').appendTo(wrapper);
@@ -146,6 +149,9 @@ RED.tabs = (function() {
}
function updateTabWidths() {
if (options.vertical) {
return;
}
var tabs = ul.find("li.red-ui-tab");
var width = wrapper.width();
var tabCount = tabs.size();