Author: bleny Date: 2013-08-01 14:59:15 +0200 (Thu, 01 Aug 2013) New Revision: 357 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: fixes #3031 quote generated shortcut in bindKey Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp trunk/magalie-web/src/main/webapp/js/magalie.js Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp 2013-08-01 12:39:29 UTC (rev 356) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp 2013-08-01 12:59:15 UTC (rev 357) @@ -40,7 +40,7 @@ <script type="text/javascript"> $(document).ready(function () { var id = '<s:property value="elementCompanyId" />'; - bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); + bindKey('<s:property value="shortcuts.get(#stat.index)" />', function(){ redirectTo($('#' + id));}); }); </script> <s:a href="%{loginUrl}" id="%{elementCompanyId}"> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-01 12:39:29 UTC (rev 356) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-01 12:59:15 UTC (rev 357) @@ -50,7 +50,7 @@ <script type="text/javascript"> $(document).ready(function () { var id = '<s:property value="deliverRequestedArticleId" />'; - bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); + bindKey('<s:property value="shortcuts.get(#stat.index)" />', function(){ redirectTo($('#' + id));}); }); </script> <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="%{deliverRequestedArticleId}"> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-08-01 12:39:29 UTC (rev 356) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-08-01 12:59:15 UTC (rev 357) @@ -38,7 +38,7 @@ <li> <script type="text/javascript"> $(document).ready(function () { - bindKey(<s:property value="shortcuts.get(0)" />, function(){ redirectTo($('#prepareArticleReceptionLink'));}); + bindKey('<s:property value="shortcuts.get(0)" />', function(){ redirectTo($('#prepareArticleReceptionLink'));}); }); </script> <s:url action="prepare-article-reception" id="prepareArticleReceptionUrl" /> @@ -65,7 +65,7 @@ <script type="text/javascript"> $(document).ready(function () { var id = '<s:property value="prepareArticleReceptionId" />'; - bindKey(<s:property value="shortcuts.get(#stat.index + 1)" />, function(){ redirectTo($('#' + id));}); + bindKey('<s:property value="shortcuts.get(#stat.index + 1)" />', function(){ redirectTo($('#' + id));}); }); </script> <s:a href="%{prepareArticleReceptionUrl}" id="%{prepareArticleReceptionId}"> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-08-01 12:39:29 UTC (rev 356) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-08-01 12:59:15 UTC (rev 357) @@ -41,7 +41,7 @@ <script type="text/javascript"> $(document).ready(function () { var id = '<s:property value="receiveArticleId" />'; - bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); + bindKey('<s:property value="shortcuts.get(#stat.index)" />', function(){ redirectTo($('#' + id));}); }); </script> <li> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-08-01 12:39:29 UTC (rev 356) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-08-01 12:59:15 UTC (rev 357) @@ -28,8 +28,8 @@ <title>Transfert de stock</title> <script type="text/javascript"> $(document).ready(function () { - bindKey("Esc", function(){ redirectTo($('#cancelLink'));}); - bindKey("F5", function(){ redirectTo($('#reportErrorLink'));}); + bindKey('Esc', function(){ redirectTo($('#cancelLink'));}); + bindKey('F5', function(){ redirectTo($('#reportErrorLink'));}); <s:if test="storedArticle != null"> $('#storage-transfer_destinationBarcode').focus(); </s:if> @@ -71,7 +71,7 @@ <script type="text/javascript"> $(document).ready(function () { var id = '<s:property value="elementStoredArticleId" />'; - bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); + bindKey('<s:property value="shortcuts.get(#stat.index)" />', function(){ redirectTo($('#' + id));}); }); </script> <s:a href="%{storageTransferNextStepUrl}" id="%{elementStoredArticleId}"> Modified: trunk/magalie-web/src/main/webapp/js/magalie.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/magalie.js 2013-08-01 12:39:29 UTC (rev 356) +++ trunk/magalie-web/src/main/webapp/js/magalie.js 2013-08-01 12:59:15 UTC (rev 357) @@ -25,12 +25,12 @@ KEYS = {"F1": 112, "F2": 113, - "F3" : 114 , - "F4" : 115 , - "F5" : 116 , - "tab" : 9 , - "del" : 8 , - "Esc" : 27 , + "F3" : 114, + "F4" : 115, + "F5" : 116, + "tab" : 9, + "del" : 8, + "Esc" : 27, "0" : 48, "1" : 49, "2" : 50,