From f3a46a4e1baff28f1868e07b39918b82bce89370 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 14 Jun 2020 22:39:31 +0200
Subject: [PATCH] Remove spaceless from Twig templates

Ref: bd33d92f39e7b0ea91aa96a3766207d389483927
Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 .../columns_definitions/column_virtuality.twig  |  4 +---
 templates/columns_definitions/partitions.twig   |  4 +---
 templates/database/designer/main.twig           |  2 --
 templates/database/multi_table_query/form.twig  | 16 +++++++---------
 templates/display/export/options_rows.twig      | 17 ++++++++---------
 templates/display/import/javascript.twig        |  4 +---
 6 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/templates/columns_definitions/column_virtuality.twig b/templates/columns_definitions/column_virtuality.twig
index 96f020e136..d53f5d55e8 100644
--- a/templates/columns_definitions/column_virtuality.twig
+++ b/templates/columns_definitions/column_virtuality.twig
@@ -15,13 +15,11 @@
 </select>
 
 {% if char_editing == 'textarea' %}
-    {% apply spaceless %}
     <textarea name="field_expression[{{ column_number }}]"
         cols="15"
         class="textfield expression">
-        {{ expression }}
+        {{- expression -}}
     </textarea>
-    {% endapply %}
 {% else %}
     <input type="text"
         name="field_expression[{{ column_number }}]"
diff --git a/templates/columns_definitions/partitions.twig b/templates/columns_definitions/partitions.twig
index b8c88af57a..b762d8d7d3 100644
--- a/templates/columns_definitions/partitions.twig
+++ b/templates/columns_definitions/partitions.twig
@@ -143,11 +143,9 @@
                         ) }}
                     </td>
                     <td>
-                        {% apply spaceless %}
                         <textarea name="{{ subpartition['prefix'] }}[comment]">
-                            {{ subpartition['comment'] }}
+                            {{- subpartition['comment'] -}}
                         </textarea>
-                        {% endapply %}
                     </td>
                     <td>
                         <input type="text" name="{{ subpartition['prefix'] }}[data_directory]"
diff --git a/templates/database/designer/main.twig b/templates/database/designer/main.twig
index f32ec1bd5b..858d59054c 100644
--- a/templates/database/designer/main.twig
+++ b/templates/database/designer/main.twig
@@ -1,9 +1,7 @@
 {# Invisible characters will make javascript crash #}
-{% apply spaceless %}
 <script type="text/javascript">
 var designerConfig = {{ designer_config|raw }};
 </script>
-{% endapply %}
 
 {# side menu #}
 {% if not has_query %}
diff --git a/templates/database/multi_table_query/form.twig b/templates/database/multi_table_query/form.twig
index 068ceda20f..04d7b7a5d7 100644
--- a/templates/database/multi_table_query/form.twig
+++ b/templates/database/multi_table_query/form.twig
@@ -163,15 +163,13 @@
         </fieldset>
 
         <fieldset>
-            {% apply spaceless %}
-                <textarea id="MultiSqlquery"
-                    cols="80"
-                    rows="4"
-                    style="float:left"
-                    name="sql_query"
-                    dir="ltr">
-                </textarea>
-            {% endapply %}
+              {# Keep the block without a space between the open and close tag #}
+              <textarea id="MultiSqlquery"
+                  cols="80"
+                  rows="4"
+                  style="float: left;"
+                  name="sql_query"
+                  dir="ltr"></textarea>
         </fieldset>
     </fieldset>
 
diff --git a/templates/display/export/options_rows.twig b/templates/display/export/options_rows.twig
index 1d4f866a02..041740454f 100644
--- a/templates/display/export/options_rows.twig
+++ b/templates/display/export/options_rows.twig
@@ -9,15 +9,14 @@
                 <li>
                     <label for="limit_to">{% trans 'Number of rows:' %}</label>
                     <input type="text" id="limit_to" name="limit_to" size="5" value="
-                        {%- apply spaceless %}
-                            {% if limit_to is not null %}
-                                {{ limit_to }}
-                            {% elseif unlim_num_rows is not empty and unlim_num_rows != 0 %}
-                                {{ unlim_num_rows }}
-                            {% else %}
-                                {{ number_of_rows }}
-                            {% endif %}
-                        {% endapply %}" onfocus="this.select()">
+                            {# Keep everything space less because it is a value #}
+                            {%- if limit_to is not null -%}
+                                {{- limit_to -}}
+                            {%- elseif unlim_num_rows is not empty and unlim_num_rows != 0 -%}
+                                {{- unlim_num_rows -}}
+                            {%- else %}
+                                {{- number_of_rows -}}
+                            {%- endif -%}" onfocus="this.select()">
                 </li>
                 <li>
                     <label for="limit_from">{% trans 'Row to begin at:' %}</label>
diff --git a/templates/display/import/javascript.twig b/templates/display/import/javascript.twig
index ec91e3c362..5802c35121 100644
--- a/templates/display/import/javascript.twig
+++ b/templates/display/import/javascript.twig
@@ -18,7 +18,6 @@ $( function() {
             {% set import_url = get_common_raw({'import_status': 1}, '&') %}
 
             {% set upload_html %}
-                {% apply spaceless %}
                     <div class="upload_progress">
                         <div class="upload_progress_bar_outer">
                             <div class="percentage"></div>
@@ -31,7 +30,6 @@ $( function() {
                         </div>
                         <div id="statustext"></div>
                     </div>
-                {% endapply %}
             {% endset %}
 
             {# Start output #}
@@ -79,7 +77,7 @@ $( function() {
                             {# Show progress UI #}
                             $("#importmain").hide();
                             $("#import_form_status")
-                            .html('{{ upload_html|raw }}')
+                            .html('{{ upload_html|spaceless|raw }}')
                             .show();
                             import_start = now;
                         }