fix(FEC-8349): OTT analytics - no event send for logged user (#134)

evaluate false and 0 values parse string to boolean and number when applicable ("false", "1" etc.)
kaltura · Jun 25, 2018 · f3e1766 · f3e1766
1 parent b279725
commit f3e1766
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/common/plugins/plugins-config.js b/src/common/plugins/plugins-config.js
@@ -40,7 +40,12 @@ function evaluatePluginsConfig(options: KalturaPlayerOptionsObject): void {
     const evaluatedConfig = evaluate(JSON.stringify(pluginsConfig), dataModel);
     let evaluatedConfigObj;
     try {
-      evaluatedConfigObj = JSON.parse(evaluatedConfig);
+      evaluatedConfigObj = JSON.parse(evaluatedConfig, function (key) {
+        try {
+          return JSON.parse(this[key]);
+        } catch (e) {
+          return (this[key]);
+        }});
     } catch (e) {
       evaluatedConfigObj = {};
     }

diff --git a/src/common/utils/evaluate.js b/src/common/utils/evaluate.js
@@ -10,7 +10,7 @@ function evaluate(template: string, model: Object = {}): string {
     let reg, res = template;
     for (let key in model) {
       reg = new RegExp('{{' + key + '}}', 'g');
-      res = res.replace(reg, model[key] || "");
+      res = res.replace(reg, (model[key] !== undefined && model[key] !== null) ? model[key] : "");
     }
     return res;
   } catch (e) {

diff --git a/test/src/common/utils/ui-wrapper.spec.js b/test/src/common/utils/ui-wrapper.spec.js
@@ -55,7 +55,6 @@ describe('UIWrapper', function () {
       uiWrapper._uiManager.store.getState().config.components.seekbar = {};
       sandbox.restore();
       uiWrapper = null;
-      player.destroy();
       player = null;
     });