frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent search box opening when other modals are open

This commit is contained in:
Nick O'Leary 2016-10-09 22:54:47 +01:00
parent f2d36b84b5
commit 3c60b3d2c9
6 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/js/ui/palette-editor.js
View File

@ -262,23 +262,27 @@ RED.palette.editor = (function() {
$("#header-shade").show(); $("#header-shade").show();
$("#editor-shade").show(); $("#editor-shade").show();
$("#sidebar-shade").show(); $("#sidebar-shade").show();
$("#sidebar-separator").hide();
$("#main-container").addClass("palette-expanded"); $("#main-container").addClass("palette-expanded");
setTimeout(function() { setTimeout(function() {
editorTabs.resize(); editorTabs.resize();
},250); },250);
RED.events.emit("palette-editor:open");
} }
function hidePaletteEditor() { function hidePaletteEditor() {
$("#main-container").removeClass("palette-expanded"); $("#main-container").removeClass("palette-expanded");
$("#header-shade").hide(); $("#header-shade").hide();
$("#editor-shade").hide(); $("#editor-shade").hide();
$("#sidebar-shade").hide(); $("#sidebar-shade").hide();
$("#sidebar-separator").show();
$("#palette-editor").find('.expanded').each(function(i,el) { $("#palette-editor").find('.expanded').each(function(i,el) {
$(el).find(".palette-module-content").slideUp(); $(el).find(".palette-module-content").slideUp();
$(el).removeClass('expanded'); $(el).removeClass('expanded');
}); });
filterInput.searchBox('value',""); filterInput.searchBox('value',"");
searchInput.searchBox('value',""); searchInput.searchBox('value',"");
RED.events.emit("palette-editor:close");
} }
function filterChange(val) { function filterChange(val) {

13
editor/js/ui/search.js
View File

@ -15,7 +15,7 @@
**/ **/
RED.search = (function() { RED.search = (function() {
var disabled = false;
var dialog = null; var dialog = null;
var searchInput; var searchInput;
var searchResults; var searchResults;
@ -244,6 +244,7 @@ RED.search = (function() {
$("#editor-shade").show(); $("#editor-shade").show();
$("#palette-shade").show(); $("#palette-shade").show();
$("#sidebar-shade").show(); $("#sidebar-shade").show();
$("#sidebar-separator").hide();
indexWorkspace(); indexWorkspace();
if (dialog === null) { if (dialog === null) {
createDialog(); createDialog();
@ -261,6 +262,7 @@ RED.search = (function() {
$("#editor-shade").hide(); $("#editor-shade").hide();
$("#palette-shade").hide(); $("#palette-shade").hide();
$("#sidebar-shade").hide(); $("#sidebar-shade").hide();
$("#sidebar-separator").show();
if (dialog !== null) { if (dialog !== null) {
dialog.slideUp(200,function() { dialog.slideUp(200,function() {
searchInput.searchBox('value',''); searchInput.searchBox('value','');
@ -270,7 +272,14 @@ RED.search = (function() {
} }
function init() { function init() {
RED.keyboard.add("*",/* . */ 190,{ctrl:true},function(){show();d3.event.preventDefault();}); RED.keyboard.add("*",/* . */ 190,{ctrl:true},function(){if (!disabled) { show(); } d3.event.preventDefault();});
RED.events.on("editor:open",function() { disabled = true; });
RED.events.on("editor:close",function() { disabled = false; });
RED.events.on("palette-editor:open",function() { disabled = true; });
RED.events.on("palette-editor:close",function() { disabled = false; });
$("#header-shade").on('mousedown',hide); $("#header-shade").on('mousedown',hide);
$("#editor-shade").on('mousedown',hide); $("#editor-shade").on('mousedown',hide);
$("#palette-shade").on('mousedown',hide); $("#palette-shade").on('mousedown',hide);

2
editor/sass/colors.scss
View File

@ -66,4 +66,4 @@ $editor-button-background-primary-hover: #6E0A1E;
$editor-button-color: #999; $editor-button-color: #999;
$editor-button-background: #fff; $editor-button-background: #fff;
$shade-color: rgba(220,220,220,0.5); $shade-color: rgba(100,100,100,0.5);

5
editor/sass/editor.scss
View File

@ -176,6 +176,11 @@
background: $shade-color; background: $shade-color;
z-index: 2; z-index: 2;
} }
#sidebar-shade {
left: -8px;
top: -1px;
bottom: -1px;
}
.dialog-form,#dialog-form, #dialog-config-form { .dialog-form,#dialog-form, #dialog-config-form {

2
editor/sass/palette-editor.scss
View File

@ -91,7 +91,7 @@
bottom:0; bottom:0;
left:0; left:0;
right:0; right:0;
background: rgba(255,255,255,0.8); background: $shade-color;
text-align: center; text-align: center;
padding-top: 20px; padding-top: 20px;
} }

7
editor/sass/search.scss
View File

@ -84,18 +84,19 @@
margin-right: 5px; margin-right: 5px;
} }
.red-ui-search-result-node-label { .red-ui-search-result-node-label {
font-weight: bold; color: #222;
} }
.red-ui-search-result-node-type { .red-ui-search-result-node-type {
font-style: italic; font-style: italic;
font-size: 0.9em;
} }
.red-ui-search-result-node-flow { .red-ui-search-result-node-flow {
float:right; float:right;
font-size: 0.9em; font-size: 0.8em;
} }
.red-ui-search-result-node-id { .red-ui-search-result-node-id {
display:none; display:none;
font-size: 0.9em; font-size: 0.8em;
} }
.red-ui-search-empty { .red-ui-search-empty {
padding: 10px; padding: 10px;