From 8a6488b067c0e556d6e935e20f0a12da3c06e675 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 8 Jan 2018 23:14:37 +0000 Subject: [PATCH] Move editor project files and add search to open dialog --- Gruntfile.js | 8 +- .../js/ui/{ => projects}/projectSettings.js | 0 .../ui/{ => projects}/projectUserSettings.js | 0 editor/js/ui/{ => projects}/projects.js | 280 ++++++++++++------ .../ui/{ => projects}/tab-versionControl.js | 0 editor/sass/projects.scss | 11 + 6 files changed, 203 insertions(+), 96 deletions(-) rename editor/js/ui/{ => projects}/projectSettings.js (100%) rename editor/js/ui/{ => projects}/projectUserSettings.js (100%) rename editor/js/ui/{ => projects}/projects.js (91%) rename editor/js/ui/{ => projects}/tab-versionControl.js (100%) diff --git a/Gruntfile.js b/Gruntfile.js index e8fbe5581..e12928caf 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -153,10 +153,10 @@ module.exports = function(grunt) { "editor/js/ui/typeSearch.js", "editor/js/ui/subflow.js", "editor/js/ui/userSettings.js", - "editor/js/ui/projects.js", - "editor/js/ui/projectSettings.js", - "editor/js/ui/projectUserSettings.js", - "editor/js/ui/tab-versionControl.js", + "editor/js/ui/projects/projects.js", + "editor/js/ui/projects/projectSettings.js", + "editor/js/ui/projects/projectUserSettings.js", + "editor/js/ui/projects/tab-versionControl.js", "editor/js/ui/touch/radialMenu.js" ], dest: "public/red/red.js" diff --git a/editor/js/ui/projectSettings.js b/editor/js/ui/projects/projectSettings.js similarity index 100% rename from editor/js/ui/projectSettings.js rename to editor/js/ui/projects/projectSettings.js diff --git a/editor/js/ui/projectUserSettings.js b/editor/js/ui/projects/projectUserSettings.js similarity index 100% rename from editor/js/ui/projectUserSettings.js rename to editor/js/ui/projects/projectUserSettings.js diff --git a/editor/js/ui/projects.js b/editor/js/ui/projects/projects.js similarity index 91% rename from editor/js/ui/projects.js rename to editor/js/ui/projects/projects.js index a535507c1..8dc3a715c 100644 --- a/editor/js/ui/projects.js +++ b/editor/js/ui/projects/projects.js @@ -42,17 +42,6 @@ RED.projects = (function() { $('

').text("To get started you can create your first project using your current flow files in a few easy steps.").appendTo(body); $('

').text("If you are not sure, you can skip this for now. You will still be able to create your first project from the 'Projects' menu option at any time.").appendTo(body); - // var buttons = $('

').appendTo(container); - // var createNew = $('').appendTo(buttons); - // createNew.click(function(e) { - // e.preventDefault(); - // show('create'); - // }); - // var openExisting = $('').appendTo(buttons); - // openExisting.click(function(e) { - // e.preventDefault(); - // show('open') - // }); return container; }, buttons: [ @@ -1075,87 +1064,96 @@ RED.projects = (function() { ] } })(), - 'open': { - content: function() { - return createProjectList({ - canSelectActive: false, - dblclick: function() { - $("#projects-dialog-open").click(); - }, - select: function() { - $("#projects-dialog-open").prop('disabled',false).removeClass('disabled ui-button-disabled ui-state-disabled'); - } - }) - }, - buttons: [ - { - // id: "clipboard-dialog-cancel", - text: RED._("common.label.cancel"), - click: function() { - $( this ).dialog( "close" ); - } + 'open': (function() { + var selectedProject; + return { + title: "Open a project", // TODO: NLS + content: function() { + return createProjectList({ + canSelectActive: false, + dblclick: function(project) { + selectedProject = project; + $("#projects-dialog-open").click(); + }, + select: function(project) { + selectedProject = project; + $("#projects-dialog-open").prop('disabled',false).removeClass('disabled ui-button-disabled ui-state-disabled'); + } + }) }, - { - id: "projects-dialog-open", - text: "Open project", // TODO: nls - class: "primary disabled", - disabled: true, - click: function() { - dialog.dialog( "close" ); - switchProject(selectedProject.name,function(err,data) { - if (err) { - if (err.error !== 'credentials_load_failed') { - console.log("unexpected_error",err) + buttons: [ + { + // id: "clipboard-dialog-cancel", + text: RED._("common.label.cancel"), + click: function() { + $( this ).dialog( "close" ); + } + }, + { + id: "projects-dialog-open", + text: "Open project", // TODO: nls + class: "primary disabled", + disabled: true, + click: function() { + dialog.dialog( "close" ); + switchProject(selectedProject.name,function(err,data) { + if (err) { + if (err.error !== 'credentials_load_failed') { + console.log("unexpected_error",err) + } } - } - }) - } - } - ] - }, - - 'delete': { - content: function() { - return createProjectList({ - canSelectActive: false, - dblclick: function() { - $("#projects-dialog-delete").click(); - }, - select: function() { - $("#projects-dialog-delete").prop('disabled',false).removeClass('disabled ui-button-disabled ui-state-disabled'); - } - }) - }, - buttons: [ - { - // id: "clipboard-dialog-cancel", - text: RED._("common.label.cancel"), - click: function() { - $( this ).dialog( "close" ); + }) + } } + ] + } + })(), + 'delete': (function() { + var selectedProject; + return { + content: function() { + return createProjectList({ + canSelectActive: false, + dblclick: function(project) { + selectedProject = project; + $("#projects-dialog-delete").click(); + }, + select: function(project) { + selectedProject = project; + $("#projects-dialog-delete").prop('disabled',false).removeClass('disabled ui-button-disabled ui-state-disabled'); + } + }) }, - { - id: "projects-dialog-delete", - text: "Delete project", // TODO: nls - class: "primary disabled", - disabled: true, - click: function() { - deleteProject(selectedProject.name,function(err,data) { - if (err) { - if (err.error === 'credentials_load_failed') { - dialog.dialog( "close" ); + buttons: [ + { + // id: "clipboard-dialog-cancel", + text: RED._("common.label.cancel"), + click: function() { + $( this ).dialog( "close" ); + } + }, + { + id: "projects-dialog-delete", + text: "Delete project", // TODO: nls + class: "primary disabled", + disabled: true, + click: function() { + deleteProject(selectedProject.name,function(err,data) { + if (err) { + if (err.error === 'credentials_load_failed') { + dialog.dialog( "close" ); + } else { + console.log("unexpected_error",err) + } } else { - console.log("unexpected_error",err) + dialog.dialog( "close" ); } - } else { - dialog.dialog( "close" ); - } - }) + }) + } } - } - ] - - } + ] + } + })() } } @@ -1222,15 +1220,107 @@ RED.projects = (function() { dialog.dialog({position: { 'my': 'center top', 'at': 'center top+10%', 'of': window }}); } - var selectedProject = null; - function createProjectList(options) { options = options||{}; var height = options.height || "300px"; - selectedProject = null; - var container = $('
',{style:"min-height: "+height+"; height: "+height+";"}); + var container = $('
',{class:"projects-dialog-project-list-container" }); + var filterTerm = ""; - var list = $('
    ',{class:"projects-dialog-project-list", style:"height:"+height}).appendTo(container).editableList({ + var searchDiv = $("
    ",{class:"red-ui-search-container"}).appendTo(container); + var searchInput = $('').appendTo(searchDiv).searchBox({ + //data-i18n="[placeholder]menu.label.searchInput" + delay: 200, + change: function() { + filterTerm = $(this).val(); + list.editableList('filter'); + if (selectedListItem && !selectedListItem.is(":visible")) { + selectedListItem.children().children().removeClass('selected'); + selectedListItem = list.children(":visible").first(); + selectedListItem.children().children().addClass('selected'); + if (options.select) { + options.select(selectedListItem.children().data('data')); + } + } + ensureSelectedIsVisible(); + } + }); + var selectedListItem; + + searchInput.on('keydown',function(evt) { + if (evt.keyCode === 40) { + evt.preventDefault(); + // Down + var next = selectedListItem; + if (selectedListItem) { + do { + next = next.next(); + } while(next.length !== 0 && !next.is(":visible")); + if (next.length === 0) { + return; + } + selectedListItem.children().children().removeClass('selected'); + } else { + next = list.children(":visible").first(); + } + selectedListItem = next; + selectedListItem.children().children().addClass('selected'); + if (options.select) { + options.select(selectedListItem.children().data('data')); + } + ensureSelectedIsVisible(); + } else if (evt.keyCode === 38) { + evt.preventDefault(); + // Up + var prev = selectedListItem; + if (selectedListItem) { + do { + prev = prev.prev(); + } while(prev.length !== 0 && !prev.is(":visible")); + if (prev.length === 0) { + return; + } + selectedListItem.children().children().removeClass('selected'); + } else { + prev = list.children(":visible").first(); + } + selectedListItem = prev; + selectedListItem.children().children().addClass('selected'); + if (options.select) { + options.select(selectedListItem.children().data('data')); + } + ensureSelectedIsVisible(); + } else if (evt.keyCode === 13) { + evt.preventDefault(); + // Enter + if (selectedListItem) { + if (options.dblclick) { + options.dblclick(selectedListItem.children().data('data')); + } + } + } + }); + + searchInput.i18n(); + + var ensureSelectedIsVisible = function() { + var selectedEntry = list.find(".projects-dialog-project-list-entry.selected").parent().parent(); + if (selectedEntry.length === 1) { + var scrollWindow = listContainer; + var scrollHeight = scrollWindow.height(); + var scrollOffset = scrollWindow.scrollTop(); + var y = selectedEntry.position().top; + var h = selectedEntry.height(); + if (y > scrollHeight) { + scrollWindow.animate({scrollTop: '-='+(scrollHeight-y+10)},50); + } else if (y-h<0) { + scrollWindow.animate({scrollTop: '+='+(y-h-10)},50); + } + } + } + + var listContainer = $('
    ',{class:"projects-dialog-project-list-inner-container" }).appendTo(container); + + var list = $('
      ',{class:"projects-dialog-project-list"}).appendTo(listContainer).editableList({ addButton: false, scrollOnAdd: false, addItem: function(row,index,entry) { @@ -1249,17 +1339,23 @@ RED.projects = (function() { row.click(function(evt) { $('.projects-dialog-project-list-entry').removeClass('selected'); header.addClass('selected'); - selectedProject = entry; + selectedListItem = row.parent(); if (options.select) { options.select(entry); } + ensureSelectedIsVisible(); + searchInput.focus(); }) if (options.dblclick) { row.dblclick(function(evt) { evt.preventDefault(); - options.dblclick(); + options.dblclick(entry); }) } + }, + filter: function(data) { + if (filterTerm === "") { return true; } + return data.name.toLowerCase().indexOf(filterTerm) !== -1; } }); if (options.small) { diff --git a/editor/js/ui/tab-versionControl.js b/editor/js/ui/projects/tab-versionControl.js similarity index 100% rename from editor/js/ui/tab-versionControl.js rename to editor/js/ui/projects/tab-versionControl.js diff --git a/editor/sass/projects.scss b/editor/sass/projects.scss index e10198a7c..1730b27cb 100644 --- a/editor/sass/projects.scss +++ b/editor/sass/projects.scss @@ -166,6 +166,17 @@ .projects-dialog-screen-secret { min-height: auto; } +.projects-dialog-project-list-container { + border: 1px solid $secondary-border-color; + border-radius: 2px; +} +.projects-dialog-project-list-inner-container { + height: 300px; + overflow-y: scroll; + .red-ui-editableList-border { + border: none; + } +} .projects-dialog-project-list { li { padding: 0 !important;