Version 1.2.4.

evoluteur · Nov 5, 2020 · b4c1811 · b4c1811
1 parent 101ba82
commit b4c1811
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 48 deletions.
diff --git a/demo/demo-data.min.js b/demo/demo-data.min.js
diff --git a/dist/css/dependencies.min.css b/dist/css/dependencies.min.css
diff --git a/dist/css/evolutility-ui-jquery.css b/dist/css/evolutility-ui-jquery.css
@@ -1,5 +1,5 @@
 /*!
-  evolutility-ui-jquery 1.2.3
+  evolutility-ui-jquery 1.2.4
   
   https://github.com/evoluteur/evolutility-ui-jquery
 */
@@ -647,6 +647,10 @@ label {
   position: absolute;
 }
 
+.evo-many-summary {
+  margin-top: 10px;
+}
+
 .evol-r-align {
   text-align: right;
 }
@@ -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{
@@ -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 {
@@ -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;
 }
 
@@ -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;
 }

diff --git a/dist/css/evolutility-ui-jquery.min.css b/dist/css/evolutility-ui-jquery.min.css
diff --git a/dist/css/select2-spinner.gif b/dist/css/select2-spinner.gif
diff --git a/dist/css/select2.png b/dist/css/select2.png
diff --git a/dist/css/select2x2.png b/dist/css/select2x2.png
diff --git a/dist/dependencies.min.js b/dist/dependencies.min.js
diff --git a/dist/evolutility-ui-jquery.js b/dist/evolutility-ui-jquery.js
@@ -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
@@ -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);
         }
@@ -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
@@ -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);
@@ -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();
@@ -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({
@@ -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){
@@ -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);
@@ -7342,6 +7327,8 @@ return Backbone.View.extend({
  *
  *************************************************************************** */
 
+EvoConfig = EvoConfig || {};
+
 Evol.App = Backbone.View.extend({
 
     //events: {
@@ -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
@@ -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
                 });

diff --git a/dist/evolutility-ui-jquery.min.js b/dist/evolutility-ui-jquery.min.js
diff --git a/index.html b/index.html
@@ -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>

diff --git a/package.json b/package.json
@@ -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",