From c68e19b301824d3a8afa97c690e75c8578c76818 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Tue, 4 Dec 2012 16:51:54 +0100
Subject: Don't create menu/action when not necessary

---
 src/webtab/webview.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/webtab')

diff --git a/src/webtab/webview.cpp b/src/webtab/webview.cpp
index 862355e9..b48c57fe 100644
--- a/src/webtab/webview.cpp
+++ b/src/webtab/webview.cpp
@@ -268,10 +268,16 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
 {
     m_contextMenuHitResult = page()->mainFrame()->hitTestContent(event->pos());
 
+    if (m_contextMenuHitResult.isContentEditable())
+    {
+        // Check to see if handled by speller
+        if (popupSpellMenu(event))
+            return;
+    }
+    
     WebWindow *webwin = m_parentTab->webWindow();
 
     KMenu menu(this);
-    QAction *a;
 
     KAction *sendByMailAction = new KAction(this);
     sendByMailAction->setIcon(KIcon("mail-send"));
@@ -296,14 +302,12 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
     // is content editable? Add PASTE
     if (m_contextMenuHitResult.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