git-svn-id: https://svn.coded.pt/svn/SIPRP@1914 bb69d46d-e84e-40c8-a05a-06db0d633741

lxbfYeaa
João Maurício 12 years ago
parent 8aa67ec4a3
commit 149698151b

@ -77,7 +77,7 @@
if(response.success && complete)
{
globals.plugins.hideSideMenu();
globals.plugins.hideFloatingSideMenu();
$scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){

@ -77,7 +77,7 @@
if(response.success && complete)
{
globals.plugins.hideSideMenu();
globals.plugins.hideFloatingSideMenu();
$scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){

@ -77,7 +77,7 @@
// if(response.success && complete)
// {
// globals.plugins.hideSideMenu();
// globals.plugins.hideFloatingSideMenu();
// $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){

@ -301,10 +301,14 @@
//render module if not rendered yet...
if(module == null)
{
$scope.$emit('onBeforeMainPanelChange', {mainPanel: $scope.divMainPanel, module: module});
$scope.renderModule('body #main-panel', subModule.Controller, (configs || null), true, function(className, scope){
$("body, html").animate({scrollTop : 0}, 0);
$scope.$emit('onAfterMainPanelChange', {mainPanel: $scope.divMainPanel, module: module});
//execute callback if available
if(callback != undefined)
{
@ -346,10 +350,32 @@
if(!isInMainPanel)
{
$scope.$emit('onBeforeMainPanelChange', {mainPanel: $scope.divMainPanel, module: module});
//add current module to main-panel if not there yet
module.domEl.appendTo($scope.divMainPanel);
$scope.$emit('onAfterMainPanelChange', {mainPanel: $scope.divMainPanel, module: module});
}
}
};
$scope.$on('onBeforeMainPanelChange', function(event, args){
$rootScope.$broadcast('loadingStatusActive');
//$(args.mainPanel).hide();
});
$scope.$on('onAfterMainPanelChange', function(event, args){
$timeout(function () {
//$(args.mainPanel).fadeIn();
$rootScope.$broadcast('loadingStatusInactive');
}, 0);
});
$scope.getModule = function(className){

@ -257,6 +257,22 @@
if(options.scrollspyItems)
{
var links = options.scrollspyItems.find('li');
links.each(function(index) {
if(index == 0)
{
$(this).addClass("active");
}
else
{
if($(this).hasClass("active"))
{
$(this).removeClass("active");
}
}
});
wrapper.append(options.scrollspyItems);
}

Loading…
Cancel
Save