AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upload files button stay disabled when there are other submit buttons on the same page

This commit is contained in:
Frederic Guillot 2017-02-18 15:53:48 -05:00
parent fb8c335200
commit 76f73eebea
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -24,6 +24,7 @@ Breaking changes:
Bug fixes:
* Upload files button stay disabled when there are other submit buttons on the same page
* Hiding subtasks from hidden tasks in dashboard
Version 1.0.39 (Feb 12, 2017)

4
assets/js/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

22
assets/js/components/submit-buttons.js
View File

@ -3,10 +3,11 @@ KB.component('submit-buttons', function (containerElement, options) {
var isDisabled = options.disabled || false;
var submitLabel = options.submitLabel;
var formActionElement = null;
var submitButtonElement = null;
function onSubmit() {
isLoading = true;
KB.find('#modal-submit-button').replace(buildButton());
replaceButton();
KB.trigger('modal.submit');
}
@ -16,19 +17,19 @@ KB.component('submit-buttons', function (containerElement, options) {
function onStop() {
isLoading = false;
KB.find('#modal-submit-button').replace(buildButton());
replaceButton();
}
function onDisable() {
isLoading = false;
isDisabled = true;
KB.find('#modal-submit-button').replace(buildButton());
replaceButton();
}
function onEnable() {
isLoading = false;
isDisabled = false;
KB.find('#modal-submit-button').replace(buildButton());
replaceButton();
}
function onHide() {
@ -37,12 +38,11 @@ KB.component('submit-buttons', function (containerElement, options) {
function onUpdateSubmitLabel(eventData) {
submitLabel = eventData.submitLabel;
KB.find('#modal-submit-button').replace(buildButton());
replaceButton();
}
function buildButton() {
var button = KB.dom('button')
.attr('id', 'modal-submit-button')
.attr('type', 'submit')
.attr('class', 'btn btn-' + (options.color || 'blue'));
@ -71,6 +71,12 @@ KB.component('submit-buttons', function (containerElement, options) {
.build();
}
function replaceButton() {
var buttonElement = buildButton();
KB.dom(submitButtonElement).replace(buttonElement);
submitButtonElement = buttonElement;
}
this.render = function () {
KB.on('modal.stop', onStop);
KB.on('modal.disable', onDisable);
@ -86,9 +92,11 @@ KB.component('submit-buttons', function (containerElement, options) {
KB.removeListener('modal.submit.label', onUpdateSubmitLabel);
});
submitButtonElement = buildButton();
var formActionElementBuilder = KB.dom('div')
.attr('class', 'form-actions')
.add(buildButton());
.add(submitButtonElement);
if (KB.modal.isOpen()) {
formActionElementBuilder