From 2e6b9b7fcee3c59f9ff04d7bb95f4f22bab31474 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 31 Aug 2015 19:58:42 +0200 Subject: [PATCH] Scripts: Use document.createEvent instead of new Event --- src/lib/lib.pro | 12 ++++++------ src/lib/tools/scripts.cpp | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lib/lib.pro b/src/lib/lib.pro index d6d924671..b6c65ca3b 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -58,6 +58,7 @@ SOURCES += \ adblock/adblockdialog.cpp \ adblock/adblockicon.cpp \ adblock/adblockmanager.cpp \ + adblock/adblockmatcher.cpp \ adblock/adblockrule.cpp \ adblock/adblocksearchtree.cpp \ adblock/adblocksubscription.cpp \ @@ -222,11 +223,13 @@ SOURCES += \ tools/progressbar.cpp \ tools/qzregexp.cpp \ tools/qztools.cpp \ + tools/scripts.cpp \ tools/sqldatabase.cpp \ tools/toolbutton.cpp \ tools/treewidget.cpp \ tools/widget.cpp \ webengine/javascript/externaljsobject.cpp \ + webengine/javascript/autofilljsobject.cpp \ webengine/loadrequest.cpp \ webengine/webinspector.cpp \ webengine/webpage.cpp \ @@ -235,9 +238,6 @@ SOURCES += \ webtab/searchtoolbar.cpp \ webtab/tabbedwebview.cpp \ webtab/webtab.cpp \ - adblock/adblockmatcher.cpp \ - tools/scripts.cpp \ - webengine/javascript/autofilljsobject.cpp HEADERS += \ 3rdparty/ecwin7.h \ @@ -254,6 +254,7 @@ HEADERS += \ adblock/adblockdialog.h \ adblock/adblockicon.h \ adblock/adblockmanager.h \ + adblock/adblockmatcher.h \ adblock/adblockrule.h \ adblock/adblocksearchtree.h \ adblock/adblocksubscription.h \ @@ -422,11 +423,13 @@ HEADERS += \ tools/progressbar.h \ tools/qzregexp.h \ tools/qztools.h \ + tools/scripts.h \ tools/sqldatabase.h \ tools/toolbutton.h \ tools/treewidget.h \ tools/widget.h \ webengine/javascript/externaljsobject.h \ + webengine/javascript/autofilljsobject.h \ webengine/loadrequest.h \ webengine/webinspector.h \ webengine/webpage.h \ @@ -435,9 +438,6 @@ HEADERS += \ webtab/searchtoolbar.h \ webtab/tabbedwebview.h \ webtab/webtab.h \ - adblock/adblockmatcher.h \ - tools/scripts.h \ - webengine/javascript/autofilljsobject.h FORMS += \ adblock/adblockaddsubscriptiondialog.ui \ diff --git a/src/lib/tools/scripts.cpp b/src/lib/tools/scripts.cpp index 092b292b6..097f6a631 100644 --- a/src/lib/tools/scripts.cpp +++ b/src/lib/tools/scripts.cpp @@ -28,7 +28,8 @@ QString Scripts::setupWebChannel() "function registerExternal(e) {" " window.external = e;" " if (window.external) {" - " var event = new Event('_qupzilla_external_created');" + " var event = document.createEvent('Event');" + " event.initEvent('_qupzilla_external_created', true, true);" " document.dispatchEvent(event);" " }" "}"