Permalink
Browse files

merge fixes from other forks

  • Loading branch information...
1 parent 94696fd commit e07078d8652f305fdaff36be1296ecefc6d47f66 @gorillamania gorillamania committed Mar 19, 2012
Showing with 17 additions and 11 deletions.
  1. +17 −11 delivery/js/Liftium.js
View
@@ -25,11 +25,11 @@ var LiftiumOptions = LiftiumOptions || {};
if (! window.Liftium ) { // No need to do this twice
var Liftium = {
- baseUrl : LiftiumOptions.baseUrl || "http://delivery.liftium.com/",
+ baseUrl : LiftiumOptions.baseUrl || "http://delivery.importantmedia.org/",
chain : [],
currents : [],
eventsTracked : 0,
- geoUrl : LiftiumOptions.geoUrl || "http://geoip.liftium.com/",
+ geoUrl : LiftiumOptions.geoUrl || "http://geoip.huddler.com/",
loadDelay : 100,
maxHops : LiftiumOptions.maxHops || 5,
slotHops : [],
@@ -1670,6 +1670,8 @@ Liftium.recordEvents = function(slotname){
Liftium.reportError = function (msg, type) {
+ // Disabled
+ return;
// wrapped in a try catch block because if this function is reporting an error,
// all hell breaks loose
try {
@@ -2412,7 +2414,7 @@ XDM.send = function (destWin, method, args){
XDM.getDestinationDomain = function(destWin){
- if (destWin == top){
+ if (destWin == window.parent){
// Pull domain from referrer.
if (document.referrer.toString() !== ''){
var m = document.referrer.toString().match(/https*:\/\/([^\/]+)/);
@@ -2531,14 +2533,18 @@ XDM.listenForMessages = function(handler){
XDM.isAllowedMethod = function(method){
- var found = false;
- for (var i = 0; i < XDM.allowedMethods.length; i++){
- if (method.toString() === XDM.allowedMethods[i]){
- found = true;
- break;
- }
- }
- return found;
+ if (typeof method == "undefined") {
+ return false;
+ }
+
+ var found = false;
+ for (var i = 0; i < XDM.allowedMethods.length; i++){
+ if (method.toString() === XDM.allowedMethods[i]){
+ found = true;
+ break;
+ }
+ }
+ return found;
};

0 comments on commit e07078d

Please sign in to comment.