better context menu and Perl script settings check

ddmitov · ddmitov · commit e17c60cd241b · 2018-11-28T12:31:25.000+02:00
diff --git a/src/webengine-page.h b/src/webengine-page.h
@@ -116,7 +116,7 @@ public slots:
             }
 
             if (settingsJsonObject["noLabel"].toString().length() > 0) {
-                noLabel =settingsJsonObject["noLabel"].toString();
+                noLabel = settingsJsonObject["noLabel"].toString();
             }
 
             if (settingsJsonObject["cutLabel"].toString().length() > 0) {
@@ -230,11 +230,12 @@ public slots:
                 QJsonDocument scriptJsonDocument =
                         QJsonDocument::fromJson(
                             scriptSettings.toString().toUtf8());
-                QJsonObject scriptJsonObject = scriptJsonDocument.object();
 
-                scriptJsonObject["id"] = scriptObjectName;
-
-                qScriptStartedCheck(scriptJsonObject);
+                if (!scriptJsonDocument.isEmpty()) {
+                    QJsonObject scriptJsonObject = scriptJsonDocument.object();
+                    scriptJsonObject["id"] = scriptObjectName;
+                    qScriptStartedCheck(scriptJsonObject);
+                }
             });
         }
     }
diff --git a/src/webengine-view.h b/src/webengine-view.h
@@ -78,17 +78,22 @@ public slots:
                     QWebEngineView::page()->contextMenuData();
             Q_ASSERT(contextMenuTest.isValid());
 
-            QMenu menu;
-
             if (!contextMenuTest.isContentEditable() and
                     contextMenuTest.selectedText().length() > 0) {
+                QMenu menu;
+
                 QAction *copyAct = menu
                         .addAction(qApp->property("copyLabel").toString());
                 QObject::connect(copyAct, SIGNAL(triggered()),
                                  this, SLOT(qCopyAction()));
+
+                menu.exec(mapToGlobal(event->pos()));
+                this->focusWidget();
             }
 
             if (contextMenuTest.isContentEditable()) {
+                QMenu menu;
+
                 QAction *cutAct = menu
                         .addAction(qApp->property("cutLabel").toString());
                 QObject::connect(cutAct, SIGNAL(triggered()),
@@ -108,10 +113,10 @@ public slots:
                         .addAction(qApp->property("selectAllLabel").toString());
                 QObject::connect(selectAllAct, SIGNAL(triggered()),
                                  this, SLOT(qSelectAllAction()));
-            }
 
-            menu.exec(mapToGlobal(event->pos()));
-            this->focusWidget();
+                menu.exec(mapToGlobal(event->pos()));
+                this->focusWidget();
+            }
         }
     }
 
diff --git a/src/webkit-page.h b/src/webkit-page.h
@@ -92,6 +92,10 @@ public slots:
         }
     }
 
