Skip to content

Commit

Permalink
Version 1.2.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
evoluteur committed Nov 5, 2020
1 parent 101ba82 commit b4c1811
Show file tree
Hide file tree
Showing 12 changed files with 68 additions and 48 deletions.
9 changes: 5 additions & 4 deletions demo/demo-data.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dist/css/dependencies.min.css

Large diffs are not rendered by default.

24 changes: 20 additions & 4 deletions dist/css/evolutility-ui-jquery.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
evolutility-ui-jquery 1.2.3
evolutility-ui-jquery 1.2.4
https://github.com/evoluteur/evolutility-ui-jquery
*/
Expand Down Expand Up @@ -647,6 +647,10 @@ label {
position: absolute;
}

.evo-many-summary {
margin-top: 10px;
}

.evol-r-align {
text-align: right;
}
Expand Down Expand Up @@ -1066,13 +1070,17 @@ text.label {
}

.evo-zfilters {
padding-bottom: 6px;
padding: 6px 0;
}

.evo-zfilters > a {
display: inline-block;
margin: 1px 2px 2px 1px;
padding: 3px 2px;
padding: 0 5px 3px 10px;
border: silver 1px solid;
border-radius: 15px;
clear: left;
text-decoration: none;
/*
&:hover,
&:active{
Expand All @@ -1089,7 +1097,7 @@ text.label {

.evo-zfilters > a > button {
float: none !important;
margin: 2px 2px 0 4px;
margin: 2px 2px 0 10px;
}

.evo-zfilters .glyphicon-remove {
Expand All @@ -1105,7 +1113,14 @@ text.label {
margin: 1px 6px 6px 1px;
}

.evo-filters {
position: relative;
}

.evo-filters > .close {
position: absolute;
right: 5px;
top: 5px;
margin-right: 4px;
}

Expand Down Expand Up @@ -1146,6 +1161,7 @@ text.label {
.evo-editFilter > span {
float: left;
margin: 1px 6px 6px 1px;
padding: 3px 5px;
font-size: 1.1em;
width: auto;
}
Expand Down
4 changes: 2 additions & 2 deletions dist/css/evolutility-ui-jquery.min.css

Large diffs are not rendered by default.

Binary file removed dist/css/select2-spinner.gif
Binary file not shown.
Binary file removed dist/css/select2.png
Binary file not shown.
Binary file removed dist/css/select2x2.png
Binary file not shown.
20 changes: 17 additions & 3 deletions dist/dependencies.min.js

Large diffs are not rendered by default.

39 changes: 13 additions & 26 deletions dist/evolutility-ui-jquery.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,8 @@
/*!
evolutility-ui-jquery 1.2.3
evolutility-ui-jquery 1.2.4
(c) 2020 Olivier Giulieri
http://evoluteur.github.io/evolutility-ui-jquery/
*/
// default config for Evolutility-UI-jQuery

var Evol = Evol || {};

Evol.Config = {

// --- using localStorage
localStorage: true,

// --- using evolutility-server-node
//url: 'http://localhost:2000/api/v1/'

};
;
// Evolutility-UI-jQuery Localization Library ENGLISH
// https://github.com/evoluteur/evolutility-ui-jquery
// (c) 2017 Olivier Giulieri
Expand Down Expand Up @@ -3124,7 +3110,6 @@ return Backbone.View.extend({

getFields: function (){
if(!this._fields){
var that = this;
this._fields = eDef.getFields(this.uiModel, this.fieldsetFilter);
this._fieldHash = eDef.getFieldsHash(this._fields);
}
Expand Down Expand Up @@ -6010,7 +5995,7 @@ return Backbone.View.extend({
// d3.csv.parse(csv);


if(Evol.Config.localStorage){
if(EvoConfig.localStorage){
var lc = new Backbone.LocalStorage('evol-'+entityId);
M = Backbone.Model.extend({
localStorage: lc
Expand All @@ -6021,11 +6006,11 @@ return Backbone.View.extend({
});
}else{
M = new Backbone.Model({
urlRoot: Evol.Config.url+entityId
urlRoot: EvoConfig.url+entityId
});
Ms = Backbone.Collection.extend({
model: M,
url: Evol.Config.url+entityId/*,
url: EvoConfig.url+entityId/*,
sync : function(method, collection, options) {
//options.dataType = "jsonp";
return Backbone.sync(method, collection, options);
Expand Down Expand Up @@ -6781,7 +6766,7 @@ return Backbone.View.extend({
alert('Error: Invalid model ID.');
};

if(Evol.Config.localStorage){
if(EvoConfig.localStorage){
m = this.collection.get(id);
if(_.isUndefined(m)){
fnError();
Expand All @@ -6790,7 +6775,7 @@ return Backbone.View.extend({
}
}else{
var M = Backbone.Model.extend({
urlRoot: Evol.Config.url+that.uiModel.id
urlRoot: EvoConfig.url+that.uiModel.id
});
m = new M({id:id});
m.fetch({
Expand Down Expand Up @@ -6922,7 +6907,7 @@ return Backbone.View.extend({
if(id || this.curView.cardinality==='1'){
if(id){
//this.setModelById(id, true);
var mid=Evol.Config.localStorage?''+id:id; // using string or int
var mid=EvoConfig.localStorage?''+id:id; // using string or int
this.model=this.collection.findWhere({id: mid});
var t=this.uiModel.fnTitle;
if(t && this.model){
Expand Down Expand Up @@ -6976,7 +6961,7 @@ return Backbone.View.extend({
alert('error in "deleteItem"');
}
};
if(!(id || Evol.Config.localStorage)){
if(!(id || EvoConfig.localStorage)){
opts.url=that.model.url();
}
collec.remove(delModel);
Expand Down Expand Up @@ -7342,6 +7327,8 @@ return Backbone.View.extend({
*
*************************************************************************** */

EvoConfig = EvoConfig || {};

Evol.App = Backbone.View.extend({

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

if(Evol.Config){
if(Evol.Config.localStorage){
if(EvoConfig){
if(EvoConfig.localStorage){
var lc = new Backbone.LocalStorage(this.prefix+(uiModel.table || uiModel.id));
M = Backbone.Model.extend({
localStorage: lc
Expand All @@ -7505,7 +7492,7 @@ Evol.App = Backbone.View.extend({
localStorage: lc
});
}else{
url = Evol.Config.url+uiModel.id;
url = EvoConfig.url+uiModel.id;
M = Backbone.Model.extend({
urlRoot: url
});
Expand Down
8 changes: 5 additions & 3 deletions dist/evolutility-ui-jquery.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h1 style="color:#BBDEFB;">A set of model-driven views to list, browse, edit, an
</section>

<section id="s-intro">
<p>Evolutility-UI-jQuery (currently v1.2.3) provides a set of generic Views ("V" as in "MVC") to
<p>Evolutility-UI-jQuery (currently v1.2.4) provides a set of generic Views ("V" as in "MVC") to
browse, edit, filter, export and chart
data of different structures and volumes.
</p>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "evolutility-ui-jquery",
"description": "Set of model-driven views list, browse, edit, and chart your data (using jQuery, Backbone, and D3.js).",
"version": "1.2.3",
"version": "1.2.4",
"copyright": "(c) 2020 Olivier Giulieri",
"license": "MIT",
"target": "dist",
Expand Down

0 comments on commit b4c1811

Please sign in to comment.