Skip to content
This repository has been archived by the owner on May 4, 2022. It is now read-only.

MUMUP-2427 : Add in loading state to exclusive mode #424

Merged
merged 1 commit into from
Mar 9, 2016
Merged

MUMUP-2427 : Add in loading state to exclusive mode #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions angularjs-portal-home/src/main/webapp/my-app/layout/static/controllers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,18 @@ define(['angular', 'jquery'], function(angular, $) {
that.getPortlet = function (fname, portlets) {
for (var p in portlets) {
if (portlets[p].fname == fname) {
return portlets[p];
return portlets[p];
}
}
return {};
};

var endFn = function(){
$scope.loading = false;
$scope.empty = $scope.portlet.exclusiveContent
&& $scope.portlet.exclusiveContent.length > 0 ? false : true;
};

if (typeof $scope.portlet.fname === 'undefined' || $scope.portlet.fname !== $routeParams.fname) {

if (typeof $rootScope.layout !== 'undefined' && $rootScope.layout != null) {
Expand All @@ -43,11 +49,12 @@ define(['angular', 'jquery'], function(angular, $) {
typeof $scope.portlet.fname === 'undefined') {
$location.path('/');
} else {
layoutService.getExclusiveMarkup($scope.portlet);
$scope.loading = true;
layoutService.getExclusiveMarkup($scope.portlet).then(endFn,endFn);
}
});
} else {
layoutService.getExclusiveMarkup($scope.portlet);
layoutService.getExclusiveMarkup($scope.portlet).then(endFn,endFn);
}

}
Expand Down
2 changes: 1 addition & 1 deletion ...s-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
app-action-link-text="'Add to home'"
app-add-to-home='true'></app-header-two-way-bind>
<div role="main" class="white-page portlet-body">
<div data-loading class='loading-gif abs-bottom-right'><img src="img/ajax-loader.gif" alt="Loading content, please wait"></div>
<loading-gif data-object='loading' data-empty='empty'></loading-gif>
<div ng-bind-html="portlet.exclusiveContent" class="up-portlet-content-wrapper" id="content-{{::portlet.nodeId}}">
</div>
</div>
Expand Down