From a37167b95a9acada33b57fdc9ad6291422521bc8 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 22 Sep 2010 13:59:02 -0400
Subject: [PATCH] Fix pasting.

--HG--
extra : rebase_source : 338ca94353f9f407ab9cf2f5c892008adfce46fa
---
 common/content/dactyl.js | 4 +++-
 common/content/editor.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 8d238292..d79ec818 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -170,7 +170,9 @@ const Dactyl = Module("dactyl", {
                 str = data.data.substring(0, dataLen.value / 2);
             }
         }
-        catch (e) {}
+        catch (e) {
+            dactyl.reportError(e, true);
+        }
 
         return str;
     },
diff --git a/common/content/editor.js b/common/content/editor.js
index 304e2ac1..03091813 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -72,7 +72,7 @@ const Editor = Module("editor", {
             let rangeStart = elem.selectionStart; // caret position
             let rangeEnd = elem.selectionEnd;
             let tempStr1 = elem.value.substring(0, rangeStart);
-            let tempStr2 = dactyl.clipboardRead();
+            let tempStr2 = dactyl.clipboardRead() || "";
             let tempStr3 = elem.value.substring(rangeEnd);
             elem.value = tempStr1 + tempStr2 + tempStr3;
             elem.selectionStart = rangeStart + tempStr2.length;