diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2020-09-02 04:24:03 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2020-09-03 09:09:26 +0200 |
| commit | 96821945fbbca72a2bd26b88c1a057e53d86ab78 (patch) | |
| tree | 1f6071792856d30e976bfe0ea2eee6965c026ce6 /core/src | |
| parent | 43243ce298d7ba2017321262c9ca02614efa7577 (diff) | |
| download | nextcloud-server-96821945fbbca72a2bd26b88c1a057e53d86ab78.tar.gz nextcloud-server-96821945fbbca72a2bd26b88c1a057e53d86ab78.zip | |
Adjust acceptance tests to changes in @nextcloud/vue 2.6.3
The menu button and the menu of a share are no longer direct childs of
the actions of the share row. The menu button is now a child of a
".trigger" element, while the menu is a direct child of the body and has
an id defined in the "aria-describedby" attribute of the ".trigger"
element.
In XPath 1.0 it does not seem possible to "backreference" a value or
create variables, so when the share menu or one of its item is needed
now the ".trigger" element is first found and then its XPath expression
is used to compose its "aria-describedby" attribute in the XPath
expression for the menu.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/services/UnifiedSearchService.js | 2 | ||||
| -rw-r--r-- | core/src/views/UnifiedSearch.vue | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/core/src/services/UnifiedSearchService.js b/core/src/services/UnifiedSearchService.js index 152de3755f7..60f78e8cd2f 100644 --- a/core/src/services/UnifiedSearchService.js +++ b/core/src/services/UnifiedSearchService.js @@ -65,6 +65,6 @@ export function search(type, query, cursor) { cursor, // Sending which location we're currently at from: window.location.pathname.replace('/index.php', '') + window.location.search, - } + }, }) } diff --git a/core/src/views/UnifiedSearch.vue b/core/src/views/UnifiedSearch.vue index 8e2c74c5334..1ce55f0675f 100644 --- a/core/src/views/UnifiedSearch.vue +++ b/core/src/views/UnifiedSearch.vue @@ -104,17 +104,15 @@ </template> <script> +import { emit } from '@nextcloud/event-bus' import { minSearchLength, getTypes, search, defaultLimit, regexFilterIn, regexFilterNot } from '../services/UnifiedSearchService' import ActionButton from '@nextcloud/vue/dist/Components/ActionButton' import Actions from '@nextcloud/vue/dist/Components/Actions' import debounce from 'debounce' import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent' import Magnify from 'vue-material-design-icons/Magnify' -import debounce from 'debounce' -import { emit } from '@nextcloud/event-bus' import HeaderMenu from '../components/HeaderMenu' -import SearchFilter from '../components/UnifiedSearch/SearchFilter' import SearchResult from '../components/UnifiedSearch/SearchResult' import SearchResultPlaceholders from '../components/UnifiedSearch/SearchResultPlaceholders' @@ -127,7 +125,6 @@ export default { EmptyContent, HeaderMenu, Magnify, - SearchFilter, SearchResult, SearchResultPlaceholders, }, |