feat(single_value): typerenderer options

Author: stropitek

src/modules/types/display/single_value/controller.js

@@ -19,7 +19,6 @@ define(['modules/default/defaultcontroller', 'src/util/util'], function (Default
     Controller.prototype.references = {
         value: {
             label: 'Any displayable object'
-
         },
         color: {
             type: 'string',
@@ -87,6 +86,11 @@ define(['modules/default/defaultcontroller', 'src/util/util'], function (Default
                                 {title: 'Bottom', key: 'bottom'}
                             ]
                         },
+                        rendererOptions: {
+                            type: 'text',
+                            title: 'Renderer options',
+                            default: ''
+                        },
                         sprintf: {
                             type: 'text',
                             title: 'Sprintf'
@@ -135,6 +139,7 @@ define(['modules/default/defaultcontroller', 'src/util/util'], function (Default
         valign: ['groups', 'group', 0, 'valign', 0],
         defaultvalue: ['groups', 'group', 0, 'defaultvalue', 0],
         sprintf: ['groups', 'group', 0, 'sprintf', 0],
+        rendererOptions: ['groups', 'group', 0, 'rendererOptions', 0],
         sprintfOrder: ['groups', 'group', 0, 'sprintfOrder'],
         preformatted: ['groups', 'group', 0, 'preformatted', 0],
         append: ['groups', 'group', 0, 'append', 0],

src/modules/types/display/single_value/view.js

@@ -2,15 +2,17 @@
 
 define([
     'modules/default/defaultview',
-    'src/util/domdeferred',
+    'src/util/util',
     'src/util/api',
     'src/util/typerenderer',
-    'src/util/color'
+    'src/util/color',
+    'sprintf'
 ], function (Default,
-             DomDeferred,
+             Util,
              API,
              Renderer,
-             Color) {
+             Color,
+             sprintf) {
 
     function View() {
     }
@@ -86,31 +88,31 @@ define([
 
             var that = this,
                 sprintfVal = this.module.getConfiguration('sprintf'),
-                sprintfOrder = this.module.getConfiguration('sprintfOrder');
-
-            if (sprintfVal && sprintfVal != '') {
-
-                try {
-                    require(['sprintf'], function (sprintf) {
-
+                rendererOptions = Util.evalOptions(this.module.getConfiguration('rendererOptions')) || {};
+            if (sprintfVal) {
+                if (rendererOptions) {
+                    var prom = [];
+                    for (var i in that.values) {
+                        prom.push(this.renderVal(that.values[i], rendererOptions));
+                    }
+                    Promise.all(prom).then(function (rendered) {
+                        var args = [sprintfVal].concat(rendered);
+                        that.fillWithVal(sprintf.sprintf.apply(null, args));
+                    });
+                } else {
+                    try {
                         var args = [sprintfVal];
                         for (var i in that.values) {
                             args.push(that.values[i]);
                         }
-
                         val = sprintf.sprintf.apply(this, args);
-
-                        that.fillWithVal(val);
-                    });
-
-                } catch (e) {
-
-                    that.fillWithVal(val);
-
+                        that.fillWithVal(val, rendererOptions);
+                    } catch (e) {
+                        that.fillWithVal(val, rendererOptions);
+                    }
                 }
-
             } else {
-                that.fillWithVal(val);
+                that.fillWithVal(val, rendererOptions);
             }
         },
 
@@ -119,7 +121,18 @@ define([
             this.dom.scrollTop(scroll_height);
         },
 
-        fillWithVal: function (val) {
+        renderVal: function (val, options) {
+            var $span = $('<span>');
+            return Renderer.render($span, val, options)
+                .then(function () {
+                    return $span.html();
+                })
+                .catch(function () {
+                    return '[failed]';
+                });
+        },
+
+        fillWithVal: function (val, rendererOptions) {
 
             var valign = this.module.getConfiguration('valign');
             var align = this.module.getConfiguration('align');
@@ -168,11 +181,9 @@ define([
             this._scrollDown();
 
             var that = this;
-            Renderer.render(div, val).then(function () {
+            Renderer.render(div, val, rendererOptions).then(function () {
                 that._scrollDown();
             });
-
-            DomDeferred.notify(div);
         }
 
     });

src/modules/types/edition/slick_grid/view.js

@@ -14,21 +14,6 @@ define([
     function View() {
     }
 
-    function _rendererOptions(options) {
-        var result;
-        if (!options) return undefined;
-        if (!options.match(/^\s*\{/)) {
-            options = '{' + options + '}';
-        }
-        try {
-            eval('result = ' + options);
-            return result;
-        } catch (e) {
-            Debug.warn('rendererOptions invalid in SlickGrid preferences');
-            return undefined;
-        }
-    }
-
 
     var cssPromises = [];
     cssPromises.push(Util.loadCss('components/slickgrid/slick.grid.css'));
@@ -673,7 +658,7 @@ define([
                         type = getType(row.jpath);
                     }
 
-                    var rendererOptions = _rendererOptions(row.rendererOptions);
+                    var rendererOptions = Util.evalOptions(row.rendererOptions);
                     return {
                         id: row.name,
                         name: row.name,

src/src/util/typerenderer.js

@@ -101,12 +101,11 @@ define(['require', 'jquery', 'lodash', 'src/util/api', 'src/util/util', 'moment'
             number = number.toPrecision(options.toPrecision);
         } else if (options.hasOwnProperty('toFixed')) {
             number = number.toFixed(options.toFixed);
-        } else if(options.hasOwnProperty('numeral')) {
+        } else if (options.hasOwnProperty('numeral')) {
             number = numeral(number).format(options.numeral);
-        } else if(options.hasOwnProperty('sprintf')) {
+        } else if (options.hasOwnProperty('sprintf')) {
             number = sprintf.sprintf(options.sprintf, number);
-        }
-        else if (checkDate(options)) {
+        } else if (checkDate(options)) {
             number = toDate(number, options);
         }
         $element.html(number);

src/src/util/util.js

@@ -459,6 +459,21 @@ define(['src/util/debug', 'src/util/color', 'lodash', 'components/web-animations
     exports.rgbToHex = exports.deprecate(Color.rgb2hex, 'use Color.rgb2hex');
     exports.getColor = exports.deprecate(Color.getColor, 'use Color.getColor');
 
+    exports.evalOptions = function (options) {
+        var result;
+        if (!options) return undefined;
+        if (!options.match(/^\s*\{/)) {
+            options = '{' + options + '}';
+        }
+        try {
+            eval('result = ' + options);
+            return result;
+        } catch (e) {
+            Debug.warn('could not eval options');
+            return undefined;
+        }
+    };
+
     return exports;
 
 });