feat(export.renderer.FluidImageUrlFilterRenderer): correct replacemen…

…t of crop param (#5) * feat(export.renderer.FluidLiteralNodeRenderer): now replaces boolean types true/false with 1/0, adapts fixtures * fix(export.renderer.FluidLiteralNodeRenderer): use strings * feat(export.renderer.FluidImageUrlFilterRenderer): correct replacement of crop param * feat(export.renderer.FluidSvgUrlFilterRenderer): add value param to format.raw * fix(test.fixtures.renderer.filter): adapt svg test * feat(export.renderer.FluidVariableNodeRenderer): add support for more loop variables + fixtures
entoj · Feb 15, 2018 · 93f993b · 93f993b
1 parent 7d7e97e
commit 93f993b
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 21 deletions.
diff --git a/source/export/renderer/FluidImageUrlFilterRenderer.js b/source/export/renderer/FluidImageUrlFilterRenderer.js
@@ -36,6 +36,9 @@ class FluidImageUrlFilterRenderer extends FluidFilterNodeRenderer
 
             case 2:
                 return 'height';
+
+            case 3:
+                return 'crop';
 
             default:
                 return argument.name || 'param' + index;

diff --git a/source/export/renderer/FluidSvgUrlFilterRenderer.js b/source/export/renderer/FluidSvgUrlFilterRenderer.js
@@ -47,7 +47,7 @@ class FluidSvgUrlFilterRenderer extends NodeListRenderer
             // we are relying on the outer rendering providing a { ... }
             let result = 'settings.entoj.svgUrl';
             result+= '}{' + name + '}';
-            result+= '{' + configuration.fluidConfiguration.builtinViewHelperNamespace + ':format.raw(\'.svg#icon\')';
+            result+= '{' + configuration.fluidConfiguration.builtinViewHelperNamespace + ':format.raw(value: \'.svg#icon\')';
             return result;
         }).catch(ErrorHandler.handler(this));
         return promise;

diff --git a/source/export/renderer/FluidVariableNodeRenderer.js b/source/export/renderer/FluidVariableNodeRenderer.js
@@ -93,17 +93,18 @@ class FluidVariableNodeRenderer extends NodeRenderer
         if (node.isChildOf('ForNode') && node.fields[0] === 'loop' && node.fields.length === 2)
         {
             result+= 'loop.';
-            if (node.fields[1] === 'length')
-            {
-                result+= 'total';
-            }
-            else if (node.fields[1] === 'first')
-            {
-                result+= 'isFirst';
-            }
-            else if (node.fields[1] === 'last')
+
+            const map = {
+                'length': 'total',
+                'first': 'isFirst',
+                'last': 'isLast',
+                'index': 'count',
+                'index0': 'index'
+            };
+
+            if(map.hasOwnProperty(node.fields[1]))
             {
-                result+= 'isLast';
+                result+= map[node.fields[1]];
             }
             else
             {

diff --git a/test/__fixtures__/nodeRenderer/FluidVariableNodeRenderer.expected.html b/test/__fixtures__/nodeRenderer/FluidVariableNodeRenderer.expected.html
@@ -2,8 +2,8 @@
 moduleClass
 model.image.url.1x1
 model.images[0].url
-loop.length loop.index loop.first loop.last
+loop.length loop.index loop.index0 loop.first loop.last
 <!-- variables in conditions -->
 {model.copy}{model.headline}
 <!-- variables in loops -->
-model.items loop.total loop.index loop.isFirst loop.isLast
+model.items loop.total loop.count loop.index loop.isFirst loop.isLast
diff --git a/test/__fixtures__/nodeRenderer/FluidVariableNodeRenderer.input.j2 b/test/__fixtures__/nodeRenderer/FluidVariableNodeRenderer.input.j2
@@ -2,8 +2,8 @@
 {{ moduleClass }}
 {{ model.image.url.1x1 }}
 {{ model.images[0].url }}
-{{ loop.length }} {{ loop.index }} {{ loop.first }} {{ loop.last }}
+{{ loop.length }} {{ loop.index }} {{ loop.index0 }} {{ loop.first }} {{ loop.last }}
 <!-- variables in conditions -->
 {% if model.copy or model.headline == '' %}{% endif %}
 <!-- variables in loops -->
-{% for item in model.items %} {{ loop.length }} {{ loop.index }} {{ loop.first }} {{ loop.last }}{% endfor %}
+{% for item in model.items %} {{ loop.length }} {{ loop.index }} {{ loop.index0 }} {{ loop.first }} {{ loop.last }}{% endfor %}
diff --git a/test/__fixtures__/renderer/filter.expected.html b/test/__fixtures__/renderer/filter.expected.html
@@ -25,10 +25,10 @@
 <e:setProperty name="model" key="key" value="value" />
 <e:setProperty name="{  }" key="key" value="{value}" />
 
-{settings.entoj.svgUrl}{model.text}{f:format.raw('.svg#icon')}
-{settings.entoj.svgUrl}{application}{f:format.raw('.svg#icon')}
-<f:variable name="result" value="{settings.entoj.svgUrl}{model.text}{f:format.raw('.svg#icon')}" />
-<f:variable name="result" value="{settings.entoj.svgUrl}{application}{f:format.raw('.svg#icon')}" />
+{settings.entoj.svgUrl}{model.text}{f:format.raw(value: '.svg#icon')}
+{settings.entoj.svgUrl}{application}{f:format.raw(value: '.svg#icon')}
+<f:variable name="result" value="{settings.entoj.svgUrl}{model.text}{f:format.raw(value: '.svg#icon')}" />
+<f:variable name="result" value="{settings.entoj.svgUrl}{application}{f:format.raw(value: '.svg#icon')}" />
 
 {f:translate(key: model.text, extensionName: 'local')}
 {f:translate(key: 'application', extensionName: 'local')}

diff --git a/test/__fixtures__/renderer/loops.expected.html b/test/__fixtures__/renderer/loops.expected.html
@@ -1,3 +1,3 @@
 <f:for as="item" each="{model.items}" iteration="loop">COPY</f:for>
 <f:for as="item" key="key" each="{model.items}" iteration="loop">BREAKPOINT</f:for>
-<f:for as="item" each="{model.items}" iteration="loop">{loop.total}{loop.index}{loop.isFirst}{loop.isLast}</f:for>
+<f:for as="item" each="{model.items}" iteration="loop">{loop.total}{loop.count}{loop.index}{loop.isFirst}{loop.isLast}</f:for>
diff --git a/test/__fixtures__/renderer/loops.input.j2 b/test/__fixtures__/renderer/loops.input.j2
@@ -1,3 +1,3 @@
 {% for item in model.items %}COPY{% endfor %}
 {% for key, item in model.items %}BREAKPOINT{% endfor %}
-{% for item in model.items %}{{ loop.length }}{{ loop.index }}{{ loop.first }}{{ loop.last }}{% endfor %}
+{% for item in model.items %}{{ loop.length }}{{ loop.index }}{{ loop.index0 }}{{ loop.first }}{{ loop.last }}{% endfor %}