Fixed the 'enter doesn't work while editing a task'-bug

florisweb · Mar 6, 2021 · a038861 · a038861
1 parent 4f64bb4
commit a038861
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/js/eventHandlers/keyHandler.js b/src/js/eventHandlers/keyHandler.js
@@ -57,8 +57,8 @@ function _KeyHandler() {
 
 
         // Menu's
-        if (MainContent.taskHolder.dateOptionMenu.openState)       return MainContent.taskHolder.dateOptionMenu.clickFirstOption();
-        if (MainContent.searchOptionMenu.openState)                return MainContent.searchOptionMenu.clickFirstOption();
+        if (MainContent.taskHolder.dateOptionMenu.openState && MainContent.taskHolder.dateOptionMenu.clickFirstOption()) return;
+        if (MainContent.searchOptionMenu.openState && MainContent.searchOptionMenu.clickFirstOption()) return;
 
         if (MainContent.taskHolder.curCreateMenu)                  return MainContent.taskHolder.curCreateMenu.createTask();
       },

diff --git a/src/js/mainContent/mainContent.js b/src/js/mainContent/mainContent.js
@@ -239,7 +239,10 @@ function _MainContent_searchOptionMenu() {
 		});
 	}
 
-	this.clickFirstOption = function () {Menu.clickFirstOption.apply(Menu);};
+	this.clickFirstOption = function () {
+		this.openState = false;
+		return Menu.clickFirstOption.apply(Menu);
+	};
 
 
 	this.close = function() {

diff --git a/src/js/optionMenu.js b/src/js/optionMenu.js
@@ -56,9 +56,10 @@ function _OptionMenu_menu(_self) {
 
 	this.clickFirstOption = function() {
 		let option = this.options[0];
-		if (!option) return;
+		if (!option) return false;
 		option.select();
 		This.close();
+		return true;
 	}