added progressbar
This commit is contained in:
parent
78d1fb8eda
commit
c3cf0145ce
|
@ -72,7 +72,7 @@ module.exports = function(grunt) {
|
||||||
dest: 'public/js/vendors.js'
|
dest: 'public/js/vendors.js'
|
||||||
},
|
},
|
||||||
angular: {
|
angular: {
|
||||||
src: ['public/lib/angular/angular.min.js', 'public/lib/angular-resource/angular-resource.min.js', 'public/lib/angular-route/angular-route.min.js', 'public/lib/angular-qrcode/qrcode.js', 'public/lib/angular-animate/angular-animate.min.js', 'public/lib/angular-bootstrap/ui-bootstrap.min.js', 'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js', 'public/lib/angular-ui-utils/ui-utils.min.js'],
|
src: ['public/lib/angular/angular.min.js', 'public/lib/angular-resource/angular-resource.min.js', 'public/lib/angular-route/angular-route.min.js', 'public/lib/angular-qrcode/qrcode.js', 'public/lib/angular-animate/angular-animate.min.js', 'public/lib/angular-bootstrap/ui-bootstrap.min.js', 'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js', 'public/lib/angular-ui-utils/ui-utils.min.js', 'public/lib/ngprogress/build/ngProgress.min.js'],
|
||||||
dest: 'public/js/angularjs-all.js'
|
dest: 'public/js/angularjs-all.js'
|
||||||
},
|
},
|
||||||
main: {
|
main: {
|
||||||
|
@ -80,7 +80,7 @@ module.exports = function(grunt) {
|
||||||
dest: 'public/js/main.js'
|
dest: 'public/js/main.js'
|
||||||
},
|
},
|
||||||
css: {
|
css: {
|
||||||
src: ['public/src/css/**/*.css'],
|
src: ['public/lib/ngprogress/ngProgress.css', 'public/src/css/**/*.css'],
|
||||||
dest: 'public/css/main.css'
|
dest: 'public/css/main.css'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"angular": "latest",
|
"angular": "latest",
|
||||||
"angular-resource": "latest",
|
"angular-resource": "latest",
|
||||||
"angular-cookies": "latest",
|
|
||||||
"angular-mocks": "latest",
|
"angular-mocks": "latest",
|
||||||
"angular-route": "latest",
|
"angular-route": "latest",
|
||||||
"bootstrap": "3.0.3",
|
"bootstrap": "3.0.3",
|
||||||
|
@ -13,6 +12,7 @@
|
||||||
"angular-qrcode": "latest",
|
"angular-qrcode": "latest",
|
||||||
"angular-animate": "latest",
|
"angular-animate": "latest",
|
||||||
"momentjs": "~2.5.0",
|
"momentjs": "~2.5.0",
|
||||||
"zeroclipboard": "~1.3.0-beta.1"
|
"zeroclipboard": "~1.3.0-beta.1",
|
||||||
|
"ngprogress": "~1.0.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,7 @@ angular.module('insight',[
|
||||||
'ngAnimate',
|
'ngAnimate',
|
||||||
'ngResource',
|
'ngResource',
|
||||||
'ngRoute',
|
'ngRoute',
|
||||||
|
'ngProgress',
|
||||||
'ui.bootstrap',
|
'ui.bootstrap',
|
||||||
'ui.route',
|
'ui.route',
|
||||||
'monospaced.qrcode',
|
'monospaced.qrcode',
|
||||||
|
|
|
@ -47,8 +47,16 @@ angular.module('insight')
|
||||||
$locationProvider.html5Mode(true);
|
$locationProvider.html5Mode(true);
|
||||||
$locationProvider.hashPrefix('!');
|
$locationProvider.hashPrefix('!');
|
||||||
})
|
})
|
||||||
.run(function($rootScope, $route) {
|
.run(function($rootScope, $route, ngProgress) {
|
||||||
|
$rootScope.$on('$routeChangeStart', function() {
|
||||||
|
ngProgress.height('4px');
|
||||||
|
ngProgress.color('#373D42');
|
||||||
|
ngProgress.start();
|
||||||
|
});
|
||||||
|
|
||||||
$rootScope.$on('$routeChangeSuccess', function() {
|
$rootScope.$on('$routeChangeSuccess', function() {
|
||||||
|
ngProgress.complete();
|
||||||
|
|
||||||
//Change page title, based on Route information
|
//Change page title, based on Route information
|
||||||
$rootScope.titleDetail = '';
|
$rootScope.titleDetail = '';
|
||||||
$rootScope.title = $route.current.title;
|
$rootScope.title = $route.current.title;
|
||||||
|
|
Loading…
Reference in New Issue