From caf3695b535820b1ab24701e6610927429fd29d7 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Tue, 28 Jul 2015 22:38:56 +0200
Subject: [PATCH] Templating PMA_displayJavascript function.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/config/FormDisplay.tpl.php        | 18 ++++++++----------
 templates/javascript/display.phtml          |  7 +++++++
 test/libraries/PMA_FormDisplay_tpl_test.php |  8 ++++----
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 31921e965a..bde9ef1e76 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -478,17 +478,15 @@ function PMA_addJsValidate($field_id, $validators, &$js_array)
 function PMA_displayJavascript($js_array)
 {
     if (empty($js_array)) {
-        return;
+        return null;
     }
-    $htmlOutput = '<script type="text/javascript">' . "\n"
-        . 'if (typeof configInlineParams === "undefined"'
-        . ' || !Array.isArray(configInlineParams)) configInlineParams = [];' . "\n"
-        . 'configInlineParams.push(function() {' . "\n"
-        . implode(";\n", $js_array) . ";\n"
-        . '});' . "\n"
-        . 'if (typeof configScriptLoaded !== "undefined"'
-        . ' && configInlineParams) loadInlineConfig();' . "\n"
-        . '</script>' . "\n";
+
+    require_once './libraries/Template.class.php';
+
+    $htmlOutput = PMA\Template::get('javascript/display')->render(
+        array('js_array' => $js_array,)
+    );
+
     return $htmlOutput;
 }
 
diff --git a/templates/javascript/display.phtml b/templates/javascript/display.phtml
index e69de29bb2..8a8be7c621 100644
--- a/templates/javascript/display.phtml
+++ b/templates/javascript/display.phtml
@@ -0,0 +1,7 @@
+<script type="text/javascript">
+if (typeof configInlineParams === "undefined" || !Array.isArray(configInlineParams)) configInlineParams = [];
+configInlineParams.push(function() {
+<?php echo implode(";\n", $js_array); ?>;
+});
+if (typeof configScriptLoaded !== "undefined" && configInlineParams) loadInlineConfig();
+</script>
\ No newline at end of file
diff --git a/test/libraries/PMA_FormDisplay_tpl_test.php b/test/libraries/PMA_FormDisplay_tpl_test.php
index db338e5805..ce8e745ae8 100644
--- a/test/libraries/PMA_FormDisplay_tpl_test.php
+++ b/test/libraries/PMA_FormDisplay_tpl_test.php
@@ -556,16 +556,16 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = PMA_displayJavascript(array('var i = 1', 'i++'));
 
         $this->assertEquals(
-            '<script type="text/javascript">' . "\n"
+            '<script type="text/javascript">'
             . 'if (typeof configInlineParams === "undefined"'
-            . ' || !Array.isArray(configInlineParams)) configInlineParams = [];' . "\n"
+            . ' || !Array.isArray(configInlineParams)) '
+            . 'configInlineParams = [];' . "\n"
             . 'configInlineParams.push(function() {' . "\n"
             . 'var i = 1;' . "\n"
             . 'i++;' . "\n"
             . '});' . "\n"
             . 'if (typeof configScriptLoaded !== "undefined"'
-            . ' && configInlineParams) loadInlineConfig();' . "\n"
-            . '</script>' . "\n",
+            . ' && configInlineParams) loadInlineConfig();</script>',
             $result
         );
     }