You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/01/08 10:52:29 UTC
svn commit: r1650241 - in /ofbiz/branches/release14.12: ./
specialpurpose/webpos/widget/CommonScreens.xml
Author: jleroux
Date: Thu Jan 8 09:52:28 2015
New Revision: 1650241
URL: http://svn.apache.org/r1650241
Log:
"Applied fix from trunk for revision: 1650240 "
------------------------------------------------------------------------
r1650240 | jleroux | 2015-01-08 10:49:11 +0100 (jeu. 08 janv. 2015) | 2 lignes
A patch from Arun Patidar for "Dialogue window is not working for webpos screens. Seems JS load issue on page." https://issues.apache.org/jira/browse/OFBIZ-5939
------------------------------------------------------------------------
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/specialpurpose/webpos/widget/CommonScreens.xml
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 8 09:52:28 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649742
+/ofbiz/trunk:1649742,1650240
Modified: ofbiz/branches/release14.12/specialpurpose/webpos/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/webpos/widget/CommonScreens.xml?rev=1650241&r1=1650240&r2=1650241&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/webpos/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release14.12/specialpurpose/webpos/widget/CommonScreens.xml Thu Jan 8 09:52:28 2015
@@ -40,7 +40,7 @@ under the License.
<set field="applicationMenuName" value="WebPosAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://webpos/widget/WebPosMenus.xml" global="true"/>
<set field="applicationTitle" value="${uiLabelMap.WebPosMenuMain}" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/jquery.hotkeys-0.8.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/jquery.hotkeys-0.7.9.min.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/webpos/images/js/WebPosHotkeys.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/webpos/images/js/Shortcuts.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/webpos/images/js/SearchProducts.js" global="true"/>