From 730ba60a9436c95113d168bf463589a241b2f174 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Mon, 3 Dec 2012 09:25:30 +0100
Subject: Don't create menu/action when not necessary

---
 src/webview.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/webview.cpp b/src/webview.cpp
index 36908017..48273fb5 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -253,8 +253,14 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
     m_ContextMenuResult = page()->mainFrame()->hitTestContent(event->pos());
     MainWindow *mainwindow = rApp->mainWindow();
 
+    if (m_ContextMenuResult.isContentEditable())
+    {
+        // Check to see if handled by speller
+        if (popupSpellMenu(event))
+            return;
+    }
+
     KMenu menu(this);
-    QAction *a;
 
     KAction *inspectAction = new KAction(KIcon("layer-visible-on"), i18n("Inspect Element"), this);
     connect(inspectAction, SIGNAL(triggered(bool)), this, SLOT(inspect()));
@@ -282,14 +288,11 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
     // is content editable? Add PASTE
     if (m_ContextMenuResult.isContentEditable())
     {
-        // Check to see if handled by speller
-        if (popupSpellMenu(event))
-            return;
-
         menu.addAction(pageAction(KWebPage::Paste));
         menu.addSeparator();
     }
 
+    QAction *a;
     // EMPTY PAGE ACTIONS -------------------------------------------------------------
     if (resultHit == WebView::EmptySelection)
     {
-- 
cgit v1.2.1