Additional Bootstrap 4 fixes:

- Calendar control
- Query Tool's Sort/Filter drop down
- Backform hidden controls
- Debugger toolbar
This commit is contained in:
Aditya Toshniwal
2018-10-11 13:23:59 +01:00
committed by Dave Page
parent 3f16a0c52c
commit 6991c06937
14 changed files with 89 additions and 41 deletions

View File

@@ -28,6 +28,7 @@ define([
setGroupClassName: 'set-group pg-el-xs-12',
tabClassName: 'backform-tab pg-el-xs-12',
setGroupContentClassName: 'fieldset-content pg-el-xs-12',
hiddenClassName: 'd-none',
});
Backform.controlMapper = {
@@ -2340,13 +2341,19 @@ define([
label: '',
options: {
format: 'YYYY-MM-DD HH:mm:ss Z',
showClear: true,
showTodayButton: true,
icons: {
clear: 'fa fa-trash',
},
buttons: {
showClear: true,
showToday: true,
},
toolbarPlacement: 'top',
widgetPositioning: {
horizontal: 'auto',
vertical: 'bottom',
},
keepOpen: false,
},
placeholder: 'YYYY-MM-DD HH:mm:ss Z',
extraClasses: [],
@@ -2362,16 +2369,16 @@ define([
},
openPicker: function() {
if (this.has_datepicker) {
this.$el.find('input').datetimepicker('show');
this.$el.find('input').datetimepicker('toggle');
}
},
template: _.template([
'<label class="<%=Backform.controlLabelClassName%>"><%=label%></label>',
'<div class="input-group <%=Backform.controlsClassName%>">',
' <input type="text" class="<%=Backform.controlClassName%> <%=extraClasses.join(\' \')%>" name="<%=name%>" value="<%-value%>" placeholder="<%-placeholder%>" <%=disabled ? "disabled" : ""%> <%=required ? "required" : ""%> />',
' <span class="input-group-addon">',
' <span class="fa fa-calendar"></span>',
' </span>',
' <input type="text" class="<%=Backform.controlClassName%> datetimepicker-input <%=extraClasses.join(\' \')%>" name="<%=name%>" value="<%-value%>" placeholder="<%-placeholder%>" <%=disabled ? "disabled" : ""%> <%=required ? "required" : ""%> data-toggle="datetimepicker"/>',
' <div class="input-group-append">',
' <span class="input-group-text fa fa-calendar"></span>',
' </div>',
'</div>',
'<% if (helpMessage && helpMessage.length) { %>',
' <div class="<%=Backform.controlsClassName%>">',
@@ -2464,7 +2471,6 @@ define([
);
}
this.updateInvalid();
return this;
},
clearInvalid: function() {

View File

@@ -1348,9 +1348,15 @@ define([
},
options = _.extend({
format: 'YYYY-MM-DD HH:mm:ss Z',
showClear: true,
showTodayButton: true,
icons: {
clear: 'fa fa-trash',
},
buttons: {
showClear: true,
showToday: true,
},
toolbarPlacement: 'top',
keepOpen: false,
}, evalF(this.column.get('options')), {
keyBinds: {
'shift tab': function(widget) {