Merge pull request #161 from outbrain/jsonp-upgrade

Jsonp upgrade
outbrain-inc · Apr 4, 2017 · 391ea5a · 391ea5a
2 parents 1c56cdd + f902750
commit 391ea5a
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/leonardo/configuration.srv.ts b/src/leonardo/configuration.srv.ts
@@ -118,7 +118,12 @@ export function leoConfiguration() {
               if (!_jsonpCallbacks[funcName]) {
                 activeJsonpState(state, callbackName);
               }
-              setTimeout(_jsonpCallbacks[funcName].bind(null, state.activeOption.data, ...state.jsonCallbackAdditionalParams), state.activeOption.delay || 0);
+              if ((typeof(state.jsonCallbackAdditionalParams) === 'function') && (typeof(state.activeOption.data) === 'function')) {
+                setTimeout(_jsonpCallbacks[funcName].bind(null, state.activeOption.data(scriptNode.src), ...state.jsonCallbackAdditionalParams(scriptNode.src)), state.activeOption.delay || 0);
+              }
+              else {
+                setTimeout(_jsonpCallbacks[funcName].bind(null, state.activeOption.data, ...state.jsonCallbackAdditionalParams), state.activeOption.delay || 0);
+              }
             }
           }
         });
@@ -166,8 +171,8 @@ export function leoConfiguration() {
   }
 
   function fetchStates() {
-    var activeStates = Leonardo.storage.getStates();
-    var statesCopy = _states.map(function (state) {
+    const activeStates = Leonardo.storage.getStates();
+    let statesCopy = _states.map(function (state) {
       return Object.assign({}, state);
     });