Merge pull request #2 from TheDMSGroup/integration-bugs

Integration bugs
TheDMSGroup · Feb 19, 2018 · 0070353 · 0070353
2 parents 153526e + 6fe0279
commit 0070353
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 29 deletions.
diff --git a/Assets/build/contactclient.min.css b/Assets/build/contactclient.min.css
diff --git a/Assets/build/contactclient.min.js b/Assets/build/contactclient.min.js
diff --git a/Assets/build/contactclient.min.js.map b/Assets/build/contactclient.min.js.map
diff --git a/Assets/js/09.integration.js b/Assets/js/09.integration.js
@@ -2,9 +2,7 @@
 Mautic.contactclientIntegration = function () {
     var $client = mQuery('#campaignevent_properties_config_contactclient:first'),
         $overrides = mQuery('#campaignevent_properties_config_contactclient_overrides:first');
-    if (typeof window.contactclientIntegrationLoaded === 'undefined' && $client.length && $overrides.length) {
-
-        window.contactclientIntegrationLoaded = true;
+    if ($client.length && $overrides.length) {
 
         // Get the JSON from the client selector, if not already present.
         $client.change(function(){

diff --git a/Helper/TokenHelper.php b/Helper/TokenHelper.php
@@ -43,7 +43,11 @@ class TokenHelper
      */
     public function __construct()
     {
-        $this->engine = new Engine();
+        try {
+            $this->engine = new Engine();
+        } catch (\Exception $e) {
+            throw new \Exception('You may need to install Mustache via "composer require mustache/mustache".', 0, $e);
+        }
     }
 
     /**