trimWord: simplify cleaning

[icedeb.git] / chrome / content / icedeb.js

diff --git a/chrome/content/icedeb.js b/chrome/content/icedeb.js
index 391d2538bae14345cd8bbeafcd5620ba14009c92..a8f2e9c095ce3ea569c2aa2f0d7525bcc36d7b84 100644 (file)
--- a/chrome/content/icedeb.js
+++ b/chrome/content/icedeb.js
@@ -15,14 +15,18 @@ IceDeb = {
                 : clip.kGlobalClipboard
         );
 
-        var str = new Object;
-        var strLength = new Object;
-        trans.getTransferData("text/unicode", str, strLength);
+        var s = new Object;
+        var p;
+        var len = new Object;
+        trans.getTransferData("text/unicode", s, len);
 
         var text = null;
+        var res;
 
-        if (str) str  = str.value.QueryInterface(Components.interfaces.nsISupportsString);
-        if (str) text = str.data.substring(0, strLength.value / 2);
+        if (s)
+            p = s.value.QueryInterface(Components.interfaces.nsISupportsString, res);
+        if (p)
+            text = p.data.substring(0, len.value / 2);
 
         return text;
     },
@@ -33,10 +37,8 @@ IceDeb = {
         do {
             oldword = word;
 
-            word = word.replace(/^\s+/, '');
-            word = word.replace(/\s+$/, '');
-            word = word.replace(/^#/, '');
-            word = word.replace(/[-:\/,.]$/, '');
+            word = word.replace(/^[^a-zA-Z0-9]+/, '');
+            word = word.replace(/[^a-zA-Z0-9]+$/, '');
         } while ( oldword != word );
 
         return word;