Merge remote-tracking branch 'origin/terminology-1.3'

This commit is contained in:
Boris Faure 2018-12-23 10:22:08 +01:00
commit ddef1ec515
1 changed files with 14 additions and 13 deletions

View File

@ -1156,19 +1156,6 @@ _cb_link_down(void *data,
ctxp = elm_ctxpopup_add(sd->win);
sd->ctxpopup = ctxp;
if (sd->config->helper.inline_please)
{
Media_Type type = media_src_type_get(sd->link.string);
if ((type == MEDIA_TYPE_IMG) ||
(type == MEDIA_TYPE_SCALE) ||
(type == MEDIA_TYPE_EDJE) ||
(type == MEDIA_TYPE_MOV))
elm_ctxpopup_item_append(ctxp, _("Preview"), NULL,
_cb_ctxp_link_preview, sd->self);
}
elm_ctxpopup_item_append(ctxp, _("Open"), NULL, _cb_ctxp_link_open,
sd->self);
if (hl)
{
raw_link = hl->url;
@ -1188,6 +1175,20 @@ _cb_link_down(void *data,
if (len > 0 && raw_link[0] == '/')
absolut = EINA_TRUE;
if (sd->config->helper.inline_please)
{
Media_Type type = media_src_type_get(raw_link);
if ((type == MEDIA_TYPE_IMG) ||
(type == MEDIA_TYPE_SCALE) ||
(type == MEDIA_TYPE_EDJE) ||
(type == MEDIA_TYPE_MOV))
elm_ctxpopup_item_append(ctxp, _("Preview"), NULL,
_cb_ctxp_link_preview, sd->self);
}
elm_ctxpopup_item_append(ctxp, _("Open"), NULL, _cb_ctxp_link_open,
sd->self);
if (!absolut &&
!link_is_url(raw_link) &&
!link_is_email(raw_link))