From 128c4fe222c624da1b1d885f17fdfc83f440846b Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 24 Jan 2017 16:14:03 +0000 Subject: [PATCH] Add visual cue as to whether the workspace is focused --- editor/js/ui/common/tabs.js | 3 +++ editor/js/ui/view.js | 6 ++++++ editor/js/ui/workspaces.js | 5 +++++ editor/sass/workspace.scss | 7 +++++++ 4 files changed, 21 insertions(+) diff --git a/editor/js/ui/common/tabs.js b/editor/js/ui/common/tabs.js index e549e5f06..6d5f058d3 100644 --- a/editor/js/ui/common/tabs.js +++ b/editor/js/ui/common/tabs.js @@ -73,6 +73,9 @@ RED.tabs = (function() { ul.children().addClass("red-ui-tab"); function onTabClick() { + if (options.onclick) { + options.onclick(tabs[$(this).attr('href').slice(1)]); + } activateTab($(this)); return false; } diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js index 4436bbdf2..608d22c64 100644 --- a/editor/js/ui/view.js +++ b/editor/js/ui/view.js @@ -384,6 +384,12 @@ RED.view = (function() { } } }); + $("#chart").focus(function() { + $("#workspace-tabs").addClass("workspace-focussed") + }); + $("#chart").blur(function() { + $("#workspace-tabs").removeClass("workspace-focussed") + }); RED.actions.add("core:copy-selection-to-internal-clipboard",copySelection); RED.actions.add("core:cut-selection-to-internal-clipboard",function(){copySelection();deleteSelection();}); diff --git a/editor/js/ui/workspaces.js b/editor/js/ui/workspaces.js index 8c3232de5..ea32abcfb 100644 --- a/editor/js/ui/workspaces.js +++ b/editor/js/ui/workspaces.js @@ -39,6 +39,7 @@ RED.workspaces = (function() { RED.nodes.dirty(true); } } + RED.view.focus(); return ws; } function deleteWorkspace(ws) { @@ -139,6 +140,10 @@ RED.workspaces = (function() { RED.events.emit("workspace:change",event); window.location.hash = 'flow/'+tab.id; RED.sidebar.config.refresh(); + RED.view.focus(); + }, + onclick: function(tab) { + RED.view.focus(); }, ondblclick: function(tab) { if (tab.type != "subflow") { diff --git a/editor/sass/workspace.scss b/editor/sass/workspace.scss index 959e67a06..c7d754b88 100644 --- a/editor/sass/workspace.scss +++ b/editor/sass/workspace.scss @@ -51,3 +51,10 @@ #workspace-footer { @include component-footer; } + +#workspace-tabs:not(.workspace-focussed) { + opacity:0.8; + li.red-ui-tab.active a { + color:#666; + } +}