Skip to content

Commit b4c1811

Browse files
committed
Version 1.2.4.
1 parent 101ba82 commit b4c1811

12 files changed

+68
-48
lines changed

demo/demo-data.min.js

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/dependencies.min.css

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/evolutility-ui-jquery.css

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
evolutility-ui-jquery 1.2.3
2+
evolutility-ui-jquery 1.2.4
33
44
https://github.com/evoluteur/evolutility-ui-jquery
55
*/
@@ -647,6 +647,10 @@ label {
647647
position: absolute;
648648
}
649649

650+
.evo-many-summary {
651+
margin-top: 10px;
652+
}
653+
650654
.evol-r-align {
651655
text-align: right;
652656
}
@@ -1066,13 +1070,17 @@ text.label {
10661070
}
10671071

10681072
.evo-zfilters {
1069-
padding-bottom: 6px;
1073+
padding: 6px 0;
10701074
}
10711075

10721076
.evo-zfilters > a {
1077+
display: inline-block;
10731078
margin: 1px 2px 2px 1px;
1074-
padding: 3px 2px;
1079+
padding: 0 5px 3px 10px;
1080+
border: silver 1px solid;
1081+
border-radius: 15px;
10751082
clear: left;
1083+
text-decoration: none;
10761084
/*
10771085
&:hover,
10781086
&:active{
@@ -1089,7 +1097,7 @@ text.label {
10891097

10901098
.evo-zfilters > a > button {
10911099
float: none !important;
1092-
margin: 2px 2px 0 4px;
1100+
margin: 2px 2px 0 10px;
10931101
}
10941102

10951103
.evo-zfilters .glyphicon-remove {
@@ -1105,7 +1113,14 @@ text.label {
11051113
margin: 1px 6px 6px 1px;
11061114
}
11071115

1116+
.evo-filters {
1117+
position: relative;
1118+
}
1119+
11081120
.evo-filters > .close {
1121+
position: absolute;
1122+
right: 5px;
1123+
top: 5px;
11091124
margin-right: 4px;
11101125
}
11111126

@@ -1146,6 +1161,7 @@ text.label {
11461161
.evo-editFilter > span {
11471162
float: left;
11481163
margin: 1px 6px 6px 1px;
1164+
padding: 3px 5px;
11491165
font-size: 1.1em;
11501166
width: auto;
11511167
}

dist/css/evolutility-ui-jquery.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/select2-spinner.gif

-1.81 KB
Binary file not shown.

dist/css/select2.png

-613 Bytes
Binary file not shown.

dist/css/select2x2.png

-845 Bytes
Binary file not shown.

dist/dependencies.min.js

Lines changed: 17 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/evolutility-ui-jquery.js

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
11
/*!
2-
evolutility-ui-jquery 1.2.3
2+
evolutility-ui-jquery 1.2.4
33
(c) 2020 Olivier Giulieri
44
http://evoluteur.github.io/evolutility-ui-jquery/
55
*/
6-
// default config for Evolutility-UI-jQuery
7-
8-
var Evol = Evol || {};
9-
10-
Evol.Config = {
11-
12-
// --- using localStorage
13-
localStorage: true,
14-
15-
// --- using evolutility-server-node
16-
//url: 'http://localhost:2000/api/v1/'
17-
18-
};
19-
;
206
// Evolutility-UI-jQuery Localization Library ENGLISH
217
// https://github.com/evoluteur/evolutility-ui-jquery
228
// (c) 2017 Olivier Giulieri
@@ -3124,7 +3110,6 @@ return Backbone.View.extend({
31243110

31253111
getFields: function (){
31263112
if(!this._fields){
3127-
var that = this;
31283113
this._fields = eDef.getFields(this.uiModel, this.fieldsetFilter);
31293114
this._fieldHash = eDef.getFieldsHash(this._fields);
31303115
}
@@ -6010,7 +5995,7 @@ return Backbone.View.extend({
60105995
// d3.csv.parse(csv);
60115996

60125997

6013-
if(Evol.Config.localStorage){
5998+
if(EvoConfig.localStorage){
60145999
var lc = new Backbone.LocalStorage('evol-'+entityId);
60156000
M = Backbone.Model.extend({
60166001
localStorage: lc
@@ -6021,11 +6006,11 @@ return Backbone.View.extend({
60216006
});
60226007
}else{
60236008
M = new Backbone.Model({
6024-
urlRoot: Evol.Config.url+entityId
6009+
urlRoot: EvoConfig.url+entityId
60256010
});
60266011
Ms = Backbone.Collection.extend({
60276012
model: M,
6028-
url: Evol.Config.url+entityId/*,
6013+
url: EvoConfig.url+entityId/*,
60296014
sync : function(method, collection, options) {
60306015
//options.dataType = "jsonp";
60316016
return Backbone.sync(method, collection, options);
@@ -6781,7 +6766,7 @@ return Backbone.View.extend({
67816766
alert('Error: Invalid model ID.');
67826767
};
67836768

6784-
if(Evol.Config.localStorage){
6769+
if(EvoConfig.localStorage){
67856770
m = this.collection.get(id);
67866771
if(_.isUndefined(m)){
67876772
fnError();
@@ -6790,7 +6775,7 @@ return Backbone.View.extend({
67906775
}
67916776
}else{
67926777
var M = Backbone.Model.extend({
6793-
urlRoot: Evol.Config.url+that.uiModel.id
6778+
urlRoot: EvoConfig.url+that.uiModel.id
67946779
});
67956780
m = new M({id:id});
67966781
m.fetch({
@@ -6922,7 +6907,7 @@ return Backbone.View.extend({
69226907
if(id || this.curView.cardinality==='1'){
69236908
if(id){
69246909
//this.setModelById(id, true);
6925-
var mid=Evol.Config.localStorage?''+id:id; // using string or int
6910+
var mid=EvoConfig.localStorage?''+id:id; // using string or int
69266911
this.model=this.collection.findWhere({id: mid});
69276912
var t=this.uiModel.fnTitle;
69286913
if(t && this.model){
@@ -6976,7 +6961,7 @@ return Backbone.View.extend({
69766961
alert('error in "deleteItem"');
69776962
}
69786963
};
6979-
if(!(id || Evol.Config.localStorage)){
6964+
if(!(id || EvoConfig.localStorage)){
69806965
opts.url=that.model.url();
69816966
}
69826967
collec.remove(delModel);
@@ -7342,6 +7327,8 @@ return Backbone.View.extend({
73427327
*
73437328
*************************************************************************** */
73447329

7330+
EvoConfig = EvoConfig || {};
7331+
73457332
Evol.App = Backbone.View.extend({
73467333

73477334
//events: {
@@ -7494,8 +7481,8 @@ Evol.App = Backbone.View.extend({
74947481
createEntity: function($v, uiModel, data, defaultView, options, cb){
74957482
var that=this, url, M, Ms;
74967483

7497-
if(Evol.Config){
7498-
if(Evol.Config.localStorage){
7484+
if(EvoConfig){
7485+
if(EvoConfig.localStorage){
74997486
var lc = new Backbone.LocalStorage(this.prefix+(uiModel.table || uiModel.id));
75007487
M = Backbone.Model.extend({
75017488
localStorage: lc
@@ -7505,7 +7492,7 @@ Evol.App = Backbone.View.extend({
75057492
localStorage: lc
75067493
});
75077494
}else{
7508-
url = Evol.Config.url+uiModel.id;
7495+
url = EvoConfig.url+uiModel.id;
75097496
M = Backbone.Model.extend({
75107497
urlRoot: url
75117498
});

dist/evolutility-ui-jquery.min.js

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)