Merge pull request FriendsOfSymfony#17 from FriendsOfSymfony/clean_in…

…itialize Changed the way to build the json array for the config
mqmtech · Dec 13, 2011 · 7f867fa · 7f867fa
2 parents d39dd5f + 9c256b8
commit 7f867fa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/Resources/views/initialize.html.php b/Resources/views/initialize.html.php
@@ -1,6 +1,6 @@
 <script type="text/javascript">
     <?php if ($configMap): ?>
-    twttr.anywhere.config({ <?php echo $configMap ?> });
+    twttr.anywhere.config(<?php echo json_encode($configMap) ?>);
     <?php endif; ?>
 
     twttr.anywhere(function (T) {

diff --git a/Resources/views/initialize.html.twig b/Resources/views/initialize.html.twig
@@ -1,7 +1,7 @@
 {% autoescape false %}
 <script type="text/javascript">
-    {% if configMap %}
-        twttr.anywhere.config({ {{ configMap }} });
+    {% if configMap is not empty %}
+        twttr.anywhere.config({{ configMap|json_encode }});
     {% endif %}
 
     twttr.anywhere(function (T) {

diff --git a/Templating/Helper/TwitterAnywhereHelper.php b/Templating/Helper/TwitterAnywhereHelper.php
@@ -32,7 +32,7 @@ public function __construct(EngineInterface $templating, $apiKey, $version = 1)
     }
 
     /*
-     * 
+     *
      */
     public function setup($parameters = array(), $name = null)
     {
@@ -44,25 +44,19 @@ public function setup($parameters = array(), $name = null)
     }
 
     /*
-     * 
+     *
      */
     public function initialize($parameters = array(), $name = null)
     {
-        //convert config array to map
-        $configMap = null;
-        foreach ($this->config as $key => $value){
-            $configMap .= $key.": ".$value.',';
-        }
-
         //convert scripts into lines
         $lines = '';
         foreach ($this->scripts as $script) {
             $lines .= rtrim($script, ';').";\n";
-        }        
+        }
 
         $name = $name ?: 'FOSTwitterBundle::initialize.html.php';
         return $this->templating->render($name, $parameters + array(
-            'configMap'     => $configMap,
+            'configMap'     => $this->config,
             'scripts'       => $lines,
         ));
     }
@@ -76,11 +70,11 @@ public function queue($script)
     }
 
     /*
-     * 
+     *
      */
     public function setConfig($key, $value)
     {
-        $this->config[$key] = '"'.$value.'"';
+        $this->config[$key] = $value;
     }
 
     /**