+    // ==============================
+    // Page settings handling:
+    // ==============================
+
     void qGetPageSettings(QVariant settingsJsResult) {
         QJsonDocument settingsJsonDocument =
                 QJsonDocument::fromJson(settingsJsResult.toString().toUtf8());
@@ -121,7 +125,7 @@ public slots:
             }
 
             if (settingsJsonObject["noLabel"].toString().length() > 0) {
-                noLabel =settingsJsonObject["noLabel"].toString();
+                noLabel = settingsJsonObject["noLabel"].toString();
             }
 
             if (settingsJsonObject["cutLabel"].toString().length() > 0) {
@@ -227,17 +231,17 @@ public slots:
     {
         if (QPage::mainFrame()->url().scheme() == "file") {
             QVariant scriptSettings =
-                    mainFrame()->evaluateJavaScript("peb.getScriptSettings(" +
-                                                    scriptObjectName + ")");
+                    mainFrame()->evaluateJavaScript(
+                        "peb.getScriptSettings(" + scriptObjectName + ")");
 
             QJsonDocument scriptJsonDocument =
-                    QJsonDocument::fromJson(
-                        scriptSettings.toString().toUtf8());
-            QJsonObject scriptJsonObject = scriptJsonDocument.object();
-
-            scriptJsonObject["id"] = scriptObjectName;
+                    QJsonDocument::fromJson(scriptSettings.toString().toUtf8());
 
-            qScriptStartedCheck(scriptJsonObject);
+            if (!scriptJsonDocument.isEmpty()) {
+                QJsonObject scriptJsonObject = scriptJsonDocument.object();
+                scriptJsonObject["id"] = scriptObjectName;
+                qScriptStartedCheck(scriptJsonObject);
+            }
         }
     }
 
diff --git a/src/webkit-view.h b/src/webkit-view.h
@@ -77,17 +77,22 @@ public slots:
             QWebHitTestResult contextMenuTest =
                     mainPage->mainFrame()->hitTestContent(event->pos());
 
-            QMenu menu;
-
             if (!contextMenuTest.isContentEditable() and
                     contextMenuTest.isContentSelected()) {
+                QMenu menu;
+
                 QAction *copyAct =
                         menu.addAction(qApp->property("copyLabel").toString());
                 QObject::connect(copyAct, SIGNAL(triggered()),
                                  this, SLOT(qCopyAction()));
+
+                menu.exec(mapToGlobal(event->pos()));
+                this->focusWidget();
             }
 
             if (contextMenuTest.isContentEditable()) {
+                QMenu menu;
+
                 QAction *cutAct =
                         menu.addAction(qApp->property("cutLabel").toString());
                 QObject::connect(cutAct, SIGNAL(triggered()),
@@ -108,10 +113,10 @@ public slots:
                             qApp->property("selectAllLabel").toString());
                 QObject::connect(selectAllAct, SIGNAL(triggered()),
                                  this, SLOT(qSelectAllAction()));
-            }
 
-            menu.exec(mapToGlobal(event->pos()));
-            this->focusWidget();
+                menu.exec(mapToGlobal(event->pos()));
+                this->focusWidget();
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public slots:`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`if (settingsJsonObject["noLabel"].toString().length() > 0) {`
`119`		`- noLabel =settingsJsonObject["noLabel"].toString();`
	`119`	`+ noLabel = settingsJsonObject["noLabel"].toString();`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`if (settingsJsonObject["cutLabel"].toString().length() > 0) {`
`@@ -230,11 +230,12 @@ public slots:`
`230`	`230`	`QJsonDocument scriptJsonDocument =`
`231`	`231`	`QJsonDocument::fromJson(`
`232`	`232`	`scriptSettings.toString().toUtf8());`
`233`		`- QJsonObject scriptJsonObject = scriptJsonDocument.object();`
`234`	`233`
`235`		`- scriptJsonObject["id"] = scriptObjectName;`
`236`		`-`
`237`		`- qScriptStartedCheck(scriptJsonObject);`
	`234`	`+ if (!scriptJsonDocument.isEmpty()) {`
	`235`	`+ QJsonObject scriptJsonObject = scriptJsonDocument.object();`
	`236`	`+ scriptJsonObject["id"] = scriptObjectName;`
	`237`	`+ qScriptStartedCheck(scriptJsonObject);`
	`238`	`+ }`
`238`	`239`	`});`
`239`	`240`	`}`
`240`	`241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,10 @@ public slots:`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
	`95`	`+ // ==============================`
	`96`	`+ // Page settings handling:`
	`97`	`+ // ==============================`
	`98`	`+`
`95`	`99`	`void qGetPageSettings(QVariant settingsJsResult) {`
`96`	`100`	`QJsonDocument settingsJsonDocument =`
`97`	`101`	`QJsonDocument::fromJson(settingsJsResult.toString().toUtf8());`
`@@ -121,7 +125,7 @@ public slots:`
`121`	`125`	`}`
`122`	`126`
`123`	`127`	`if (settingsJsonObject["noLabel"].toString().length() > 0) {`
`124`		`- noLabel =settingsJsonObject["noLabel"].toString();`
	`128`	`+ noLabel = settingsJsonObject["noLabel"].toString();`
`125`	`129`	`}`
`126`	`130`
`127`	`131`	`if (settingsJsonObject["cutLabel"].toString().length() > 0) {`
`@@ -227,17 +231,17 @@ public slots:`
`227`	`231`	`{`
`228`	`232`	`if (QPage::mainFrame()->url().scheme() == "file") {`
`229`	`233`	`QVariant scriptSettings =`
`230`		`- mainFrame()->evaluateJavaScript("peb.getScriptSettings(" +`
`231`		`- scriptObjectName + ")");`
	`234`	`+ mainFrame()->evaluateJavaScript(`
	`235`	`+ "peb.getScriptSettings(" + scriptObjectName + ")");`
`232`	`236`
`233`	`237`	`QJsonDocument scriptJsonDocument =`
`234`		`- QJsonDocument::fromJson(`
`235`		`- scriptSettings.toString().toUtf8());`
`236`		`- QJsonObject scriptJsonObject = scriptJsonDocument.object();`
`237`		`-`
`238`		`- scriptJsonObject["id"] = scriptObjectName;`
	`238`	`+ QJsonDocument::fromJson(scriptSettings.toString().toUtf8());`
`239`	`239`
`240`		`- qScriptStartedCheck(scriptJsonObject);`
	`240`	`+ if (!scriptJsonDocument.isEmpty()) {`
	`241`	`+ QJsonObject scriptJsonObject = scriptJsonDocument.object();`
	`242`	`+ scriptJsonObject["id"] = scriptObjectName;`
	`243`	`+ qScriptStartedCheck(scriptJsonObject);`
	`244`	`+ }`
`241`	`245`	`}`
`242`	`246`	`}`
`243`	`247`