Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 17:52:10 +02:00
Code Releases Activity

GreaseMonkey: Allow userscripts with empty body (just metadata header)

Browse Source
This commit is contained in:
David Rosca 2015-05-28 10:06:41 +02:00
parent 26f0912845
commit 146fdc953f
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/GreaseMonkey/gm_script.cpp
View File

@ -185,14 +185,8 @@ void GM_Script::watchedFileChanged(const QString &file)
void GM_Script::parseScript()
{
QFile file(m_fileName);
if (!file.open(QFile::ReadOnly)) {
qWarning() << "GreaseMonkey: Cannot open file for reading" << m_fileName;
return;
}
m_name.clear();
m_namespace = "GreaseMonkeyNS";
m_namespace = QSL("GreaseMonkeyNS");
m_description.clear();
m_version.clear();
m_include.clear();
@ -206,13 +200,19 @@ void GM_Script::parseScript()
m_enabled = true;
m_valid = false;
QFile file(m_fileName);
if (!file.open(QFile::ReadOnly)) {
qWarning() << "GreaseMonkey: Cannot open file for reading" << m_fileName;
return;
}
if (!m_fileWatcher->files().contains(m_fileName)) {
m_fileWatcher->addPath(m_fileName);
}
QString fileData = QString::fromUtf8(file.readAll());
QzRegExp rx("// ==UserScript==(.*)// ==/UserScript==");
QzRegExp rx(QSL("// ==UserScript==(.*)// ==/UserScript=="));
rx.indexIn(fileData);
QString metadataBlock = rx.cap(1).trimmed();
@ -291,10 +291,10 @@ void GM_Script::parseScript()
m_metadata = fileData.mid(0, index);
const QString script = fileData.mid(index).trimmed();
m_valid = !script.isEmpty();
const QString nspace = QCryptographicHash::hash(fullName().toUtf8(), QCryptographicHash::Md4).toHex();
const QString gmValues = m_manager->valuesScript().arg(nspace);
m_script = QSL("(function(){%1\n%2\n%3\n})();").arg(gmValues, m_manager->requireScripts(requireList), script);
m_valid = true;
}

4
src/plugins/GreaseMonkey/settings/gm_settings.cpp
View File

@ -117,9 +117,7 @@ void GM_Settings::newScript()
"// @description Script description \n"
"// @include * \n"
"// @version 1 \n"
"// ==/UserScript==\n"
"\n"
"// Your script implementation\n");
"// ==/UserScript==\n\n");
const QString fileName = QSL("%1/%2.user.js").arg(m_manager->scriptsDirectory(), QzTools::filterCharsFromFilename(name));