Skip to content

Commit 60ee7f1

Browse files
bump version 0.4.3
1 parent f07a7dd commit 60ee7f1

File tree

7 files changed

+16
-12
lines changed

7 files changed

+16
-12
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Changelog
22
==========
33

4+
## 0.4.3
5+
- update z-index to work with other css frameworks ([#69](https://github.com/chieffancypants/angular-loading-bar/pull/69))
6+
- ignoreLoadingBar not ignored when calculating percentage complete ([#70](https://github.com/chieffancypants/angular-loading-bar/pull/70))
7+
48
## 0.4.2
59
- Split loading bar into different modules so they can be included separately ([#46](https://github.com/chieffancypants/angular-loading-bar/issues/46))
610

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-loading-bar",
3-
"version": "0.4.2",
3+
"version": "0.4.3",
44
"main": ["src/loading-bar.js", "src/loading-bar.css"],
55
"ignore": [
66
"**/.*",

build/loading-bar.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-loading-bar v0.4.2
2+
* angular-loading-bar v0.4.3
33
* https://chieffancypants.github.io/angular-loading-bar
44
* Copyright (c) 2014 Wes Cruver
55
* License: MIT
@@ -38,7 +38,7 @@
3838

3939
background: #29d;
4040
position: fixed;
41-
z-index: 2000;
41+
z-index: 10002;
4242
top: 0;
4343
left: 0;
4444
width: 100%;
@@ -67,7 +67,7 @@
6767
#loading-bar-spinner {
6868
display: block;
6969
position: fixed;
70-
z-index: 2000;
70+
z-index: 10002;
7171
top: 10px;
7272
left: 10px;
7373
}

build/loading-bar.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-loading-bar v0.4.2
2+
* angular-loading-bar v0.4.3
33
* https://chieffancypants.github.io/angular-loading-bar
44
* Copyright (c) 2014 Wes Cruver
55
* License: MIT
@@ -117,7 +117,7 @@ angular.module('cfp.loadingBarInterceptor', ['cfp.loadingBar'])
117117
},
118118

119119
'response': function(response) {
120-
if (!isCached(response.config)) {
120+
if (!response.config.ignoreLoadingBar && !isCached(response.config)) {
121121
reqsCompleted++;
122122
$rootScope.$broadcast('cfpLoadingBar:loaded', {url: response.config.url});
123123
if (reqsCompleted >= reqsTotal) {
@@ -130,7 +130,7 @@ angular.module('cfp.loadingBarInterceptor', ['cfp.loadingBar'])
130130
},
131131

132132
'responseError': function(rejection) {
133-
if (!isCached(rejection.config)) {
133+
if (!rejection.config.ignoreLoadingBar && !isCached(rejection.config)) {
134134
reqsCompleted++;
135135
$rootScope.$broadcast('cfpLoadingBar:loaded', {url: rejection.config.url});
136136
if (reqsCompleted >= reqsTotal) {

build/loading-bar.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/loading-bar.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-loading-bar",
3-
"version": "0.4.2",
3+
"version": "0.4.3",
44
"description": "An automatic loading bar for AngularJS",
55
"main": "src/loading-bar.js",
66
"directories": {

0 commit comments

Comments
 (0)