Skip to content

Commit

Permalink
Merge pull request #9 from eea/develop
Browse files Browse the repository at this point in the history
Refs #105112 jQuery 3.4.1 fixes
  • Loading branch information
alecghica authored Mar 3, 2020
2 parents 2c49b65 + 414a73c commit 1928c7c
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
5 changes: 3 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include *.md *.rst *.txt
graft docs
graft eea
global-exclude *pyc
global-exclude *~
global-exclude *.un~
global-include *mo

global-include *.mo
9 changes: 7 additions & 2 deletions docs/HISTORY.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
Changelog
=========

7.7 - (2020-02-28)
--------------------------
* Bug fix: fixed temporal coverage insert when upgrading to jquery 3.4.1
[ichim-david refs #105112]

7.6 - (2019-01-28)
---------------------
--------------------------
* Jenkins: Add sonarqube step
[avoinea refs #101552]

7.5 - (2018-09-07)
---------------------
--------------------------
* Bugfix: Fixed size of the prev/next wizard buttons on edit
[szabozo0 refs #97571]

Expand Down
4 changes: 2 additions & 2 deletions eea/forms/skins/eea_forms/temporal_widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@

$("#token-input-temporalCoverage").on("keydown", function(evt){
var pressed = String.fromCharCode(evt.keyCode);
var field_value = evt.srcElement.value.trim();
var field_value = evt.currentTarget.value.trim();


if(skip_keys.indexOf(evt.keyCode) === -1){
if(field_value.length === 4){
if(check_isNaN(pressed, evt.keyCode)){
return false;
} else {
evt.srcElement.value = field_value + "-";
evt.currentTarget.value = field_value + "-";
}
}
else if(check_isNaN(pressed, evt.keyCode)) {
Expand Down
2 changes: 1 addition & 1 deletion eea/forms/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.6
7.7
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
setup(name=NAME,
version=VERSION,
description="EEA forms - Custom AT widgets and fields",
long_description_content_type="text/x-rst",
long_description=open("README.rst").read() + "\n" +
open(os.path.join("docs", "HISTORY.txt")).read(),
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
Expand Down

0 comments on commit 1928c7c

Please sign in to comment.