purge polyfill from firefox branch; fix 'lookup doesn't work on certain strings when certain json dictionaries are loaded' bug

background-script.js

@@ -109,7 +109,12 @@ async function refresh_json()
                 for(let spelling of entries[i]["s"])
                     add_json_spelling(dict, spelling, i);
             }
-        } catch(e){}
+        }
+        catch(e)
+        {
+            console.log("error while loading/reloading json dictionary:");
+            console.log(e);
+        }
         new_json_dicts.push(dict);
     }
     json_dicts = new_json_dicts;
@@ -459,10 +464,10 @@ function search(text)
             k_ele.push({keb: spelling});
         }
         let re_ret = undefined;
-        if(k_ele != [])
+        if(k_ele == undefined || k_ele.length == 0)
-            re_ret = [{k_ele: k_ele, r_ele: r_ele, seq: seq, sense: sense, from: text, found: k_ele[0]}];
-        else
             re_ret = [{r_ele: r_ele, seq: seq, sense: sense, from: text, found: r_ele[0]}];
+        else
+            re_ret = [{k_ele: k_ele, r_ele: r_ele, seq: seq, sense: sense, from: text, found: k_ele[0]}];
         return re_ret;
     }
 }
@@ -827,7 +832,12 @@ function deconjugate(mytext)
     {
         if(settings.deconjugator_rules_json != "")
             myrules = JSON.parse(settings.deconjugator_rules_json);
-    } catch(err) { console.log(err); }
+    }
+    catch(err)
+    {
+        console.log("error while parsing deconjugation rules:");
+        console.log(err);
+    }
     
     while(novel.size > 0)
     {
@@ -1731,23 +1741,41 @@ function lookup_indirect(text, time, divexisted, other_settings)
     {
         let results = [];
         let first = true;
+        console.log("collecting result for text `" + text + "`");
         while(text.length > 0)
         {
+            console.log("current text: `" + text + "`");
             let forms = deconjugate(text);
             let result = build_lookup_comb(forms);
             
             if(!first && other_settings.strict_alternatives && is_kana(text))
+            {
+                console.log("filter-testing kana result");
                 result = filter_kana_ish_results(result);
+            }
             
             if(result !== undefined && result.length > 0)
+            {
+                console.log("pushing result");
+                console.log(result);
+                try
                 {
                     result = sort_results(text, result);
+                }
+                catch(e)
+                {
+                    console.log("hit error sorting lookup results:");
+                    console.log(e);
+                    console.log(result);
+                }
                 results.push({text:text, result:result});
             }
             text = text.substring(0, text.length-1);
             if(results.length > 0)
                 first = false;
         }
+        console.log("results:");
+        console.log(results);
         if(results.length > 0)
             return skip_rereferenced_entries(results, other_settings);
     }
@@ -1794,7 +1822,7 @@ async function update_icon(enabled)
                 "32": "img/enabled32.png",
                 "512": "img/enabled512.png"
             }},);
-        } catch (err) {}
+        } catch (err) {} // don't care
     }
     else
     {
@@ -1806,7 +1834,7 @@ async function update_icon(enabled)
                 "32": "img/action32.png",
                 "512": "img/action512.png"
             }},);
-        } catch (err) {}
+        } catch (err) {} // don't care
     }
 }
 
@@ -1843,7 +1871,7 @@ function open_options(info, tab)
         browser.tabs.create({
             url:browser.extension.getURL("options.html")
         });
-    } catch(err) {}
+    } catch(err) {} // don't care
 }
 
 function open_reader(info, tab)
@@ -1856,7 +1884,7 @@ function open_reader(info, tab)
             width:settings.reader_width,
             height:settings.reader_height
         });
-    } catch(err) {}
+    } catch(err) {} // don't care
 }
 function open_mining(info, tab)
 {
@@ -1866,7 +1894,7 @@ function open_mining(info, tab)
             url:browser.extension.getURL("mining.html"),
             type:"popup"
         });
-    } catch(err) {}
+    } catch(err) {} // don't care
 }
 function open_livemining(info, tab)
 {
@@ -1876,7 +1904,7 @@ function open_livemining(info, tab)
             url:browser.extension.getURL("livemining.html"),
             type:"popup"
         });
-    } catch(err) {}
+    } catch(err) {} // don't care
 }
 function open_jsonconfig(info, tab)
 {
@@ -1886,7 +1914,7 @@ function open_jsonconfig(info, tab)
             url:browser.extension.getURL("json_config.html"),
             type:"popup"
         });
-    } catch(err) {}
+    } catch(err) {} // don't care
 }
 
 if(browser.contextMenus)
