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

- Better support for filemanager weirdness

Browse Source 
- Fix position for new portlets was off
- Fix DnD for regular entries stopped working when DnD favorites was added
This commit is contained in:
Nathan Gray 2014-11-17 22:18:24 +00:00
parent 7afe1ee1e9
commit 4ecf649b83
3 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
home/inc/class.home_link_portlet.inc.php
View File

@ -92,6 +92,14 @@ class home_link_portlet extends home_portlet
$etemplate->read($this->template_name);
}
// Filemanager support - links need app = 'file' and type set
if($this->context && $this->context['entry'] && $this->context['entry']['app'] == 'filemanager')
{
$this->context['entry']['app'] = 'file';
$this->context['entry']['path'] = $this->context['entry']['title'] = $this->context['entry']['id'];
$this->context['entry']['type'] = egw_vfs::mime_content_type($this->context['entry']['id']);
}
$etemplate->set_dom_id($id);
$content = $this->context;
@ -99,7 +107,7 @@ class home_link_portlet extends home_portlet
{
$content['entry'] = null;
}
$etemplate->exec('home.home_link_portlet.exec',$content);
}

11
home/inc/class.home_list_portlet.inc.php
View File

@ -100,6 +100,17 @@ class home_list_portlet extends home_portlet
{
$content['list'] = Array();
}
// Filemanager support - links need app = 'file' and type set
foreach($content['list'] as &$list)
{
if($list['app'] == 'file') $list['app'] = 'filemanager';
if($list['app'] == 'filemanager')
{
$list['app'] = 'file';
$list['path'] = $list['title'] = $list['icon'] = $list['id'];
$list['type'] = egw_vfs::mime_content_type($list['id']);
}
}
$etemplate->exec('home.home_list_portlet.exec',$content);
}

21
home/js/app.js
View File

@ -103,7 +103,7 @@ app.classes.home = AppJS.extend(
this._do_ordering();
// Accept drops of favorites, which aren't part of action system
$j(this.et2.getDOMNode()).droppable({
$j(this.et2.getDOMNode().parentNode).droppable({
hoverClass: 'drop-hover',
accept: function(draggable) {
// Check for direct support for that application
@ -177,7 +177,7 @@ app.classes.home = AppJS.extend(
if(action.menu_context)
{
var $portlet_container = $j(this.portlet_container.getDOMNode());
attrs.row = Math.round((action.menu_context.posy - $portlet_container.offset().top )/ this.GRID)+1;
attrs.row = Math.max(1,Math.round((action.menu_context.posy - $portlet_container.offset().top )/ this.GRID)+1);
attrs.col = Math.max(1,Math.round((action.menu_context.posx - $portlet_container.offset().left) / this.GRID)+1);
}
@ -217,8 +217,8 @@ app.classes.home = AppJS.extend(
// Try to find where the drop was
if(action != null && action.ui && action.ui.position)
{
attrs.row = Math.round((action.ui.offset.top - $portlet_container.offset().top )/ this.GRID);
attrs.col = Math.max(0,Math.round((action.ui.offset.left - $portlet_container.offset().left) / this.GRID)-1);
attrs.row = Math.max(1,Math.round((action.ui.position.top - $portlet_container.offset().top )/ this.GRID));
attrs.col = Math.max(1,Math.round((action.ui.position.left - $portlet_container.offset().left) / this.GRID));
}
var portlet = et2_createWidget('portlet',attrs, this.portlet_container);
@ -472,13 +472,24 @@ app.classes.home = AppJS.extend(
new_list.push({app: explode[0],id: explode[1], link_id: explode.join(':')});
changed = true;
}
widget.getWidgetById('list').set_value(new_list);
if(changed)
{
widget._process_edit(et2_dialog.OK_BUTTON,{
list: new_list || {}
});
}
// Filemanager support - links need app = 'file' and type set
for(var i = 0; i < new_list.length; i++)
{
if(new_list[i]['app'] == 'filemanager')
{
new_list[i]['app'] = 'file';
new_list[i]['path'] = new_list[i]['title'] = new_list[i]['icon'] = new_list[i]['id'];
}
}
widget.getWidgetById('list').set_value(new_list);
}
},