Merge lp:~slub.team/goobi-production/disable-pica-download-on-enter into lp:goobi-production/1.8

[Henning Gerhardt]

[Ralf Claussnitzer (ralf-claussnitzer-deactivatedaccount)]

review: Approve

=== modified file 'newpages/NewProcess/Page1.jsp'
--- newpages/NewProcess/Page1.jsp	2011-12-20 08:07:09 +0000
+++ newpages/NewProcess/Page1.jsp	2012-07-30 16:10:23 +0000
@@ -47,7 +47,7 @@
 			<htm:td valign="top" styleClass="layoutInhalt">
 
 				<%-- ++++++++++++++++     Inhalt      ++++++++++++++++ --%>
-				<h:form id="pageform1">
+				<h:form id="pageform1" onkeypress="return ignoreEnterKey(event);">
 					<%-- Breadcrumb --%>
 					<h:panelGrid width="100%" columns="1" styleClass="layoutInhaltKopf">
 						<h:panelGroup>
@@ -124,23 +124,51 @@
 		<%@include file="/newpages/inc/tbl_Fuss.jsp"%>
 	</htm:table>
 
+<script type="text/javascript">
+	function getKeyCode(e) {
+		var keycode;
+
+		keycode = e.keyCode ? e.keyCode : e.charCode;
+		//alert('keycode ' + keycode);
+
+		return keycode;
+	}
+
+	function checkOpac(commandId,e){
+		var keycode;
+
+		keycode = getKeyCode(e);
+
+		e.stopPropagation();
+		if (keycode == 36) {
+			return false;
+		} else if ((keycode == 13) && (commandId == 'OpacRequest') ){
+			element = document.getElementById('pageform1:performOpacQuery');
+			if (element) {
+				element.click();
+				return false;
+			}
+		} else {
+			return true;
+		}
+
+		return true;
+	}
+
+	function ignoreEnterKey(e) {
+		var keycode;
+
+		keycode = getKeyCode(e);
+
+		if (keycode == 13) {
+			return false;
+		}
+
+		return true;
+	}
+
+</script>
+
 	</body>
 </f:view>
-<script language="javascript">
-    function checkOpac(commandId,e){
-        var keycode;
-        if (window.event) 
-        	keycode = window.event.keyCode;
-        else if (e) 
-        	keycode = e.which;
-        else 
-        	return true;
-        
-        //alert (keycode);
-        if (keycode == 36)
-        	return false;
-        else
-        	return true;
-	}
-</script>
 </html>

=== modified file 'newpages/NewProcess/inc_process.jsp'
--- newpages/NewProcess/inc_process.jsp	2011-12-20 08:07:09 +0000
+++ newpages/NewProcess/inc_process.jsp	2012-07-30 16:10:23 +0000
@@ -79,7 +79,7 @@
 		rendered="#{ProzesskopieForm.useOpac}"
 		style="margin-left:7px;margin-right:7px; width:200px"
 		onkeypress="return checkOpac('OpacRequest',event)" />
-	<h:commandLink action="#{ProzesskopieForm.OpacAuswerten}"
+	<h:commandLink action="#{ProzesskopieForm.OpacAuswerten}" id="performOpacQuery"
 		rendered="#{ProzesskopieForm.useOpac}" title="#{msgs.opacAbfragen}">
 		<h:graphicImage value="/newpages/images/buttons/opac.gif"
 			style="vertical-align:middle; margin-right:3px" />
@@ -87,9 +87,6 @@
 	</h:commandLink>
 </h:panelGrid>
 
-<x:commandButton action="#{ProzesskopieForm.OpacAuswerten}"
-	id="OpacRequest" forceId="true" style="display:none" />
-
 <h:panelGroup
 	rendered="#{ProzesskopieForm.useOpac || ProzesskopieForm.useTemplates}">
 	<f:verbatim>