@@ -1967,14 +1995,21 @@ function send_error(tab, error)
     try
     {
         browser.tabs.sendMessage(tab, {type:"error",error:error});
-    } catch (err) {console.log("failed to send error to origin tab")}
+    }
+    catch (err)
+    {
+        console.log("failed to send error to origin tab");
+        console.log(err);
+    }
 }
 
 browser.runtime.onMessage.addListener((req, sender) =>
 {
     if (req.type == "search")
     {
+        console.log("opening lookup");
         let asdf = lookup_indirect(req.text, req.time, req.divexisted, req.settings);
+        console.log("completing lookup");
         return Promise.resolve({"response" : asdf});
     }
     if (req.type == "search_kanji")
@@ -2031,7 +2066,10 @@ browser.runtime.onMessage.addListener((req, sender) =>
                         newxhr.send('{"action": "sync","version": 6}');
                     }
                 }
-            } catch (e) {
+            }
+            catch (e)
+            {
+                console.log("error while interacting with ankiconnect:");
                 console.log(e);
             }
         });

background.html

@@ -4,7 +4,6 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 <body>
-<script src="include/browser-polyfill.min.js" charset="UTF-8"></script>
 <script src="background-script.js" charset="UTF-8"></script>
 <textarea id="nazeka-paste-target"></textarea>
 </body>

json_config.html

@@ -45,7 +45,6 @@ div.closed
     display: none;
 }
 </style>
-<script src="include/browser-polyfill.min.js" charset="UTF-8"></script>
 <script src="json_config.js" charset="UTF-8"></script>
 </head>
 

livemining.html

@@ -5,7 +5,6 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title>Nazeka: Configuration for Live Mining</title>
-<script src="include/browser-polyfill.min.js" charset="UTF-8"></script>
 <script type="text/javascript" src="livemining.js"></script>
 <style>
 body { max-width: 800px; margin-left: auto; margin-right: auto; padding-left: 8px; padding-right: 8px; }

mining.html

@@ -13,7 +13,6 @@ body
     font-size: 1em;
 }
 </style>
-<script src="include/browser-polyfill.min.js" charset="UTF-8"></script>
 <script src="mining.js" charset="UTF-8"></script>
 </head>
 

options.html

@@ -5,7 +5,6 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title>Nazeka: options</title>
-<script src="include/browser-polyfill.min.js" charset="UTF-8"></script>
 <script type="text/javascript" src="options.js"></script>
 <style>
 body

reader.html

@@ -73,7 +73,6 @@ body > p:nth-of-type(1)
     bottom: calc( 10px + 2em );
 }
 </style>
-<script src="include/browser-polyfill.min.js" charset="UTF-8"></script>
 <script src="reader.js" charset="UTF-8"></script>
 <script src="texthook.js" charset="UTF-8"></script>
 </head>

texthook.js

@@ -92,14 +92,14 @@ async function get_real_platform()
         my_platform = await browser.runtime.sendMessage({type:"platform"});
         if(my_platform)
             my_platform = my_platform["response"];
-    }catch(err){}
+    }catch(err){}// don't care
     while(my_platform == "")
     {
         try {
             my_platform = await browser.runtime.sendMessage({type:"platform"});
             if(my_platform)
                 my_platform = my_platform["response"];
-        }catch(err){}
+        }catch(err){}// don't care
     }
     platform = my_platform;
 }
@@ -170,7 +170,7 @@ function get_doc()
         }
         catch(err)
         {
-            console.log("hit error");
+            console.log("hit error trying to find root; nazeka might behave incoherently");
             console.log(err);
             break;
         }
@@ -1616,7 +1616,7 @@ function selection_rejects_node(selection_range, textNode, offset)
         if(!selection_range.isPointInRange(textNode, offset) || !selection_range.isPointInRange(textNode, offset+1))
             return true;
     }
-    catch(e){}
+    catch(e){} // selection range was strange
     return false;
 }
 
@@ -1678,6 +1678,7 @@ function get_element_text_with_offsets(element, selection_range)
     }
     catch(err)
     {
+        console.log("encountered error while trying to grab element text");
         console.log(err);
     }
     return ["", 0];
@@ -1727,7 +1728,7 @@ function grab_more_text(textNode, selection_range, direction = 1)
                 if(ruby_interior || !inline_like)
                     break;
             }
-            catch(err){}
+            catch(err){} // doesn't work with getComputedStyle or maybe tagName
         }
         if(iters > 100)
         {
@@ -1962,7 +1963,7 @@ function update(event)
                 let z_index = toreset[1];
                 element.style.zIndex = z_index;
             }
-            catch (err){}
+            catch (err){} // don't care just reset everything correctly
         }
     }
     
@@ -2085,7 +2086,7 @@ function update(event)
                 return;
             }
         }
-        catch(e){ }
+        catch(e){ } // window.getSelection() was null or null-like
     }
     
     // if there was text, use it