Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validation errors in programmatically-set array items do not show up #641

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Validation errors in programmatically-set array items do not show up #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 37 additions & 11 deletions src/themes/bootstrap2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,29 @@ JSONEditor.defaults.themes.bootstrap2 = JSONEditor.AbstractTheme.extend({
input.style.marginBottom = 0;
}

// Run callbacks that depend on input.controlgroup
this._emptyControlgroupWaitQueue(input);

// TODO: use bootstrap slider
},
// Call callback when input.controlgroup is ready
_waitForControlgroup: function(input, callback) {
// The wait queue is an array with callbacks that are waiting for
// controlgroup
input._controlGroupWaitQueue = input._controlGroupWaitQueue || [];
input._controlGroupWaitQueue.push(callback);

// controlgroup may already be ready -- try to empty the queue right away
this._emptyControlgroupWaitQueue(input);
},
// If controlgroup is ready, call all callbacks waiting on it
_emptyControlgroupWaitQueue: function(input) {
if (input.controlgroup) {
$each(input._controlGroupWaitQueue, function(i, callback) {
callback(input.controlgroup);
});
}
},
getIndentedPanel: function() {
var el = document.createElement('div');
el.className = 'well well-small';
Expand Down Expand Up @@ -107,18 +128,23 @@ JSONEditor.defaults.themes.bootstrap2 = JSONEditor.AbstractTheme.extend({
return el;
},
addInputError: function(input,text) {
if(!input.controlgroup || !input.controls) return;
input.controlgroup.className += ' error';
if(!input.errmsg) {
input.errmsg = document.createElement('p');
input.errmsg.className = 'help-block errormsg';
input.controls.appendChild(input.errmsg);
}
else {
input.errmsg.style.display = '';
}
// Input errors may be ready before controlgroup is set. We need to wait
// for input.controlgroup. The caveat is that the UI won't be updated until
// after the next invocation of requestAnimationFrame callback
this._waitForControlgroup(input, function (controlgroup) {
if(!controlgroup || !input.controls) return;
controlgroup.className += ' error';
if(!input.errmsg) {
input.errmsg = document.createElement('p');
input.errmsg.className = 'help-block errormsg';
input.controls.appendChild(input.errmsg);
}
else {
input.errmsg.style.display = '';
}

input.errmsg.textContent = text;
input.errmsg.textContent = text;
});
},
removeInputError: function(input) {
if(!input.errmsg) return;
Expand Down
48 changes: 36 additions & 12 deletions src/themes/bootstrap3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,30 @@ JSONEditor.defaults.themes.bootstrap3 = JSONEditor.AbstractTheme.extend({
input.controlgroup.style.marginBottom = 0;
}

// Run callbacks that depend on input.controlgroup
this._emptyControlgroupWaitQueue(input);

// TODO: use bootstrap slider
},
// Call callback when input.controlgroup is ready
_waitForControlgroup: function(input, callback) {
// The wait queue is an array with callbacks that are waiting for
// controlgroup
input._controlGroupWaitQueue = input._controlGroupWaitQueue || [];
input._controlGroupWaitQueue.push(callback);

// controlgroup may already be ready -- try to empty the queue right away
this._emptyControlgroupWaitQueue(input);
},
// If controlgroup is ready, call all callbacks waiting on it
_emptyControlgroupWaitQueue: function(input) {
if (input.controlgroup && input._controlGroupWaitQueue) {
while (input._controlGroupWaitQueue.length > 0) {
var callback = input._controlGroupWaitQueue.shift();
callback(input.controlgroup);
}
}
},
getTextareaInput: function() {
var el = document.createElement('textarea');
el.className = 'form-control';
Expand Down Expand Up @@ -92,20 +114,22 @@ JSONEditor.defaults.themes.bootstrap3 = JSONEditor.AbstractTheme.extend({
el.style.maxWidth = 'none';
return el;
},

addInputError: function(input,text) {
if(!input.controlgroup) return;
input.controlgroup.className += ' has-error';
if(!input.errmsg) {
input.errmsg = document.createElement('p');
input.errmsg.className = 'help-block errormsg';
input.controlgroup.appendChild(input.errmsg);
}
else {
input.errmsg.style.display = '';
}
// Input errors may be ready before controlgroup is set. We need to wait
// for input.controlgroup. The caveat is that the UI won't be updated until
// after the next invocation of requestAnimationFrame callback
this._waitForControlgroup(input, function (controlgroup) {
controlgroup.className += ' has-error';
if(!input.errmsg) {
input.errmsg = document.createElement('p');
input.errmsg.className = 'help-block errormsg';
controlgroup.appendChild(input.errmsg);
} else {
input.errmsg.style.display = '';
}

input.errmsg.textContent = text;
input.errmsg.textContent = text;
});
},
removeInputError: function(input) {
if(!input.errmsg) return;
Expand Down