holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed IDE warnings and svn propset svn:keywords Id

Browse Source
This commit is contained in:
Ralf Becker 2014-01-20 18:19:04 +00:00
parent a9416b2ce9
commit 37fa9facce
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etemplate/js/et2_widget_toolbar.js
View File

@ -80,6 +80,8 @@ var et2_toolbar = et2_DOMWidget.extend(
/** /**
* Go through actions and build buttons for the toolbar * Go through actions and build buttons for the toolbar
*
* @param {Object} actions egw-actions to build menu from
*/ */
_build_menu: function(actions) _build_menu: function(actions)
{ {
@ -187,13 +189,13 @@ var et2_toolbar = et2_DOMWidget.extend(
//revert:"invalid", //revert:"invalid",
containment: "document", containment: "document",
cursor: "move", cursor: "move",
helper: "clone", helper: "clone"
}); });
menulist.children().draggable({ menulist.children().draggable({
cancel:true, cancel:true,
containment:"document", containment:"document",
helper:"clone", helper:"clone",
cursor:"move", cursor:"move"
}); });
var that = this; var that = this;
toolbox.droppable({ toolbox.droppable({
@ -202,9 +204,8 @@ var et2_toolbar = et2_DOMWidget.extend(
that.set_prefered(ui.draggable.attr('id').replace(that.id+'-',''),"add"); that.set_prefered(ui.draggable.attr('id').replace(that.id+'-',''),"add");
ui.draggable.appendTo(menulist); ui.draggable.appendTo(menulist);
}, },
tolerance:"pointer", tolerance:"pointer"
});
});
jQuery('#'+this.id+'-'+'actionlist').droppable({ jQuery('#'+this.id+'-'+'actionlist').droppable({
tolerance:"pointer", tolerance:"pointer",
@ -243,6 +244,8 @@ var et2_toolbar = et2_DOMWidget.extend(
/** /**
* Make a button based on the given action * Make a button based on the given action
*
* @param {Object} action action object with attributes icon, caption, ...
*/ */
_make_button: function(action) _make_button: function(action)
{ {
@ -259,7 +262,7 @@ var et2_toolbar = et2_DOMWidget.extend(
} }
if(action.icon) if(action.icon)
{ {
button_options.icon = action.icon button_options.icon = action.icon;
} }
button.button(button_options); button.button(button_options);
@ -279,6 +282,7 @@ var et2_toolbar = et2_DOMWidget.extend(
/** /**
* Link the actions to the DOM nodes / widget bits. * Link the actions to the DOM nodes / widget bits.
* *
* @param {Object} actions egw-actions to build menu from
*/ */
_link_actions: function(actions) _link_actions: function(actions)
{ {
@ -295,4 +299,3 @@ var et2_toolbar = et2_DOMWidget.extend(
} }
}); });
et2_register_widget(et2_toolbar, ["toolbar"]); et2_register_widget(et2_toolbar, ["toolbar"]);