mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-31 09:21:18 +02:00
CLuaInstance: Add DECODE_HTML flag to ctext.new for decode html string
- Use function htmlEntityDecode()
This commit is contained in:
@@ -24,6 +24,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <global.h>
|
#include <global.h>
|
||||||
|
#include <system/helpers.h>
|
||||||
#include <system/settings.h>
|
#include <system/settings.h>
|
||||||
#include <gui/widget/msgbox.h>
|
#include <gui/widget/msgbox.h>
|
||||||
#include <gui/widget/messagebox.h>
|
#include <gui/widget/messagebox.h>
|
||||||
@@ -1552,6 +1553,7 @@ int CLuaInstance::ComponentsTextNew(lua_State *L)
|
|||||||
{ "ALIGN_TOP", CTextBox::TOP },
|
{ "ALIGN_TOP", CTextBox::TOP },
|
||||||
{ "ALIGN_BOTTOM", CTextBox::BOTTOM },
|
{ "ALIGN_BOTTOM", CTextBox::BOTTOM },
|
||||||
{ "ALIGN_NO_AUTO_LINEBREAK", CTextBox::NO_AUTO_LINEBREAK },
|
{ "ALIGN_NO_AUTO_LINEBREAK", CTextBox::NO_AUTO_LINEBREAK },
|
||||||
|
{ "DECODE_HTML", 0 },
|
||||||
{ NULL, 0 }
|
{ NULL, 0 }
|
||||||
};
|
};
|
||||||
mode = 0;
|
mode = 0;
|
||||||
@@ -1559,6 +1561,8 @@ int CLuaInstance::ComponentsTextNew(lua_State *L)
|
|||||||
if (tmpMode.find(txt_align[i].name) != std::string::npos)
|
if (tmpMode.find(txt_align[i].name) != std::string::npos)
|
||||||
mode |= txt_align[i].code;
|
mode |= txt_align[i].code;
|
||||||
}
|
}
|
||||||
|
if (tmpMode.find("DECODE_HTML") != std::string::npos)
|
||||||
|
htmlEntityDecode(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
CLuaComponentsText **udata = (CLuaComponentsText **) lua_newuserdata(L, sizeof(CLuaComponentsText *));
|
CLuaComponentsText **udata = (CLuaComponentsText **) lua_newuserdata(L, sizeof(CLuaComponentsText *));
|
||||||
|
Reference in New Issue
Block a user