yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'U4-10864_close_back_office_search_results' of https://github.com/redmorello/Umbraco-CMS into redmorello-U4-10864_close_back_office_search_results

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
This commit is contained in:
Sebastiaan Jansssen
2018-01-24 17:43:19 +01:00
parent 82e50ccd3a 60ce36a7f2
commit da0b1c2f23
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/controllers/search.controller.js
View File

@@ -14,7 +14,6 @@ function SearchController($scope, searchService, $log, $location, navigationServ
$scope.isSearching = false;
$scope.selectedResult = -1;
$scope.navigateResults = function (ev) {
//38: up 40: down, 13: enter
@@ -34,12 +33,14 @@ function SearchController($scope, searchService, $log, $location, navigationServ
}
};
var group = undefined;
var groupIndex = -1;
var itemIndex = -1;
$scope.selectedItem = undefined;
$scope.clearSearch = function () {
$scope.searchTerm = null;
};
function iterateResults(up) {
//default group

9
src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
View File

@@ -36,9 +36,14 @@
<umb-load-indicator ng-if="isSearching"></umb-load-indicator>
<umb-empty-state ng-if="!hasResults && !isSearching"
position="center">
<umb-empty-state ng-if="!hasResults && !isSearching" position="center">
<localize key="general_searchNoResult"></localize>
<br />
<button type="button" class="btn umb-button__button btn-info umb-button--" ng-click="clearSearch()" hotkey="" hotkey-when-hidden="">
<span class="umb-button__content">
<localize key="general_clearSearch" class="ng-isolate-scope ng-scope ng-binding">Clear Search</localize>
</span>
</button>
</umb-empty-state>
<ul class="umb-tree" ng-if="!isSearching && hasResults">