Merge branch 'developer'

renderpci · Nov 1, 2019 · 4a0d2f3 · 4a0d2f3
2 parents 4cf27c3 + 9a3ac55
commit 4a0d2f3
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/lib/dedalo/html_page/js/keyboard_shortcuts.js b/lib/dedalo/html_page/js/keyboard_shortcuts.js
@@ -12,31 +12,31 @@ var keyboard_shortcuts = new function() {
 	// ON READY
 	$(function() {
 	//window.ready(function(){
-		
-		
+
+
 		window.addEventListener("keydown", function (e) {
 			//console.log("e.ctrlKey, e.keyCode: ", e.ctrlKey, e.keyCode);
 
 			switch(true) {
 
-				// PAGINATOR RIGHT ARROW <	
+				// PAGINATOR RIGHT ARROW <
 				case (e.ctrlKey===true && e.keyCode===37):
 					var element = $('.paginator_prev_icon');
 					if ( $(element).length ) {
 						$(element).first().trigger( "click" );
 					}
 					break;
-				
+
 				// PAGINATOR RIGHT ARROW >
-				case (e.ctrlKey===true && e.keyCode===39): 
+				case (e.ctrlKey===true && e.keyCode===39):
 					var element = $('.paginator_next_icon');
 					if ( $(element).length ) {
 						$(element).first().trigger( "click" );
 					}
 					break;
 
 				// DEBUG_INFO : CONTROL + D (ctrlKey+68) TOGGLE DEBUG_INFO
-				case (e.ctrlKey===true && e.keyCode===68):					
+				case (e.ctrlKey===true && e.keyCode===68):
 					html_page.debug_info_toggle()
 					break;
 
@@ -50,18 +50,20 @@ var keyboard_shortcuts = new function() {
 					search.toggle_filter_search_tap()
 					break;
 
-				// STATS : CONTROL + S (ctrlKey+83) TOGGLE STATS DIV				
-				case (e.ctrlKey===true && e.keyCode===83): 
+				// STATS : CONTROL + S (ctrlKey+83) TOGGLE STATS DIV
+				case (e.ctrlKey===true && e.keyCode===83):
 					$('.css_button_stats').trigger( "click" );
 					break;
 
 				// SEARCH SUBMIT (SEARCH2) : CONTROL + RETURN (ctrlKey+13)
 				//case (e.ctrlKey==1 && e.keyCode==13):
 				case (e.keyCode===13):
-					if (page_globals.modo.indexOf('list')!==-1 || page_globals.modo.indexOf('tool_')!==-1) {						
+					if (page_globals.modo.indexOf('list')!==-1 || page_globals.modo.indexOf('tool_')!==-1) {
 						if (page_globals.tipo==='dd100' || page_globals.modo==='tool_cataloging' || page_globals.modo==='tool_sort') {
 							// Thesaurus case disable (used by order feature)
-							return false;
+							if (document.activeElement.classList.contains("input_order")) {
+								return false;
+							}
 						}
 						e.preventDefault()
 						e.stopPropagation();
@@ -70,7 +72,7 @@ var keyboard_shortcuts = new function() {
 						}
 						//console.log("e:",e.target.id);
 						const button_submit = document.getElementById("button_submit")
-						if (button_submit) {							
+						if (button_submit) {
 							//button_submit.click()
 							search2.search_from_enter_key(button_submit)
 						}else{
@@ -89,7 +91,7 @@ var keyboard_shortcuts = new function() {
 					if (page_globals.modo.indexOf('list')!==-1 || page_globals.modo.indexOf('tool_')!==-1) {
 						search.toggle_filter_search_tap()
 					}*/
-					// Deselect components	
+					// Deselect components
 					if (page_globals.modo && page_globals.modo.indexOf('edit')!==-1) {
 						component_common.reset_all_selected_wraps(false)
 					}
@@ -102,12 +104,12 @@ var keyboard_shortcuts = new function() {
 					}
 					break;
 			}
-			
+
 
 		});//end window.addEventListener("keydown", function (e)
-
 
-	});//end $(document).ready(function() 
+
+	});//end $(document).ready(function()
 
 
-};//end class
+};//end class