Fix cache manager interface namespace. Fix render array extra code. U…

…pdate templates and removed raw filter in favor to use autoescape.
akhomy · Jun 8, 2020 · 258ce6b · 258ce6b
1 parent 9d10535
commit 258ce6b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/Cache/TawkToCacheManager.php b/src/Cache/TawkToCacheManager.php
@@ -3,6 +3,7 @@
 namespace Drupal\tawk_to\Cache;
 
 use Drupal\tawk_to\Service\TawkToConditionPluginsHandler;
+use Drupal\Core\Cache\CacheableDependencyInterface;
 
 /**
  * Defines the cache manager tawk.to service.

diff --git a/src/Service/TawkToEmbedRender.php b/src/Service/TawkToEmbedRender.php
@@ -96,10 +96,6 @@ public function render() {
       return NULL;
     }
     if ($this->conditionPluginsHandler->checkAccess()) {
-      $userName = $userEmail = '';
-      if (TRUE) {
-        $userName = \Drupal::token()->replace($userName, [], ['clear' => TRUE]);
-      }
       return [
         '#theme' => 'tawk_to',
         '#items' => [

diff --git a/templates/tawk-to-iframe.html.twig b/templates/tawk-to-iframe.html.twig
@@ -1,18 +1,19 @@
-<script type="text/javascript" src="{{ items.baseUrl|raw }}/public/js/jquery-1.11.0.min.js"></script>
+{% autoescape false %}
+<script type="text/javascript" src="{{ items.baseUrl }}/public/js/jquery-1.11.0.min.js"></script>
 
 <iframe id="tawkIframe" src="" style="min-height: 400px; width : 100%; border: none">
 </iframe>
 
 <script type="text/javascript">
   var currentHost = window.location.protocol + "//" + window.location.host;
-  var url = "{{ items.iframeUrl|raw }}&parentDomain=" + currentHost;
+  var url = "{{ items.iframeUrl }}&parentDomain=" + currentHost;
 
   jQuery("#tawkIframe").attr("src", url);
 
   var iframe = jQuery("#tawk_widget_customization")[0];
 
   window.addEventListener("message", function (e) {
-    if (e.origin === "{{ items.baseUrl|raw }}") {
+    if (e.origin === "{{ items.baseUrl }}") {
 
       if (e.data.action === "setWidget") {
         setWidget(e);
@@ -30,20 +31,21 @@
       widgetId: e.data.widgetId
     }, function (r) {
       if (r.success) {
-        e.source.postMessage({action: "setDone"}, "{{ items.baseUrl|raw }}");
+        e.source.postMessage({action: "setDone"}, "{{ items.baseUrl }}");
       } else {
-        e.source.postMessage({action: "setFail"}, "{{ items.baseUrl|raw }}");
+        e.source.postMessage({action: "setFail"}, "{{ items.baseUrl }}");
       }
     });
   }
 
   function removeWidget(e) {
     jQuery.post("{{ path('tawk_to.remove_widget') }}", function (r) {
       if (r.success) {
-        e.source.postMessage({action: "removeDone"}, "{{ items.baseUrl|raw }}");
+        e.source.postMessage({action: "removeDone"}, "{{ items.baseUrl }}");
       } else {
-        e.source.postMessage({action: "removeFail"}, "{{ items.baseUrl|raw }}");
+        e.source.postMessage({action: "removeFail"}, "{{ items.baseUrl }}");
       }
     });
   }
 </script>
+{% endautoescape %}
diff --git a/templates/tawk-to.html.twig b/templates/tawk-to.html.twig
@@ -9,7 +9,9 @@
   (function () {
     var s1 = document.createElement("script"), s0 = document.getElementsByTagName("script")[0];
     s1.async = true;
-    s1.src = "{{ items.embed_url|raw }}/{{ items.page_id|raw }}/{{ items.widget_id|raw }}";
+    {% autoescape false %}
+    s1.src = "{{ items.embed_url }}/{{ items.page_id }}/{{ items.widget_id }}";
+    {% endautoescape %}
     s1.charset = "UTF-8";
     s1.setAttribute("crossorigin", "*");
     s0.parentNode.insertBefore(s1, s0);