Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-ladda",
"version": "0.3.1",
"version": "0.3.2",
"homepage": "https://github.com/remotty/angular-ladda",
"authors": [
"Chungsub Kim <subicura@subicura.com>"
Expand Down
7 changes: 7 additions & 0 deletions dist/angular-ladda.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@
}
if(!ladda.isLoading()) {
ladda.start();
if( element.attr('data-keep-enabled') ) {
if (attrs.ngDisabled) {
element.attr('disabled', scope.$eval(attrs.ngDisabled));
} else {
element.removeAttr('disabled');
}
}
}
if(angular.isNumber(loading)) {
ladda.setProgress(loading);
Expand Down
2 changes: 1 addition & 1 deletion dist/angular-ladda.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions src/angular-ladda.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@
}
if(!ladda.isLoading()) {
ladda.start();
if( element.attr('data-keep-enabled') ) {
if (attrs.ngDisabled) {
element.attr('disabled', scope.$eval(attrs.ngDisabled));
} else {
element.removeAttr('disabled');
}
}
}
if(angular.isNumber(loading)) {
ladda.setProgress(loading);
Expand Down
1 change: 1 addition & 0 deletions test/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
<a class="btn btn-primary" ladda="true" ng-if="loader">ng-if true</a>
<button id="btn" ladda="isLoading" ng-click="isLoading = true" class="btn btn-primary">{{ buttonText }}</button>
<button ladda="true" class="btn btn-primary">ladda button</button>
<button ladda="true" data-keep-enabled="1" class="btn btn-primary">ladda button</button>
<a class="btn btn-primary" ng-click="openModal()">open modal</a>
</body>
</html>