Skip to content

Commit 75b1a20

Browse files
Merge pull request #52 from daniellienert/task/refactor-modernize
TASK: Modernize Fusion code
2 parents 9ee0b21 + 5b866f3 commit 75b1a20

16 files changed

Lines changed: 78 additions & 123 deletions

File tree

Classes/FusionObjects/CanRenderImplementation.php

Lines changed: 0 additions & 38 deletions
This file was deleted.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
prototype(Neos.Neos:DocumentSearchResult) < prototype(Neos.Fusion:Template) {
2+
templatePath = 'resource://Flowpack.SearchPlugin/Private/Fusion/Component/DocumentSearchResult/DocumentSearchResult.html'
3+
node = ${node}
4+
highlight = ${Flowpack.SearchPlugin.Array.flatten(searchHit.highlight)}
5+
6+
title = ${q(node).property('title')}
7+
description = ''
8+
parents = ${Array.reverse(q(node).parents('[instanceof Neos.Neos:Document]').get())}
9+
}

Resources/Private/Templates/SearchResult/DocumentSearchResult.html renamed to Resources/Private/Fusion/Component/DocumentSearchResult/DocumentSearchResult.html

File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
prototype(Neos.NodeTypes:PageSearchResult) < prototype(Neos.Neos:DocumentSearchResult)

Resources/Private/Fusion/AjaxSearch.fusion renamed to Resources/Private/Fusion/Content/SearchPlugin/AjaxSearch/AjaxSearch.fusion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
prototype(Flowpack.SearchPlugin:AjaxSearch) < prototype(Neos.Fusion:Template) {
2-
templatePath = 'resource://Flowpack.SearchPlugin/Private/Templates/NodeTypes/AjaxSearch.html'
2+
templatePath = 'resource://Flowpack.SearchPlugin/Private/Fusion/Content/SearchPlugin/AjaxSearch/AjaxSearch.html'
33

44
searchResultRenderer = Flowpack.SearchPlugin:SearchResultRenderer {
55
@context.searchResults = ${Search.query(site).fulltext(request.arguments.q).execute()}

Resources/Private/Templates/NodeTypes/AjaxSearch.html renamed to Resources/Private/Fusion/Content/SearchPlugin/AjaxSearch/AjaxSearch.html

File renamed without changes.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
prototype(Flowpack.SearchPlugin:Search.Form) < prototype(Neos.Fusion:Template) {
2+
node = ${site}
3+
dimensionCombination = ${Json.stringify(this.node.context.dimensions)}
4+
templatePath = 'resource://Flowpack.SearchPlugin/Private/Fusion/Content/SearchPlugin/Form/Form.html'
5+
6+
inputClassNames = ''
7+
searchWord = ${request.arguments.search}
8+
}

Resources/Private/Templates/NodeTypes/Search.Form.html renamed to Resources/Private/Fusion/Content/SearchPlugin/Form/Form.html

File renamed without changes.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
prototype(Flowpack.SearchPlugin:Search) < prototype(Neos.Neos:Content) {
2+
templatePath = 'resource://Flowpack.SearchPlugin/Private/Fusion/Content/SearchPlugin/Search/Search.html'
3+
4+
searchTerm = ${request.arguments.search}
5+
searchQuery = ${this.searchTerm ? Search.query(site).fulltext(this.searchTerm).nodeType('Neos.Neos:Document') : null}
6+
7+
totalSearchResults = ${this.searchQuery.count()}
8+
9+
searchForm = Flowpack.SearchPlugin:Search.Form
10+
11+
configuration = Neos.Fusion:RawArray {
12+
itemsPerPage = 25
13+
insertAbove = false
14+
insertBelow = true
15+
maximumNumberOfLinks = 10
16+
}
17+
18+
searchResultRenderer = Neos.Fusion:Tag {
19+
tagName = 'ol'
20+
content = Flowpack.SearchPlugin:SearchResultRenderer
21+
}
22+
prototype(Flowpack.SearchPlugin:SingleResult).@process.wrap = ${'<li>' + value + '</li>'}
23+
24+
@cache {
25+
mode = 'uncached'
26+
context {
27+
1 = 'site'
28+
2 = 'node'
29+
3 = 'documentNode'
30+
}
31+
}
32+
}

Resources/Private/Templates/NodeTypes/Search.html renamed to Resources/Private/Fusion/Content/SearchPlugin/Search/Search.html

File renamed without changes.

0 commit comments

Comments
 (0)