Small bug fixes + cleanup.

evoluteur · evoluteur · commit d75bc1fce991 · 2016-03-23T21:06:29.000-07:00
diff --git a/demo/test.html b/demo/test.html
@@ -23,7 +23,7 @@
 <body>
 
 <div class="evo-header">
-    <div class="evo-logo"><a href="../index.html"><span>evol</span>utility<span>.js</span></a></div>
+    <div class="evo-logo"><a href="../index.html"><span>evol</span>utility</a></div>
     <ul class="evo-head-links">
         <li><a href="index.html">demo</a></li>
         <li><a href="../doc/index.html">doc</a></li>
diff --git a/js/dico/format.js b/js/dico/format.js
@@ -27,7 +27,7 @@ Evol.Format = {
         return '';
     },
     cr2br: function(v, escape){
-        if(v==='' || v===null){
+        if(v==='' || v===null || _.isUndefined(v)){
             return '';
         }
         var txt=escape?_.escape(v):v;
@@ -73,7 +73,13 @@ Evol.Format = {
 
     // --- JSON formats ---
     jsonString: function(d, cr2br){
-        var dd = (_.isString(d) && d!=='') ? $.parseJSON(d) : d;
+        var dd;
+        try{
+            dd=(_.isString(d) && d!=='') ? $.parseJSON(_.unescape(d)) : d;
+        }catch(err){
+            alert('Error: format.jsonString'+ err);
+            dd={"error": "Evol.Format.jsonString"};
+        }
         if(dd===''){
             return  dd;
         }else{
diff --git a/js/view-many/many-bubbles.js b/js/view-many/many-bubbles.js
@@ -47,7 +47,7 @@ Evol.ViewMany.Bubbles = Evol.View_Many.extend({
                 uiModel: this.uiModel,
                 tooltip: function(d){
                     var h=[],
-                    flds=that.getFields();//(h, fields, model, icon, selectable, route, isTooltip)
+                    flds=that.getFields();
                     Evol.ViewMany.Cards.prototype.HTMLItem.call(that, h, flds, new Backbone.Model(d), null, null, null, true);
                     return h.join('');
                 }
diff --git a/js/view-many/many-cards.js b/js/view-many/many-cards.js
@@ -63,6 +63,8 @@ Evol.ViewMany.Cards = Evol.View_Many.extend({
                 v = '<a href="#'+route+model.id+'">'+
                     that._HTMLField(f, model.escape(f.attribute || f.id))+
                     '</a>';
+            }else if(f.type===fts.json){
+                v = model.get(f.attribute || f.id);
             }else{
                 v = that._HTMLField(f, model.escape(f.attribute || f.id));
             }
diff --git a/js/view-many/many-list.js b/js/view-many/many-list.js
@@ -69,7 +69,7 @@ Evol.ViewMany.List = Evol.View_Many.extend({
                 v = input.colorBox(f.id, model.escape(f.attribute || f.id));
             }else if(f.type===ft.formula){
                 v = input.formula(null, f, model);
-            }else if(f.type===ft.html){
+            }else if(f.type===ft.json || f.type===ft.html){
                 v = model.get(f.attribute || f.id);
                 //if(v && v.length>200){
                     //v = v.subString(0,200)+'...';
diff --git a/js/view-one/one.js b/js/view-one/one.js
@@ -192,7 +192,7 @@ return Backbone.View.extend({
                             $f.html(uiInput.colorBox(f.id, fv, fv));
                             break;
                         case fts.json:
-                            $f.val(Evol.Format.jsonString(fv, true));
+                            $f.val(Evol.Format.jsonString(fv, false));
                             break;
                         default:
                             $f.text(eDico.fieldHTML_RO(f, _.isUndefined(fv)?'':fv, Evol.hashLov, iconsPath) + ' ');
@@ -726,11 +726,15 @@ return Backbone.View.extend({
             fv = (mode !== 'new') ? this.model.get(f.id) : f.defaultValue || '';
         }
         if(f.type===fts.formula){
-            h.push(Evol.Dico.HTMLFieldLabel(f, mode || 'edit')+
-                dom.input.formula(this.fieldViewId(f.id), f, this.model));
-        }else if(f.type===fts.json && mode==='browse'){
-            h.push(Evol.Dico.HTMLFieldLabel(f, mode)+
-                dom.input.textM(this.fieldViewId(f.id), Evol.Format.jsonString(fv, false), f.maxLen, f.height, true));
+            if(!skipLabel){
+                h.push(Evol.Dico.HTMLFieldLabel(f, mode || 'edit'));
+            }
+            h.push(dom.input.formula(this.fieldViewId(f.id), f, this.model));
+        }else if(f.type===fts.json && (mode==='browse' || f.readOnly)){
+            if(!skipLabel){
+                h.push(Evol.Dico.HTMLFieldLabel(f, mode));
+            }
+            h.push(dom.input.textM(this.fieldViewId(f.id), Evol.Format.jsonString(fv, false), f.maxLen, f.height, true));
         }else{
             h.push(eDico.fieldHTML(f, this.fieldViewId(f.id), fv, mode, iconsPath, skipLabel));
         }
@@ -752,7 +756,11 @@ return Backbone.View.extend({
     setTitle: function (title){
         var bdg=this.uiModel.fnBadge;
         if(bdg){
-            bdg=bdg(this.model);
+            if(_.isString(bdg)){
+                bdg=this.model.escape(bdg)||'';
+            }else{
+                bdg=bdg(this.model);
+            }
         }
         return eDico.setViewTitle(this, title, bdg);
     },
@@ -776,7 +784,7 @@ return Backbone.View.extend({
                     scInvalid = 0;
                 _.each(scData, function(rowData, idx){
                     _.each(sc.elements, function(f){
-                        if(that.validateField(f, rowData[f.id].substring(0,10))){
+                        if(that.validateField(f, f.type==='date' ? rowData[f.id].substring(0,10) : rowData[f.id])){
                             trs.eq(idx).find('#'+f.id).parent().addClass('has-error');
                             scInvalid++;
                         }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ Evol.ViewMany.Bubbles = Evol.View_Many.extend({`
`47`	`47`	`uiModel: this.uiModel,`
`48`	`48`	`tooltip: function(d){`
`49`	`49`	`var h=[],`
`50`		`- flds=that.getFields();//(h, fields, model, icon, selectable, route, isTooltip)`
	`50`	`+ flds=that.getFields();`
`51`	`51`	`Evol.ViewMany.Cards.prototype.HTMLItem.call(that, h, flds, new Backbone.Model(d), null, null, null, true);`
`52`	`52`	`return h.join('');`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,8 @@ Evol.ViewMany.Cards = Evol.View_Many.extend({`
`63`	`63`	`v = '<a href="#'+route+model.id+'">'+`
`64`	`64`	`that._HTMLField(f, model.escape(f.attribute \|\| f.id))+`
`65`	`65`	`'</a>';`
	`66`	`+ }else if(f.type===fts.json){`
	`67`	`+ v = model.get(f.attribute \|\| f.id);`
`66`	`68`	`}else{`
`67`	`69`	`v = that._HTMLField(f, model.escape(f.attribute \|\| f.id));`
`68`	`70`	`}`