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

Fix filemanager expose opens wrong image when the clicked image is from expanded sub foldres

Browse Source
This commit is contained in:
Hadi Nategh 2015-07-17 07:22:43 +00:00
parent fd05a7601b
commit 4a27ecf94e
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
etemplate/js/expose.js
View File

@ -405,7 +405,7 @@ function expose (widget)
var mediaContent = [];
var nm = find_nextmatch(this);
var current_index = 0;
if(nm)
if(nm && !this._is_target_indepth(nm,event.target))
{
// Get the row that was clicked, find its index in the list
var current_entry = nm.controller.getRowByNode(event.target);
@ -438,6 +438,31 @@ function expose (widget)
this.expose_options.index = current_index;
gallery = blueimp.Gallery(mediaContent, this.expose_options);
},
/**
* Check if clicked target from nm is in depth
*
* @param nm nextmatch widget
* @param target selected target dom node
*
* @return {boolean} returns false if target is not in depth otherwise True
*/
_is_target_indepth: function (nm, target){
var res = false;
if (nm)
{
if (!target)
{
var target = this.getDOMNode();
}
var entry = nm.controller.getRowByNode(target);
if (entry && entry.controller.getDepth()>0)
{
res = true;
}
}
return res;
},
expose_onopen: function (event){},
expose_onopened: function (event){
// Check to see if we're in a nextmatch, do magic
@ -558,7 +583,7 @@ function expose (widget)
expose_onclose: function(event){
// Check to see if we're in a nextmatch, remove magic
var nm = find_nextmatch(this);
if(nm)
if(nm && !this._is_target_indepth(nm))
{
// Remove scrolling from thumbnails
gallery.container.find('.indicator')