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

Merge pull request #8046 from bjarnef/v8/feature/ysod-overlay

Browse Source 
Replace ysod umb-overlay using overlayService.ysod
This commit is contained in:
Nathan Woulfe
2020-07-06 08:23:21 +10:00
committed by GitHub
parent db69431894 02a8beca27
commit 6db0dbe5c9
2 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
View File

@@ -227,26 +227,21 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
if (err.status && err.status >= 500) { if (err.status && err.status >= 500) {
// Open ysod overlay // Open ysod overlay
$scope.ysodOverlay = { overlayService.ysod(err);
view: "ysod",
error: err,
show: true
};
} }
$timeout(function () { $timeout(function () {
$scope.bulkStatus = ""; $scope.bulkStatus = "";
$scope.actionInProgress = false; $scope.actionInProgress = false;
}, }, 500);
500);
if (successMsgPromise) { if (successMsgPromise)
localizationService.localize("bulk_done") {
.then(function (v) { localizationService.localize("bulk_done").then(function (v) {
successMsgPromise.then(function (successMsg) { successMsgPromise.then(function (successMsg) {
notificationsService.success(v, successMsg); notificationsService.success(v, successMsg);
}) })
}); });
} }
} }
@@ -271,7 +266,6 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
with simple values */ with simple values */
$scope.getContent = function (contentId) { $scope.getContent = function (contentId) {
$scope.reloadView($scope.contentId, true); $scope.reloadView($scope.contentId, true);
} }
@@ -327,8 +321,6 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
}); });
}; };
$scope.makeSearch = function() { $scope.makeSearch = function() {
if ($scope.options.filter !== null && $scope.options.filter !== undefined) { if ($scope.options.filter !== null && $scope.options.filter !== undefined) {
$scope.options.pageNumber = 1; $scope.options.pageNumber = 1;
@@ -408,7 +400,6 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
dialog.title = value; dialog.title = value;
overlayService.open(dialog); overlayService.open(dialog);
}); });
}; };
function performDelete() { function performDelete() {
@@ -704,8 +695,6 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
// set what we've got on the result // set what we've got on the result
result[alias] = value; result[alias] = value;
}); });
} }
function isDate(val) { function isDate(val) {

7
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
View File

@@ -230,11 +230,4 @@
</div> </div>
<umb-overlay
ng-if="ysodOverlay.show"
model="ysodOverlay"
position="right"
view="ysodOverlay.view">
</umb-overlay>
</div> </div>