diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-04-01 13:55:00 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-04-01 13:55:00 -0400 |
| commit | ce3979c721ba378a448bfbe3671c99d993cbc801 (patch) | |
| tree | e200d5225bcecef5f974b946a58277fddd24e89c /editor | |
| parent | f6c16cff36048c583ca0e1d019b622336ca861a0 (diff) | |
| parent | ff2f287f82630ab3887d7d5c1e64e5b888ea0beb (diff) | |
| download | UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.tar UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.tar.gz UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.tar.lz UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.tar.xz UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/libeditor/tests/test_htmleditor_keyevent_handling.html | 2 | ||||
| -rw-r--r-- | editor/reftests/xul/platform.js | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/editor/libeditor/tests/test_htmleditor_keyevent_handling.html b/editor/libeditor/tests/test_htmleditor_keyevent_handling.html index bfec290a5..414045ac0 100644 --- a/editor/libeditor/tests/test_htmleditor_keyevent_handling.html +++ b/editor/libeditor/tests/test_htmleditor_keyevent_handling.html @@ -27,7 +27,7 @@ var htmlEditor = document.getElementById("htmlEditor"); const kIsMac = navigator.platform.indexOf("Mac") == 0; const kIsWin = navigator.platform.indexOf("Win") == 0; -const kIsLinux = navigator.platform.indexOf("Linux") == 0 || navigator.platform.indexOf("SunOS") == 0 ; +const kIsLinux = navigator.platform.indexOf("Linux") == 0; function runTests() { diff --git a/editor/reftests/xul/platform.js b/editor/reftests/xul/platform.js index f45e6d1f5..a8633fb09 100644 --- a/editor/reftests/xul/platform.js +++ b/editor/reftests/xul/platform.js @@ -13,8 +13,6 @@ if (/Windows/.test(ua)) { } else if (/Linux/.test(ua)) id = "linux"; -else if (/SunOS/.test(ua)) - id = "linux"; else if (/Mac OS X/.test(ua)) id = "mac"; |