register template progress bar now renders when loading
@@ -97,7 +97,7 @@ define(['angular',"feed-mgr/templates/module-name"], function (angular,moduleNam
}
this.isLoading = function(){
- return self.loadingTemplate || self.fetchingTemplateList;
+ return self.loadingTemplate || self.fetchingTemplateList || self.model.loading;
}
/**
@@ -214,6 +214,16 @@ define(['angular',"feed-mgr/templates/module-name"], function (angular,moduleNam
});
};
+ $scope.$watch(function(){
+ return self.model.loading;
+ },function(newVal){
+ if(newVal == false) {
+ hideProgress();
+ }
+
+ })
+
+
this.getTemplates();
AccessControlService.getUserAllowedActions()
