// BO: JS optimization in product page

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12565 b9a71923-0436-4b27-9f14-aed3839534dd

admin-dev/themes/default/template/controllers/products/accounting.tpl

@@ -26,13 +26,7 @@
 
 <script type="text/javascript">
 
-	$(document).ready(function() {
+
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
 
 </script>
 

admin-dev/themes/default/template/controllers/products/associations.tpl

@@ -24,19 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-
-		searchCategory();
-	});
-
-</script>
-
 <div class="Associations">
 	<h4>{l s='Associations'}</h4>
 	<div class="separation"></div>

admin-dev/themes/default/template/controllers/products/attachments.tpl

@@ -24,18 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 {if isset($obj->id)}
 
 	<h4>{l s='Attachment'}</h4>

admin-dev/themes/default/template/controllers/products/combinations.tpl

@@ -25,15 +25,6 @@
 *}
 
 <script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) {
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
 	{if $product->is_virtual}
 		$('#virtual_good_attributes').show();
 	{else}

admin-dev/themes/default/template/controllers/products/customization.tpl

@@ -24,18 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 {if isset($obj->id)}
 	<h4>{l s='Add or modify customizable properties'}</h4>
 	

admin-dev/themes/default/template/controllers/products/features.tpl

@@ -24,18 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 {if isset($product->id)}
 	
 	<h4>{l s='Assign features to this product:'}</h4>

admin-dev/themes/default/template/controllers/products/images.tpl

@@ -24,18 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 {if isset($id_product) && isset($product)}
 	<h4 class="tab" >2. {l s='Images'} (<span id="countImage">{$countImages}</span>)</h4>
 	<h4>{if isset($id_image)}{l s='Edit this product image'}{else}{l s='Add a new image to this product'}{/if}</h4>	<div class="separation"></div><br />

admin-dev/themes/default/template/controllers/products/informations.tpl

@@ -24,17 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-	$(document).ready(function() {
-		$('input').keypress(function(e) {
-			var code = null;
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 <div id="step1">
 	<h4 class="tab">1. {l s='Info.'}</h4>
 	<h4>{l s='Product global information'}</h4>

admin-dev/themes/default/template/controllers/products/pack.tpl

@@ -30,13 +30,6 @@
 	var msg_set_quantity = '{l s='Thanks to set a quantity to add a product.' js=1}';
 
 	$(document).ready(function() {
-
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-
 		if ($('#ppack').attr('checked'))
 		{
 			$('#ppack').attr('disabled', 'disabled');

admin-dev/themes/default/template/controllers/products/prices.tpl

@@ -104,18 +104,6 @@ jQuery(document).ready(Customer.init);
 {/literal}
 {* END CUSTOMER AUTO-COMPLETE / TO REFACTO *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 <div class="block_specific_prices_modifications">
 	<h4>{l s='Product price'}</h4>
     <div class="hint" style="display:block;min-height:0;">

admin-dev/themes/default/template/controllers/products/quantities.tpl

@@ -24,18 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 {if isset($product->id)}
 
 	<h4>{l s='Available quantities for sale'}</h4>

admin-dev/themes/default/template/controllers/products/seo.tpl

@@ -24,21 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-
-		// Enable product name field when the url rewrite field is loaded
-		$('.copy2friendlyUrl').removeAttr('disabled');
-	});
-
-</script>
-
 <h4>{l s='SEO'}</h4>
 <div class="separation"></div>
 

admin-dev/themes/default/template/controllers/products/shipping.tpl

@@ -24,18 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 <h4 class="tab">1. {l s='Info.'}</h4>
 <h4>{l s='Shipping'}</h4>
 

admin-dev/themes/default/template/controllers/products/suppliers.tpl

@@ -24,17 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) {
-			var code = null;
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
 <input type="hidden" name="supplier_loaded" value="1">
 {if isset($product->id)}
 

admin-dev/themes/default/template/controllers/products/virtualproduct.tpl

@@ -66,14 +66,6 @@
 		}
 	});
 
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
 	function uploadFile()
 	{
 		$.ajaxFileUpload (

admin-dev/themes/default/template/controllers/products/warehouses.tpl

@@ -24,17 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) {
-			var code = null;
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
 <input type="hidden" name="warehouse_loaded" value="1">
 {if isset($product->id)}
 

js/admin-products.js

@@ -341,4 +341,11 @@ urlToCall = null;
 $(document).ready(function() {
 	updateCurrentText();
 	updateFriendlyURL();
+
+	// Pressing enter in an input field should not submit the form
+	$('#product_form').delegate('input', 'keypress', function(e){
+			var code = null;
+		code = (e.keyCode ? e.keyCode : e.which);
+		return (code == 13) ? false : true;
+	});
 });