Skip to content

Commit

Permalink
Upgrade to jQuery 3.5.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
evoluteur committed May 13, 2020
1 parent ee478a9 commit c67c99b
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 Olivier Giulieri
Copyright (c) 2020 Olivier Giulieri

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ A re-write for React in under construction at [Structured-Filter-React](https://
<a name="License"></a>
## License

Copyright (c) 2019 [Olivier Giulieri](https://evoluteur.github.io/).
Copyright (c) 2020 [Olivier Giulieri](https://evoluteur.github.io/).

Structured-Filter is released under the [MIT license](https://github.com/evoluteur/structured-filter/blob/master/LICENSE.md#structured-filter).

Expand Down
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "structured-filter",
"version": "2.0.3",
"version": "2.0.4",
"description": "jQuery UI widget for structured queries",
"homepage": "http://evoluteur.github.io/structured-filter/",
"main": [
"js/structured-filter.js",
"less/structured-filter.less"
],
"license": "MIT",
"copyright": "(c) 2019 Olivier Giulieri",
"copyright": "(c) 2020 Olivier Giulieri",
"authors": "Olivier Giulieri (https://evoluteur.github.io/)",
"dependencies": {
"jquery": "~3.4.1",
"jquery": "~3.5.1",
"jquery-ui": "^1.12.1"
},
"ignore": [
Expand Down
4 changes: 2 additions & 2 deletions css/structured-filter.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
structured-filter 2.0.3
structured-filter 2.0.4
http://evoluteur.github.io/structured-filter/
(c) 2019 Olivier Giulieri
(c) 2020 Olivier Giulieri
*/
.structFilter {
min-height: 20px;
Expand Down
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="css/demo.css" type="text/css" media="all">
<link rel="stylesheet" href="css/structured-filter.css" type="text/css" media="all">

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js" type="text/javascript"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js" type="text/javascript"></script>
<script src="js/structured-filter.min.js" type="text/javascript" type="text/javascript"></script>
<script src="js/model-demo1.js" type="text/javascript"></script>
Expand All @@ -24,7 +24,7 @@ <h2 id="github">

<h1>Structured-Filter</h1>

<p>Structured-Filter (currently v2.0.3) is a Web UI for building structured search queries. It is a full jQuery UI widget, supporting various configurations and themes.
<p>Structured-Filter (currently v2.0.4) is a Web UI for building structured search queries. It is a full jQuery UI widget, supporting various configurations and themes.
</p>

<p>
Expand Down Expand Up @@ -68,7 +68,7 @@ <h1>Structured-Filter</h1>

<p>Structured-Filter is released under the <a href="http://github.com/evoluteur/structured-filter/raw/master/LICENSE.md">MIT license</a>.</p>

<p>&#169; 2019 <a href="https://evoluteur.github.io/">Olivier Giulieri</a></p>
<p>&#169; 2020 <a href="https://evoluteur.github.io/">Olivier Giulieri</a></p>
<br/><br/>


Expand Down
16 changes: 8 additions & 8 deletions js/structured-filter.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* structured-filter 2.0.3
* structured-filter 2.0.4
*
* (c) 2019 Olivier Giulieri
* (c) 2020 Olivier Giulieri
*
* https://github.com/evoluteur/structured-filter
*
Expand Down Expand Up @@ -437,7 +437,7 @@ $.widget( 'evol.structFilter', {
break;
case fTypes.list:
h+='<span id="value">'+
((fld.list.length>7)?'(<input type="checkbox" id="checkAll" value="1"/><label for="checkAll">All</label>) ':'')+
((fld.list.length>7)?'(<input type="checkbox" id="checkAll" value="1"><label for="checkAll">All</label>) ':'')+
EvoUI.inputCheckboxes(fld.list)+
'</span>';
break;
Expand All @@ -459,15 +459,15 @@ $.widget( 'evol.structFilter', {
case fTypes.time:
case fTypes.number:
var iType=(fType==fTypes.date)?'text':fType;
h+='<input id="value" type="'+iType+'"/>';
h+='<input id="value" type="'+iType+'">';
if(opBetween){
h+='<span class="as-Txt">'+i18n.opAnd+' </span>'+
'<input id="value2" type="'+iType+'"/>';
'<input id="value2" type="'+iType+'">';
}
addOK=false;
break;
default:
h+='<input id="value" type="text"/>';
h+='<input id="value" type="text">';
addOK=false;
}
editor.append(h);
Expand Down Expand Up @@ -697,7 +697,7 @@ var EvoUI={
},

inputHidden:function(id,val){
return '<input type="hidden" name="'+id+'" value="'+val+'"/>';
return '<input type="hidden" name="'+id+'" value="'+val+'">';
},

inputOption:function(fID,fV){
Expand All @@ -708,7 +708,7 @@ var EvoUI={

inputCheckboxes:function(fLOV){
return fLOV.map(function(lv){
return '<input type="checkbox" id="'+lv.id+'" value="'+lv.id+'"/>'+
return '<input type="checkbox" id="'+lv.id+'" value="'+lv.id+'">'+
'<label for="'+lv.id+'">'+lv.label+'</label> ';
}).join('');
}
Expand Down
6 changes: 3 additions & 3 deletions js/structured-filter.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion less/structured-filter.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

// Structured Filter for jQuery UI
// https://github.com/evoluteur/structured-filter
// (c) 2019 Olivier Giulieri
// (c) 2020 Olivier Giulieri

.border-radius(@r){
border-radius: @r;
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "structured-filter",
"version": "2.0.3",
"version": "2.0.4",
"description": "Generic Web UI for building structured search or filter queries. With it you can build structured search conditions like Firstname starts with 'A' and Birthday after 1/1/1990 and State in (CA, NY, FL)...",
"copyright": "(c) 2019 Olivier Giulieri",
"copyright": "(c) 2020 Olivier Giulieri",
"homepage": "http://evoluteur.github.io/structured-filter/",
"author": "Olivier Giulieri (https://evoluteur.github.io/)",
"license": "MIT",
Expand All @@ -14,7 +14,7 @@
"url": "https://github.com/evoluteur/structured-filter/issues"
},
"dependencies": {
"jquery": "~3.4.1",
"jquery": "~3.5.1",
"jquery-ui": "^1.12.1"
},
"devDependencies": {
Expand Down

0 comments on commit c67c99b

Please sign in to comment.