Skip to content

Busy on loading #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grrseguin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Busy on loading #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
592cdb3
fix (bower) rise angular version dependency
Oct 27, 2015
9a8fc8a
feat : be busy on loading
Oct 28, 2015
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
15 changes: 14 additions & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
{"name":"ngHelperBusy","main":["ngHelperBusy.js","ngHelperBusy.css"],"version":"0.3.3","homepage":"https://github.com/ngHelper/ngHelperBusy","authors":["dei79 <dirk.eisenberg@gmail.com>"],"description":"A full screen busy indicator which is controlled by the $busy service and supports","keywords":["angular","angularjs","busy","service","directive"],"license":"MIT","ignore":["**/.*","node_modules","bower_components","test","tests"],"dependencies":{"angular":"~1.2"}}
{
"name": "ngHelperBusy",
"main": ["ngHelperBusy.js", "ngHelperBusy.css"],
"version": "0.3.3",
"homepage": "https://github.com/ngHelper/ngHelperBusy",
"authors": ["dei79 <dirk.eisenberg@gmail.com>"],
"description": "A full screen busy indicator which is controlled by the $busy service and supports",
"keywords": ["angular", "angularjs", "busy", "service", "directive"],
"license": "MIT",
"ignore": ["**/.*", "node_modules", "bower_components", "test", "tests"],
"dependencies": {
"angular": "^1.2"
}
}
9 changes: 8 additions & 1 deletion ngHelperBusy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ ngHelperBusy.controller('NgHelperBusyCtrl', ['$scope', '$rootScope', '$busy', fu
$rootScope.$on('$busy.resetMessage', function() {
$scope.busyMessage = defaultMessage;
})

if( $busy.busyOnLoading ){
$scope.busyMessage = $busy.getBusyMessage();
$busy.beBusy();
}
}]);

/**
Expand All @@ -50,6 +55,8 @@ ngHelperBusy.service('$busy', [ '$q', '$rootScope', function($q, $rootScope) {
var self = this;
var currentMessage = null;

self.busyOnLoading = false;

self.getBusyMessage = function() {
return currentMessage;
};
Expand Down Expand Up @@ -123,4 +130,4 @@ ngHelperBusy.service('$busy', [ '$q', '$rootScope', function($q, $rootScope) {
// reset the message
self.resetMessage();
}
}]);
}]);