From 8c3ffa99014b041a0bf2b9bedba203042763eef1 Mon Sep 17 00:00:00 2001
From: Lindsay Mathieson <lindsay.mathieson@gmail.com>
Date: Wed, 23 Jan 2013 20:01:45 +1000
Subject: Fixes javascript error for word replacement from the spellcheck popup
 menu. Restores Auto Spellcheck option in advanced settings

---
 src/settings/settings_advanced.ui | 13 +++++++++++--
 src/webtab/webview.cpp            |  5 +++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/settings/settings_advanced.ui b/src/settings/settings_advanced.ui
index 9457ca22..201aa672 100644
--- a/src/settings/settings_advanced.ui
+++ b/src/settings/settings_advanced.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>480</width>
+    <width>515</width>
     <height>440</height>
    </rect>
   </property>
@@ -43,7 +43,9 @@
          <string>Change them!</string>
         </property>
         <property name="icon">
-         <iconset theme="preferences-system-network"/>
+         <iconset theme="preferences-system-network">
+          <normaloff/>
+         </iconset>
         </property>
        </widget>
       </item>
@@ -97,6 +99,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="kcfg_automaticSpellChecking">
+        <property name="text">
+         <string>Enable automatic spell checking</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
diff --git a/src/webtab/webview.cpp b/src/webtab/webview.cpp
index 5913d11e..1df13dcd 100644
--- a/src/webtab/webview.cpp
+++ b/src/webtab/webview.cpp
@@ -249,11 +249,12 @@ bool WebView::popupSpellMenu(QContextMenuEvent *event)
                 // replace word
                 QString script(QL1S("this.value=this.value.substring(0,"));
                 script += QString::number(s1);
-                script += QL1S(") + \"");
+                script += QL1S(") + \'");
                 script +=  w;
-                script += QL1C('\\') + QL1S("this.value.substring(");
+                script += QL1C('\'') + QL1S("+this.value.substring(");
                 script += QString::number(s2);
                 script += QL1C(')');
+                
                 element.evaluateJavaScript(script);
                 // reposition cursor
                 element.evaluateJavaScript("this.selectionEnd=this.selectionStart=" + QString::number(selStart) + QL1C(';'));
-- 
cgit v1.2.1