Merge pull request #7 from jeffreymb/fix_js

OxCom · web-flow · commit 005fe1efb570 · 2018-06-21T12:05:58.000+02:00
Fix Rollbar JS integration that wasn't functional
diff --git a/Twig/RollbarExtension.php b/Twig/RollbarExtension.php
@@ -48,7 +48,9 @@ public function getFunctions()
         }
 
         return [
-            new \Twig_SimpleFunction('rollbarJs', [$this, 'rollbarJs']),
+            new \Twig_SimpleFunction('rollbarJs', [$this, 'rollbarJs'], [
+                'is_safe' => ['html'],
+            ]),
         ];
     }
 
@@ -59,7 +61,7 @@ public function rollbarJs()
     {
         $helper = new RollbarJsHelper($this->config['rollbar_js']);
 
-        $script = "<script>var _rollbarConfig = {{config}};\n{{rollbar-snippet}}</script>";
+        $script = "<script>{{config}};\n{{rollbar-snippet}}</script>";
         $script = strtr($script, [
             '{{config}}'          => $helper->configJsTag(),
             '{{rollbar-snippet}}' => $helper->jsSnippet(),

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ public function getFunctions()`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`return [`
`51`		`- new \Twig_SimpleFunction('rollbarJs', [$this, 'rollbarJs']),`
	`51`	`+ new \Twig_SimpleFunction('rollbarJs', [$this, 'rollbarJs'], [`
	`52`	`+ 'is_safe' => ['html'],`
	`53`	`+ ]),`
`52`	`54`	`];`
`53`	`55`	`}`
`54`	`56`
`@@ -59,7 +61,7 @@ public function rollbarJs()`
`59`	`61`	`{`
`60`	`62`	`$helper = new RollbarJsHelper($this->config['rollbar_js']);`
`61`	`63`
`62`		`- $script = "<script>var _rollbarConfig = {{config}};\n{{rollbar-snippet}}</script>";`
	`64`	`+ $script = "<script>{{config}};\n{{rollbar-snippet}}</script>";`
`63`	`65`	`$script = strtr($script, [`
`64`	`66`	`'{{config}}' => $helper->configJsTag(),`
`65`	`67`	`'{{rollbar-snippet}}' => $helper->jsSnippet(),`