From c3cf0145ce395928ffa225644ecb3ceb5d4eb3b4 Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Mon, 10 Feb 2014 15:51:26 -0300 Subject: [PATCH] added progressbar --- Gruntfile.js | 4 ++-- bower.json | 4 ++-- public/src/js/app.js | 1 + public/src/js/config.js | 10 +++++++++- public/src/js/controllers/header.js | 0 public/src/js/controllers/index.js | 0 6 files changed, 14 insertions(+), 5 deletions(-) mode change 100755 => 100644 public/src/js/controllers/header.js mode change 100755 => 100644 public/src/js/controllers/index.js diff --git a/Gruntfile.js b/Gruntfile.js index 6baaf2b7..4b424757 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -72,7 +72,7 @@ module.exports = function(grunt) { dest: 'public/js/vendors.js' }, 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' }, main: { @@ -80,7 +80,7 @@ module.exports = function(grunt) { dest: 'public/js/main.js' }, css: { - src: ['public/src/css/**/*.css'], + src: ['public/lib/ngprogress/ngProgress.css', 'public/src/css/**/*.css'], dest: 'public/css/main.css' } }, diff --git a/bower.json b/bower.json index 0e701fdb..dc4b2903 100644 --- a/bower.json +++ b/bower.json @@ -4,7 +4,6 @@ "dependencies": { "angular": "latest", "angular-resource": "latest", - "angular-cookies": "latest", "angular-mocks": "latest", "angular-route": "latest", "bootstrap": "3.0.3", @@ -13,6 +12,7 @@ "angular-qrcode": "latest", "angular-animate": "latest", "momentjs": "~2.5.0", - "zeroclipboard": "~1.3.0-beta.1" + "zeroclipboard": "~1.3.0-beta.1", + "ngprogress": "~1.0.4" } } diff --git a/public/src/js/app.js b/public/src/js/app.js index 279ea331..0fdc6c38 100755 --- a/public/src/js/app.js +++ b/public/src/js/app.js @@ -4,6 +4,7 @@ angular.module('insight',[ 'ngAnimate', 'ngResource', 'ngRoute', + 'ngProgress', 'ui.bootstrap', 'ui.route', 'monospaced.qrcode', diff --git a/public/src/js/config.js b/public/src/js/config.js index b5399ada..b08d6d6b 100755 --- a/public/src/js/config.js +++ b/public/src/js/config.js @@ -47,8 +47,16 @@ angular.module('insight') $locationProvider.html5Mode(true); $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() { + ngProgress.complete(); + //Change page title, based on Route information $rootScope.titleDetail = ''; $rootScope.title = $route.current.title; diff --git a/public/src/js/controllers/header.js b/public/src/js/controllers/header.js old mode 100755 new mode 100644 diff --git a/public/src/js/controllers/index.js b/public/src/js/controllers/index.js old mode 100755 new mode 100644