- fixed broken buttons in "xEditable" form fields (e.g. map description, signature table)

This commit is contained in:
Mark Friedrich
2018-06-30 14:43:12 +02:00
parent 3a0891b70e
commit 5e9c57758b
4 changed files with 40 additions and 4 deletions

View File

@@ -35,6 +35,9 @@ define([
// set default select2 config
Util.initDefaultSelect2Config();
// set default xEditable config
Util.initDefaultEditableConfig();
// load page
// load info (maintenance) info panel (if scheduled)
$('body').loadPageStructure().setGlobalShortcuts();

View File

@@ -963,7 +963,7 @@ define([
};
/**
* set default configuration for "Bootbox"
* set default configuration for "Bootbox"
*/
let initDefaultBootboxConfig = () => {
bootbox.setDefaults({
@@ -972,7 +972,7 @@ define([
};
/**
* set default configuration for "Select2"
* set default configuration for "Select2"
*/
let initDefaultSelect2Config = () => {
$.fn.select2.defaults.set('theme', 'pathfinder');
@@ -1044,6 +1044,20 @@ define([
});
};
/**
* set default configuration for "xEditable"
*/
let initDefaultEditableConfig = () => {
// use fontAwesome buttons
$.fn.editableform.buttons =
'<button type="submit" class="btn btn-primary btn-sm editable-submit">'+
'<i class="fa fa-fw fa-check"></i>'+
'</button>'+
'<button type="button" class="btn btn-default btn-sm editable-cancel">'+
'<i class="fa fa-fw fa-times"></i>'+
'</button>';
};
/**
* get the current main trigger delay for the main trigger functions
* optional in/decrease the delay
@@ -2577,6 +2591,7 @@ define([
initPrototypes: initPrototypes,
initDefaultBootboxConfig: initDefaultBootboxConfig,
initDefaultSelect2Config: initDefaultSelect2Config,
initDefaultEditableConfig: initDefaultEditableConfig,
getCurrentTriggerDelay: getCurrentTriggerDelay,
getServerTime: getServerTime,
convertTimestampToServerTime: convertTimestampToServerTime,

View File

@@ -35,6 +35,9 @@ define([
// set default select2 config
Util.initDefaultSelect2Config();
// set default xEditable config
Util.initDefaultEditableConfig();
// load page
// load info (maintenance) info panel (if scheduled)
$('body').loadPageStructure().setGlobalShortcuts();

View File

@@ -963,7 +963,7 @@ define([
};
/**
* set default configuration for "Bootbox"
* set default configuration for "Bootbox"
*/
let initDefaultBootboxConfig = () => {
bootbox.setDefaults({
@@ -972,7 +972,7 @@ define([
};
/**
* set default configuration for "Select2"
* set default configuration for "Select2"
*/
let initDefaultSelect2Config = () => {
$.fn.select2.defaults.set('theme', 'pathfinder');
@@ -1044,6 +1044,20 @@ define([
});
};
/**
* set default configuration for "xEditable"
*/
let initDefaultEditableConfig = () => {
// use fontAwesome buttons
$.fn.editableform.buttons =
'<button type="submit" class="btn btn-primary btn-sm editable-submit">'+
'<i class="fa fa-fw fa-check"></i>'+
'</button>'+
'<button type="button" class="btn btn-default btn-sm editable-cancel">'+
'<i class="fa fa-fw fa-times"></i>'+
'</button>';
};
/**
* get the current main trigger delay for the main trigger functions
* optional in/decrease the delay
@@ -2577,6 +2591,7 @@ define([
initPrototypes: initPrototypes,
initDefaultBootboxConfig: initDefaultBootboxConfig,
initDefaultSelect2Config: initDefaultSelect2Config,
initDefaultEditableConfig: initDefaultEditableConfig,
getCurrentTriggerDelay: getCurrentTriggerDelay,
getServerTime: getServerTime,
convertTimestampToServerTime: convertTimestampToServerTime,