mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 23:00:56 +01:00
Allow slide toggles for checkboxes in toolbar if they specify toggle_on or toggle_off
This commit is contained in:
parent
000376c69d
commit
863e64f0fd
@ -358,14 +358,14 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
|
||||
}
|
||||
|
||||
// ************** Drag and Drop feature for toolbar *****
|
||||
this.actionlist.find('span').sort( function (lg,g){
|
||||
this.actionlist.find('span[data-group]').sort( function (lg,g){
|
||||
return +lg.getAttribute('data-group') - +g.getAttribute('data-group');
|
||||
}).appendTo(this.actionlist);
|
||||
|
||||
this.actionlist.appendTo(this.div);
|
||||
this.actionbox.appendTo(this.div);
|
||||
|
||||
var toolbar = this.actionlist.find('span').children(),
|
||||
var toolbar = this.actionlist.find('span[data-group]').children(),
|
||||
toolbox = this.actionbox,
|
||||
menulist = jQuery(this.actionbox.children()[1]);
|
||||
|
||||
@ -475,16 +475,42 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
|
||||
.appendTo(this.preference[action.id]?this.actionbox.children()[1]:$j('[data-group='+action.group+']',this.actionlist));
|
||||
|
||||
if (action && action.checkbox)
|
||||
{
|
||||
if (action.data.toggle_on || action.data.toggle_off)
|
||||
{
|
||||
var toggle = et2_createWidget('checkbox', {
|
||||
id: this.id+'-'+action.id,
|
||||
toggle_on: action.data.toggle_on,
|
||||
toggle_off: action.data.toggle_off
|
||||
}, this);
|
||||
toggle.doLoadingFinished();
|
||||
toggle.set_value(action.checked);
|
||||
action.data.widget = toggle;
|
||||
toggle =toggle.toggle;
|
||||
toggle.appendTo(button.parent())
|
||||
.attr('id', this.id+'-'+action.id);
|
||||
button.remove();
|
||||
button = toggle;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
if (this.checkbox(action.id)) button.addClass('toolbar_toggled'+ (typeof action.toggledClass != 'undefined'?" "+action.toggledClass:''));
|
||||
}
|
||||
}
|
||||
if ( action.iconUrl)
|
||||
{
|
||||
button.attr('style','background-image:url(' + action.iconUrl + ')');
|
||||
}
|
||||
if (action.caption)
|
||||
{
|
||||
if ((this.countActions <= parseInt(this.options.view_range) ||
|
||||
// Set label for checkboxes inside the dropdown
|
||||
if(this.preference[action.id] &&
|
||||
action.data && action.data.widget && action.data.widget.instanceOf(et2_checkbox))
|
||||
{
|
||||
button.prepend(action.caption);
|
||||
}
|
||||
else if ((this.countActions <= parseInt(this.options.view_range) ||
|
||||
this.preference[action.id]) &&
|
||||
typeof button[0] !== 'undefined')
|
||||
{
|
||||
@ -545,11 +571,15 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
|
||||
var action_event = this._actionManager.getActionById(_action);
|
||||
|
||||
if (action_event && typeof _value !='undefined')
|
||||
{
|
||||
var btn = jQuery('#'+this.id+'-'+_action);
|
||||
if (btn.length > 0)
|
||||
{
|
||||
action_event.set_checked(_value);
|
||||
var btn = jQuery('#'+this.id+'-'+_action);
|
||||
if(action_event.data && action_event.data.widget)
|
||||
{
|
||||
action_event.data.widget.set_value(_value);
|
||||
}
|
||||
else if (btn.length > 0)
|
||||
{
|
||||
btn.toggleClass('toolbar_toggled'+ (typeof action_event.data.toggledClass != 'undefined'?" "+action_event.data.toggledClass:''));
|
||||
}
|
||||
}
|
||||
|
@ -1738,6 +1738,26 @@ span.et2_checkbox_slideSwitch > input {
|
||||
span.et2_checkbox_slideSwitch.switchOn > span.slideSwitch_container a {
|
||||
right:50%;
|
||||
}
|
||||
/* Slide switch in a toolbar */
|
||||
.et2_toolbar_actionlist span.et2_checkbox_slideSwitch {
|
||||
padding-right: 12px;
|
||||
padding-bottom: 2px;
|
||||
vertical-align: bottom;
|
||||
}
|
||||
.et2_toolbar_activeList span.et2_checkbox_slideSwitch {
|
||||
text-align: left;
|
||||
color: black;
|
||||
font-size: 11px;
|
||||
font-weight: normal;
|
||||
width: 100%;
|
||||
}
|
||||
.et2_toolbar_activeList span.et2_checkbox_slideSwitch > span.slideSwitch_container {
|
||||
width: 40px;
|
||||
float: left;
|
||||
}
|
||||
.et2_toolbar_activeList span.et2_checkbox_slideSwitch > input {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.et2_radiobox {
|
||||
margin-right: 5px;
|
||||
|
Loading…
Reference in New Issue
Block a user