Author: jleroux
Date: Mon Feb 10 10:20:07 2014
New Revision: 1566564
URL: http://svn.apache.org/r1566564
Log:
This merges r1559769 from trunk
This is a major update of jQuery and related, it contains:
jquery-1.8.2 to jquery-1.10.2 which implies using jquery-migrate-1.2.1 for
plugins compatiblities
jquery-ui-timepicker-addon-1.0.5 to jquery-ui-timepicker-addon-1.4.3 (using
min now, better i18n)
jquery-ui-1.9.0 to jquery-ui-1.10.3
removes jquery.ui.datepicker.js now integrated in jquery.ui
jquery.hotkeys-0.7.9 to jquery.hotkeys-0.8
jquery.maskedinput-1.2.2 to jquery.maskedinput-1.3.1
jquery.validate 1.10.0 to 1.11.1
I never realised how much efforts have been put in this plugin!
I fixed an issue in JsLanguageFilesMapping generation
I removed the messages_ptbr.js and messages_ptpt.js files and the
related conundrum in JsLanguageFileMappingCreator.java
untested, found not use cases OOTB
jquery.jcarousel ?(2006) to 0.3.0 (2013)
untested, found not use cases OOTB
jquery.flot 0.7 to 0.8.2 (lot of changes, still works)
removes useless flotpie.ftl
removes empty flotr folder
jquery.mobile-1.1.0-rc.1 to jquery.mobile-1.4.0
untested, found not use cases OOTB
jquery.cookie to jquery.cookie-1.4.0
Removes all useless/redundant js files (not only jQuery unused old versions)
notably removes all under images/jquery/ui/development-bundle/ui
removes now useless GooglemapMarkers.js and GooglemapSimple.js
Flat Grey application.js
moves jQuery(document).ready(function() at bottom (spotted in Chrome
console)
css
I did not find much issues, I spotted the title bar of the lookups, but got
it fixed after some efforts.
Issues:
Imagemanagement: I got issues while testing, actually I'm not quite sure
how it works, even in stable demo. It should be
validated again. I commit nevertheless my changes: moves js part from
product to images component
removes useless calls to js files (mostly in imagemanagement, but not
only)
renames jquery.min.js to sizzle.min.js.
Inside sizzle.min.js, updates the Dojo part to v1.10.17-pre and removes
the jQuery part
changes to use ofbizContentUrl macro for generating js calls
jquery.rotate.js NOT! It's jQueryRotateCompressed.js
http://markmail.org/message/dit3dlh3ph4jnenp
Got ERROR 22001: A truncation error was encountered trying to shrink
VARCHAR
'D:\projectsASF\ofbizClean\framework\images\webapp\images\pro&' to
length 100. I opened OFBIZ-5501 for that I tried to update
jstree to jstree 3 but gave up. I let the jquery.jstree-3.0.0-beta3 files in
place in case someone would give it a chance...
Added:
ofbiz/branches/release13.07/framework/images/webapp/images/imagemanagement/
- copied from r1559769,
ofbiz/trunk/framework/images/webapp/images/imagemanagement/
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/jquery-1.10.2.min.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.10.2.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/jquery-1.10.2.min.map
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.10.2.min.map
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/jquery-migrate-1.2.1.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-migrate-1.2.1.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/jquery.mobile/
- copied from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/jquery.mobile/
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-sliderAccess.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-sliderAccess.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.4.3.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.4.3.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.css
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.css
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min.css
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min.css
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-af.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-af.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-am.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-am.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-bg.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-bg.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-da.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-da.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-eu.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-eu.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hr.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hr.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sr-RS.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sr-RS.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sr-YU.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sr-YU.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-th.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-th.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-uk.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-uk.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/API.md
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/API.md
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/CONTRIBUTING.md
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/CONTRIBUTING.md
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/FAQ.md
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/FAQ.md
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/NEWS.md
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/NEWS.md
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/PLUGINS.md
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/PLUGINS.md
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/README.md
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/README.md
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.canvas.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.canvas.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.canvas.min.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.canvas.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.categories.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.categories.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.categories.min.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.categories.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.errorbars.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.errorbars.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.errorbars.min.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.errorbars.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.time.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.time.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.time.min.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.time.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/hotkeys/jquery.hotkeys-0.8.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/hotkeys/jquery.hotkeys-0.8.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/jquery.maskedinput-1.3.1.min.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jquery.maskedinput-1.3.1.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/jsTree/jquery.jstree-3.0.0-beta3.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/jquery.jstree-3.0.0-beta3.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/jsTree/jquery.jstree.min-3.0.0-beta3.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/jquery.jstree.min-3.0.0-beta3.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/jsTree/libs/
- copied from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/libs/
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/32px.png
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/32px.png
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/40px.png
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/40px.png
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style-3.0.0-beta3.css
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style-3.0.0-beta3.css
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style.min-3.0.0-beta3.css
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style.min-3.0.0-beta3.css
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/ui/i18n/
- copied from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/ui/i18n/
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.10.3.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.10.3.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.10.3.min.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.10.3.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/ui/js/jquery.cookie-1.4.0.js
- copied unchanged from r1559769,
ofbiz/trunk/framework/images/webapp/images/jquery/ui/js/jquery.cookie-1.4.0.js
Removed:
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/js/
ofbiz/branches/release13.07/framework/images/webapp/images/GooglemapMarkers.js
ofbiz/branches/release13.07/framework/images/webapp/images/GooglemapSimple.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/jquery-1.6.2.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/jquery-1.6.2.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/jquery-1.7.2.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/jquery-1.7.2.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/jquery-1.7.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/jquery-1.7.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/jquery-1.8.2.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/jquery-1.8.2.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/jquery.mobile-1.1.0-rc.1/
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.5.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/API.txt
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/PLUGINS.txt
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/README.txt
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/hotkeys/jquery.hotkeys-0.7.9.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/jquery.maskedinput-1.2.2.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ptbr.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ptpt.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/ui/development-bundle/
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/ui/index.html
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.9.0.custom.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.9.0.custom.min.js
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/LICENSE
ofbiz/branches/release13.07/applications/humanres/widget/CommonScreens.xml
ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageRotating.ftl
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ResizeImage.ftl
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl
ofbiz/branches/release13.07/applications/product/widget/catalog/CommonScreens.xml
ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java
ofbiz/branches/release13.07/framework/common/template/JsLanguageFilesMapping.ftl
ofbiz/branches/release13.07/framework/common/webcommon/includes/flotCharts/Bars.ftl
ofbiz/branches/release13.07/framework/common/webcommon/includes/flotCharts/Pie.ftl
ofbiz/branches/release13.07/framework/common/webcommon/includes/lookup.ftl
ofbiz/branches/release13.07/framework/common/widget/CommonScreens.xml
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/README.md
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ca.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fi.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-gl.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-he.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-id.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ja.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ko.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-no.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pl.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pt-BR.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pt.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ro.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sk.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sv.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-CN.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-TW.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/LICENSE.txt
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/Makefile
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/excanvas.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/excanvas.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.colorhelpers.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.colorhelpers.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.crosshair.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.crosshair.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.fillbetween.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.fillbetween.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.image.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.image.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.navigate.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.navigate.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.pie.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.pie.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.selection.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.selection.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.stack.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.stack.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.symbol.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.symbol.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.threshold.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.threshold.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/jcarousel/jquery.jcarousel.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/jcarousel/jquery.jcarousel.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/validate/additional-methods.min.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.js
ofbiz/branches/release13.07/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.min.js
ofbiz/branches/release13.07/framework/widget/dtd/widget-screen.xsd
ofbiz/branches/release13.07/framework/widget/templates/htmlScreenMacroLibrary.ftl
ofbiz/branches/release13.07/themes/flatgrey/webapp/flatgrey/javascript.css
ofbiz/branches/release13.07/themes/tomahawk/webapp/tomahawk/css/style.css
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1558241
Modified: ofbiz/branches/release13.07/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/LICENSE?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
--- ofbiz/branches/release13.07/LICENSE (original)
+++ ofbiz/branches/release13.07/LICENSE Mon Feb 10 10:20:07 2014
@@ -449,7 +449,7 @@ framework/base/lib/httpunit-1.7.jar
framework/base/lib/ical4j-1.0-rc2.jar
lib/build/javacc/javacc.jar (5.0)
framework/base/lib/javolution-5.4.3.jar
-framework/base/lib/xpp3-1.1.4c.jar
+framework/base/lib/xpp3_min-1.1.4c.jar
framework/base/lib/xstream-1.4.6.jar
framework/base/lib/owasp-esapi-full-java-1.4.jar
framework/base/lib/scripting/antlr-2.7.6.jar
Modified:
ofbiz/branches/release13.07/applications/humanres/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/humanres/widget/CommonScreens.xml?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/humanres/widget/CommonScreens.xml
(original)
+++ ofbiz/branches/release13.07/applications/humanres/widget/CommonScreens.xml
Mon Feb 10 10:20:07 2014
@@ -38,7 +38,7 @@ under the License.
<set field="layoutSettings.javaScripts[]"
value="/partymgr/static/partymgr.js" global="true"/>
<set field="layoutSettings.styleSheets[]"
value="/partymgr/static/partymgr.css" global="true"/>
<set field="layoutSettings.styleSheets[]"
value="/images/humanres/humanres.css" global="true"/>
- <set field="layoutSettings.javaScripts[+0]"
value="/images/jquery/ui/development-bundle/external/jquery.cookie.js"
global="true"/>
+ <set field="layoutSettings.javaScripts[+0]"
value="/images/jquery/ui/js/jquery.cookie-1.4.0.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]"
value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/>
<set field="applicationMenuName" value="HumanResAppBar"
global="true"/>
<set field="applicationMenuLocation"
value="component://humanres/widget/HumanresMenus.xml" global="true"/>
Modified:
ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/controller.xml
(original)
+++
ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/controller.xml
Mon Feb 10 10:20:07 2014
@@ -3258,7 +3258,7 @@ under the License.
<view-map name="LookupDataResource"
page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource"
type="screen"/>
<view-map name="LookupPerson"
page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"
type="screen"/>
<view-map name="LookupPreferredContactMech" type="screen"
page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/>
- <view-map name="LookupContactList" type="screen"
page="component://marketing/widget/ContactListScreens.xml#LookupContactList"/>
+ <view-map name="LookupContactList" type="screen"
page="component://marketing/widget/ContactListScreens.xml#LookupContactList"/>
<!-- Image Management request mappings -->
<view-map name="Imagemanagement" type="screen"
page="component://product/widget/catalog/ImageManagementScreens.xml#Imagemanagement"/>
Modified:
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl
(original)
+++
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl
Mon Feb 10 10:20:07 2014
@@ -16,9 +16,9 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<script src="/catalog/imagemanagement/js/jquery.min.js"></script>
-<script src="/catalog/imagemanagement/js/jquery.Jcrop.js"></script>
-<link rel="stylesheet" href="/catalog/imagemanagement/js/jquery.Jcrop.css"
type="text/css" />
+<script language="javascript" type="text/javascript"
src="<@ofbizContentUrl>/images/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript"
src="<@ofbizContentUrl>/images/imagemanagement/jquery.Jcrop.min.js</@ofbizContentUrl>"></script>
+<link rel="stylesheet"
href="<@ofbizContentUrl>/images/imagemanagement/jquery.Jcrop.css</@ofbizContentUrl>"
type="text/css" />
<script type="text/javascript">
jQuery.noConflict();
jQuery(document).ready(function(){
Modified:
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageRotating.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageRotating.ftl?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageRotating.ftl
(original)
+++
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageRotating.ftl
Mon Feb 10 10:20:07 2014
@@ -16,8 +16,8 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<script src="/catalog/imagemanagement/js/jquery.min.js"></script>
-<script src="/catalog/imagemanagement/js/jquery.Rotate.js"></script>
+<script language="javascript" type="text/javascript"
src="<@ofbizContentUrl>/images/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript"
src="<@ofbizContentUrl>/images/imagemanagement/jQueryRotateCompressed.js</@ofbizContentUrl>"></script>
<style type="text/css">
td.cropbox span {
width: auto !important;
Modified:
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl
(original)
+++
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl
Mon Feb 10 10:20:07 2014
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<script src="/catalog/imagemanagement/js/jquery.min.js"></script>
+<script language="javascript" type="text/javascript"
src="<@ofbizContentUrl>/images/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script>
<script type="text/javascript">
jQuery.noConflict();
var host = document.location.host;
Modified:
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ResizeImage.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ResizeImage.ftl?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ResizeImage.ftl
(original)
+++
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/ResizeImage.ftl
Mon Feb 10 10:20:07 2014
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<script src="/catalog/imagemanagement/js/jquery.min.js"></script>
+<script language="javascript" type="text/javascript"
src="<@ofbizContentUrl>/images/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script>
<script type="text/javascript">
jQuery.noConflict();
jQuery(document).ready(function(){
Modified:
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl
(original)
+++
ofbiz/branches/release13.07/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl
Mon Feb 10 10:20:07 2014
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<script src="/catalog/imagemanagement/js/jquery.min.js"></script>
+<script language="javascript" type="text/javascript"
src="<@ofbizContentUrl>/images/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script>
<script type="text/javascript">
jQuery.noConflict();
jQuery(document).ready(function(){
Modified:
ofbiz/branches/release13.07/applications/product/widget/catalog/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/widget/catalog/CommonScreens.xml?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/widget/catalog/CommonScreens.xml
(original)
+++
ofbiz/branches/release13.07/applications/product/widget/catalog/CommonScreens.xml
Mon Feb 10 10:20:07 2014
@@ -41,7 +41,7 @@ under the License.
<set field="applicationMenuName" value="CatalogAppBar"
global="true"/>
<set field="applicationMenuLocation"
value="component://product/widget/catalog/CatalogMenus.xml" global="true"/>
<set field="applicationTitle"
value="${uiLabelMap.ProductCatalogManagerApplication}" global="true"/>
- <set field="layoutSettings.javaScripts[+0]"
value="/images/jquery/ui/development-bundle/external/jquery.cookie.js"
global="true"/>
+ <set field="layoutSettings.javaScripts[+0]"
value="/images/jquery/ui/js/jquery.cookie-1.4.0.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]"
value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/>
</actions>
<widgets>
Modified:
ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
---
ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
(original)
+++
ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
Mon Feb 10 10:20:07 2014
@@ -55,7 +55,7 @@ public class JsLanguageFileMappingCreato
// setup some variables to locate the js files
String componentRoot = "component://images/webapp";
- String jqueryUiLocaleRelPath =
"/images/jquery/ui/development-bundle/ui/i18n/";
+ String jqueryUiLocaleRelPath = "/images/jquery/ui/i18n/";
String dateJsLocaleRelPath = "/images/jquery/plugins/datejs/";
String validateRelPath =
"/images/jquery/plugins/validate/localization/";
String dateTimePickerJsLocaleRelPath =
"/images/jquery/plugins/datetimepicker/localization/";
@@ -66,17 +66,15 @@ public class JsLanguageFileMappingCreato
String jqueryUiLocalePrefix = "jquery.ui.datepicker-";
String dateTimePickerPrefix = "jquery-ui-timepicker-";
String defaultLocaleDateJs = "en-US";
- String defaultLocaleJquery = "en";
+ String defaultLocaleJquery = "en"; // Beware to keep the OFBiz
specific jquery.ui.datepicker-en.js file when upgrading...
for (Locale locale : localeList) {
String displayCountry = locale.toString();
String modifiedDisplayCountry = null;
String modifiedDisplayCountryForValidation = null;
- String modifiedDisplayCountryForValidation2 = null;
- if (displayCountry.indexOf('_') != -1) {
+ if (displayCountry.contains("_")) {
modifiedDisplayCountry = displayCountry.replace("_", "-");
- modifiedDisplayCountryForValidation =
displayCountry.replace("_", "").toLowerCase(); // fun: in validate plugin we
have also ptpt and ptbr for instance...
- modifiedDisplayCountryForValidation2 =
displayCountry.substring(displayCountry.indexOf('_')+1).toLowerCase(); //
weird, validate plugin treat zh_CN as cn (not zhcn) and zh_TW as tw (not zhtw)
+ modifiedDisplayCountryForValidation = displayCountry; //
messages*.js use "_" not "-" as others
} else {
modifiedDisplayCountry = displayCountry;
}
@@ -102,8 +100,8 @@ public class JsLanguageFileMappingCreato
if (file.exists()) {
fileUrl = dateJsLocaleRelPath + dateJsLocalePrefix +
tmpLocale + jsFilePostFix;
} else {
- // use default language en-US
- fileUrl = dateJsLocaleRelPath + dateJsLocalePrefix +
defaultLocaleDateJs + jsFilePostFix;
+ // use language en-US as fallback
+ fileUrl = dateJsLocaleRelPath + dateJsLocalePrefix +
defaultLocaleDateJs + jsFilePostFix;
}
}
dateJsLocaleFile.put(displayCountry, fileUrl);
@@ -111,28 +109,30 @@ public class JsLanguageFileMappingCreato
/*
* Try to open the jquery validation language file
*/
- fileName = componentRoot + validateRelPath + validateLocalePrefix
+ strippedLocale + jsFilePostFix;
- file = FileUtil.getFile(fileName);
-
- if (file.exists()) {
- fileUrl = validateRelPath + validateLocalePrefix +
strippedLocale + jsFilePostFix;
- } else {
- // use default language en
- fileUrl = validateRelPath + validateLocalePrefix +
defaultLocaleJquery + jsFilePostFix;
- // Try to guess a language (fun: in validate plugin we have
also ptpt and ptbr for instance....)
- if (modifiedDisplayCountryForValidation != null) {
- fileName = componentRoot + validateRelPath +
validateLocalePrefix + modifiedDisplayCountryForValidation + jsFilePostFix;
+ if (modifiedDisplayCountryForValidation != null) { // Try 1st
lang_country
+ fileName = componentRoot + validateRelPath +
validateLocalePrefix + modifiedDisplayCountryForValidation + jsFilePostFix;
+ file = FileUtil.getFile(fileName);
+ if (file.exists()) {
+ fileUrl = validateRelPath + validateLocalePrefix +
modifiedDisplayCountryForValidation + jsFilePostFix;
+ } else { // lang only
+ fileName = componentRoot + validateRelPath +
validateLocalePrefix + strippedLocale + jsFilePostFix;
file = FileUtil.getFile(fileName);
if (file.exists()) {
- fileUrl = validateRelPath + validateLocalePrefix +
modifiedDisplayCountryForValidation + jsFilePostFix;
+ fileUrl = validateRelPath + validateLocalePrefix +
strippedLocale + jsFilePostFix;
} else {
- fileName = componentRoot + validateRelPath +
validateLocalePrefix + modifiedDisplayCountryForValidation2 + jsFilePostFix;
- file = FileUtil.getFile(fileName);
- if (file.exists()) {
- fileUrl = validateRelPath + validateLocalePrefix +
modifiedDisplayCountryForValidation2 + jsFilePostFix;
- }
+ // use default language en as fallback
+ fileUrl = validateRelPath + validateLocalePrefix +
defaultLocaleJquery + jsFilePostFix;
}
}
+ } else { // Then try lang only
+ fileName = componentRoot + validateRelPath +
validateLocalePrefix + strippedLocale + jsFilePostFix;
+ file = FileUtil.getFile(fileName);
+ if (file.exists()) {
+ fileUrl = validateRelPath + validateLocalePrefix +
strippedLocale + jsFilePostFix;
+ } else {
+ // use default language en as fallback
+ fileUrl = validateRelPath + validateLocalePrefix +
defaultLocaleJquery + jsFilePostFix;
+ }
}
validationLocaleFile.put(displayCountry, fileUrl);
@@ -151,7 +151,7 @@ public class JsLanguageFileMappingCreato
if (file.exists()) {
fileUrl = jqueryUiLocaleRelPath + jqueryUiLocalePrefix +
modifiedDisplayCountry + jsFilePostFix;
} else {
- // use default language en
+ // use default language en as fallback
fileUrl = jqueryUiLocaleRelPath + jqueryUiLocalePrefix +
defaultLocaleJquery + jsFilePostFix;
}
}
@@ -172,8 +172,8 @@ public class JsLanguageFileMappingCreato
if (file.exists()) {
fileUrl = dateTimePickerJsLocaleRelPath +
dateTimePickerPrefix + modifiedDisplayCountry + jsFilePostFix;
} else {
- // use default language en
- fileUrl = dateTimePickerJsLocaleRelPath +
dateTimePickerPrefix + defaultLocaleJquery + jsFilePostFix;
+ // use default language en as fallback
+ fileUrl = dateTimePickerJsLocaleRelPath +
dateTimePickerPrefix + defaultLocaleJquery + jsFilePostFix;
}
}
dateTimePickerLocaleFile.put(displayCountry, fileUrl);
@@ -188,8 +188,7 @@ public class JsLanguageFileMappingCreato
mapWrapper.put("validation", validationLocaleFile);
mapWrapper.put("dateTime", dateTimePickerLocaleFile);
- // some magic to create a new java file
- // render it as FTL
+ // some magic to create a new java file: render it as FTL
Writer writer = new StringWriter();
try {
FreeMarkerWorker.renderTemplateAtLocation(template, mapWrapper,
writer);
