Skip to content
This repository has been archived by the owner on Mar 20, 2024. It is now read-only.

Compatibility with Angular-Translate #12

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Compatibility with Angular-Translate #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c26b0e
Compatibility with Angular-Translate
wesleymilan Jul 1, 2015
20901e5
Compatibility with Angular-Translate
wesleymilan Jul 1, 2015
2c14271
remove console.log
wesleymilan Jul 1, 2015
b423451
ngDisabled
wesleymilan Apr 23, 2016
289534d
Update angular-busy.js
wesleymilan Apr 23, 2016
d9c85b7
Update angular-busy.js
wesleymilan Apr 23, 2016
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
11 changes: 9 additions & 2 deletions build/angular-busy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,21 @@
});

scope.$on('busy.end', function(evt, config) {
if (scope.busy && scope.isBusyFor(config)) {
if (scope.busy && scope.isBusyFor(config) && element.attr('ngDisabled')) {
if (scope.originalContent) element.html(scope.originalContent);
element.attr('disabled', scope.notBusyDisabled===true);

element.removeClass(scope.notBusyRemoveClasses).addClass(scope.notBusyAddClasses);

scope.busy = false;
}
} else if(!element.attr('ngDisabled')) {
if (scope.originalContent) element.html(scope.originalContent);
//element.attr('disabled', scope.notBusyDisabled===true);

element.removeClass(scope.notBusyRemoveClasses).addClass(scope.notBusyAddClasses);

scope.busy = false;
}
});
}
}
Expand Down
18 changes: 15 additions & 3 deletions src/angular-busy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

/*** An AngularJS module for reacting to when your app is busy.
* @author Mike Grabski <[email protected]>
* @version v0.2.0
* @link https://github.com/HackedByChinese/ng-busy.git
* @license MIT
*/
(function (window, angular, undefined) {
'use strict';

Expand Down Expand Up @@ -119,14 +124,21 @@
});

scope.$on('busy.end', function(evt, config) {
if (scope.busy && scope.isBusyFor(config)) {
if (scope.busy && scope.isBusyFor(config) && element.attr('ngDisabled')) {
if (scope.originalContent) element.html(scope.originalContent);
element.attr('disabled', scope.notBusyDisabled===true);

element.removeClass(scope.notBusyRemoveClasses).addClass(scope.notBusyAddClasses);

scope.busy = false;
}
} else if(!element.attr('ngDisabled')) {
if (scope.originalContent) element.html(scope.originalContent);
//element.attr('disabled', scope.notBusyDisabled===true);

element.removeClass(scope.notBusyRemoveClasses).addClass(scope.notBusyAddClasses);

scope.busy = false;
}
});
}
}
Expand Down