1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00

Merge pull request #2744 from lonalore/expandit

Fix for issue #2741
This commit is contained in:
Cameron 2017-07-26 10:47:08 -07:00 committed by GitHub
commit 0f86460248
2 changed files with 4 additions and 18 deletions

View File

@ -1026,7 +1026,7 @@ class e_form
if($localonly == true)
{
$text = "<input class='tbox' style='width:80%' id='{$idinput}' type='hidden' name='image' value='{$curVal}' />";
$text .= "<img src='".$img."' id='{$previnput}' class='img-rounded rounded e-expandit e-tip avatar' style='cursor:pointer; width:".$pref['im_width']."px; height:".$pref['im_height']."px' title='".LAN_EFORM_001."' alt='Click on the avatar to change it' />";
$text .= "<img src='".$img."' id='{$previnput}' class='img-rounded rounded e-expandit e-tip avatar' style='cursor:pointer; width:".$pref['im_width']."px; height:".$pref['im_height']."px' title='".LAN_EFORM_001."' alt='".LAN_EFORM_001."' />";
}
else
{

View File

@ -207,6 +207,8 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
{
$(context).find('.e-expandit').once('e-expandit').each(function ()
{
$(this).show();
// default 'toggle'.
$(this).click(function ()
{
@ -254,8 +256,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
if(href === "#" || href == "")
{
var idt = $(this).nextAll("div");
$(idt).slideToggle("slow");
$(this).nextAll("div").slideToggle("slow");
return true;
}
@ -330,21 +331,6 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
}
};
/**
* Behavior to show elements.
*
* @type {{attach: e107.behaviors.eExpandIt.attach}}
*/
e107.behaviors.eExpandIt = {
attach: function (context, settings)
{
$(context).find('.e-expandit').once('e-expand-it').each(function ()
{
$(this).show();
});
}
};
/**
* Check if the selector is valid.
*