From 2227c7afb56dccb6a5dcc4aa951a646e07b26090 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Thu, 16 Jun 2016 09:04:31 -0700 Subject: [PATCH 1/6] intercom fixes --- app/config/environment.js | 10 ++++++---- app/lib/intercom/index.js | 37 +------------------------------------ 2 files changed, 7 insertions(+), 40 deletions(-) diff --git a/app/config/environment.js b/app/config/environment.js index d39cbe3c..0d771217 100644 --- a/app/config/environment.js +++ b/app/config/environment.js @@ -36,10 +36,12 @@ module.exports = function(environment) { }; process.argv.forEach(function(element){ - if (element.startsWith("intercom=")) { - element = element.replace("intercom=", ""); - ENV.APP.intercomKey = element; - } + if (element !== 'undefined') { + if (element.startsWith("intercom=")) { + element = element.replace("intercom=", ""); + ENV.APP.intercomKey = element; + } + } }); if (environment === 'development') { diff --git a/app/lib/intercom/index.js b/app/lib/intercom/index.js index 5bec580d..7d4aa52b 100644 --- a/app/lib/intercom/index.js +++ b/app/lib/intercom/index.js @@ -11,42 +11,7 @@ module.exports = { var appId = config.APP.intercomKey; if ('head-footer' === type && appId.length > 0) { - return ` - - `; + return ""; } }, From d554af189b168dcd82a80f7297b4d3f11e9dcf16 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Thu, 16 Jun 2016 09:12:33 -0700 Subject: [PATCH 2/6] undefined check for intercom --- app/config/environment.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/environment.js b/app/config/environment.js index 0d771217..000cbbfd 100644 --- a/app/config/environment.js +++ b/app/config/environment.js @@ -35,8 +35,8 @@ module.exports = function(environment) { } }; - process.argv.forEach(function(element){ - if (element !== 'undefined') { + process.argv.forEach(function(element) { + if (element !== undefined) { if (element.startsWith("intercom=")) { element = element.replace("intercom=", ""); ENV.APP.intercomKey = element; From 12db5fe0aea7ec1b3700fe8c1ea70a4d3a5b178d Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Thu, 16 Jun 2016 10:07:41 -0700 Subject: [PATCH 3/6] localhost --- app/config/environment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/environment.js b/app/config/environment.js index 000cbbfd..591c564f 100644 --- a/app/config/environment.js +++ b/app/config/environment.js @@ -52,7 +52,7 @@ module.exports = function(environment) { }; ENV.apiHost = "https://localhost:5001"; - ENV.apiHost = "https://demo1.dev:5001"; + // ENV.apiHost = "https://demo1.dev:5001"; } if (environment === 'test') { From f988123a6419b45bd24259809927dadaaada87ab Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Thu, 16 Jun 2016 10:15:10 -0700 Subject: [PATCH 4/6] apiHost now command line parameter to ember --- app/config/environment.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/app/config/environment.js b/app/config/environment.js index 591c564f..661b1329 100644 --- a/app/config/environment.js +++ b/app/config/environment.js @@ -35,15 +35,6 @@ module.exports = function(environment) { } }; - process.argv.forEach(function(element) { - if (element !== undefined) { - if (element.startsWith("intercom=")) { - element = element.replace("intercom=", ""); - ENV.APP.intercomKey = element; - } - } - }); - if (environment === 'development') { ENV.APP.LOG_TRANSITIONS = true; ENV.APP.LOG_TRANSITIONS_INTERNAL = true; @@ -52,7 +43,6 @@ module.exports = function(environment) { }; ENV.apiHost = "https://localhost:5001"; - // ENV.apiHost = "https://demo1.dev:5001"; } if (environment === 'test') { @@ -83,6 +73,19 @@ module.exports = function(environment) { ENV.apiHost = ""; } + process.argv.forEach(function(element) { + if (element !== undefined) { + if (element.startsWith("intercom=")) { + element = element.replace("intercom=", ""); + ENV.APP.intercomKey = element; + } + if (element.startsWith("apiHost=")) { + element = element.replace("apiHost=", ""); + ENV.apiHost = element; + } + } + }); + ENV.apiNamespace = "api"; ENV.contentSecurityPolicy = null; From 37d2946924129e17d41c3540b6ec0495fa1c8667 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Thu, 16 Jun 2016 10:20:38 -0700 Subject: [PATCH 5/6] safety check for Intercom --- app/app/services/audit.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/app/services/audit.js b/app/app/services/audit.js index 8bc5d2cc..3895e520 100644 --- a/app/app/services/audit.js +++ b/app/app/services/audit.js @@ -24,7 +24,7 @@ export default Ember.Service.extend({ }, record(id) { - if (!this.get('enabled')) { + if (!this.get('enabled') || is.empty(this.get('appId'))) { return; } @@ -32,6 +32,8 @@ export default Ember.Service.extend({ this.start(); } + console.log(); + Intercom('trackEvent', id); //jshint ignore: line Intercom('update'); //jshint ignore: line }, From d2e7a811a458a7c993529cfa02b445a67daf5172 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Thu, 16 Jun 2016 13:07:05 -0700 Subject: [PATCH 6/6] removed console.log --- app/app/services/audit.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/app/services/audit.js b/app/app/services/audit.js index 3895e520..95c15754 100644 --- a/app/app/services/audit.js +++ b/app/app/services/audit.js @@ -32,8 +32,6 @@ export default Ember.Service.extend({ this.start(); } - console.log(); - Intercom('trackEvent', id); //jshint ignore: line Intercom('update'); //jshint ignore: line },