Merge branch 'master' of https://github.com/Miodec/monkey-type

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,47 +6,47 @@ labels: bug
 assignees: ""
 ---
 
-<!-- **DID YOU MAKE SURE TO CLEAR CACHE BEFORE OPENING AN ISSUE?**
-Sometimes your browser has old files cached and the bug you are experiencing might be already fixed, or is just a side effect of a new update. If you don't know how to do that, this website should help: https://www.pcmag.com/how-to/how-to-clear-your-cache-on-any-browser -->
+<!-- 
+**DID YOU MAKE SURE TO CLEAR CACHE BEFORE OPENING AN ISSUE?**
+Sometimes your browser has old files cached and the bug you are experiencing might be already fixed, or is just a side effect of a new update. If you don't know how to do that, this website should help: https://www.pcmag.com/how-to/how-to-clear-your-cache-on-any-browser
 
-**Describe the bug**
+-->
 
-<!-- A clear and concise description of what the bug is. -->
+**Describe the bug** <!-- A clear and concise description of what the bug is. -->
+
+
+<!-- 
 
 **Did it happen in incognito mode?**
 
-<!-- Sometimes things work in incognito mode, which allows me to further track down the issue. -->
+Sometimes things work in incognito mode, which allows me to further track down the issue. 
 
-**To Reproduce**
+-->
 
-<!-- Steps to reproduce the behavior: -->
+**To Reproduce** <!-- Steps to reproduce the behavior: -->
 
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+**Expected behavior** <!-- A clear and concise description of what you expected to happen. -->
 
-<!-- A clear and concise description of what you expected to happen. -->
 
-**Screenshots**
+**Screenshots** <!-- If applicable, add screenshots to further help explain your problem. -->
 
-<!-- If applicable, add screenshots to further help explain your problem. -->
 
-**Desktop:** <!-- (if you encountered an issue while using Monkeytype on your computer please complete the following information) -->
+**Desktop:** <!-- if you encountered an issue while using Monkeytype on your computer please complete the following information, delete this section if not-->
 
 - OS: [] <!-- e.g. Windows 10, MacOS, Linux-->
 - Browser [] <!-- e.g. Chrome, Firefox, Safari, etc... -->
 - Version [] <!-- e.g. 22 -->
 
-**Smartphone:** <!-- (if you encountered an issue while using Monkeytype on your smartphone please complete the following information) -->
+**Smartphone:** <!-- if you encountered an issue while using Monkeytype on your smartphone please complete the following information, delete this section if not -->
 
 - Device: [] <!-- e.g. iPhone6, Google Pixel 4, etc... -->
 - OS: [] <!-- e.g. IOS 8.1, Android 11, etc...  -->
 - Browser [] <!-- e.g. stock browser, Safari, Chrome -->
 - Version [] <!-- e.g. 22 -->
 
-**Additional context**
-
-<!-- Add any other context about the problem here. -->
+**Additional context** <!-- Add any other context about the problem here. -->

code_r.json

@@ -0,0 +1,27 @@
+{
+  "name": "code_r",
+  "leftToRight": true,
+  "words": [
+    "if",
+    "for",
+    "FALSE",
+    "NA_integer_",
+    "return",
+    "else",
+    "in",
+    "NULL",
+    "NA_real_",
+    "repeat",
+    "next",
+    "Inf",
+    "NA_complex_",
+    "while",
+    "break",
+    "NaN",
+    "NA_character_",
+    "function",
+    "TRUE",
+    "NA",
+    "..."
+  ]
+}

src/js/popups/word-filter-popup.js

@@ -65,15 +65,15 @@ async function filter(language) {
   return filteredWords;
 }
 
-async function apply() {
+async function apply(set) {
   let language = $("#wordFilterPopup .languageInput").val();
   let filteredWords = await filter(language);
-  let customText = "";
-  filteredWords.forEach((word) => {
-    customText += word + " ";
-  });
+  let customText = filteredWords.join(" ");
+
+  $("#customTextPopup textarea").val(
+    (index, val) => (set ? "" : val + " ") + customText
+  );
   hide();
-  $("#customTextPopup textarea").val(customText);
 }
 
 $("#wordFilterPopupWrapper").mousedown((e) => {
@@ -90,8 +90,9 @@ $("#wordFilterPopupWrapper .button").mousedown((e) => {
   $("#wordFilterPopupWrapper .loadingIndicator").removeClass("hidden");
   $("#wordFilterPopupWrapper .button").addClass("hidden");
   setTimeout(() => {
-    apply();
-    $("#wordFilterPopupWrapper .loadingIndicator").addClass("hidden");
-    $("#wordFilterPopupWrapper .button").removeClass("hidden");
+    apply($(e.target).is("#set")).then(() => {
+      $("#wordFilterPopupWrapper .loadingIndicator").addClass("hidden");
+      $("#wordFilterPopupWrapper .button").removeClass("hidden");
+    });
   }, 1);
 });

static/index.html

@@ -202,10 +202,15 @@
           Use the above filters to include and exclude words or characters
           (separated by spaces)
         </div>
+        <div class="tip">
+          "Set" replaces the current custom word list with the filter result, "Add"
+          appends the filter result to the current custom word list
+        </div>
         <i
           class="fas fa-fw fa-spin fa-circle-notch hidden loadingIndicator"
         ></i>
-        <div class="button">ok</div>
+        <div class="button" id="set">set</div>
+        <div class="button">add</div>
       </div>
     </div>
     <div id="customWordAmountPopupWrapper" class="hidden">

static/languages/_groups.json

@@ -164,7 +164,8 @@
       "code_java",
       "code_go",
       "code_rust",
-      "code_ruby"
+      "code_ruby",
+      "code_r"
     ]
   },
   {

static/languages/_list.json

@@ -92,4 +92,5 @@
   ,"code_go"
   ,"code_rust"
   ,"code_ruby"
+  ,"code_r"
 ]

static/quotes/english.json

@@ -32377,24 +32377,12 @@
       "length": 89,
       "id": 5447
     },
-    {
-      "text": "It does not do well to dwell on dreams and forget to live.",
-      "source": "Harry Potter and the Sorcerer's Stone",
-      "length": 58,
-      "id": 5448
-    },
     {
       "text": "Have you ever had a dream, Neo, that you seemed so sure it was real? But if were unable to wake up from that dream, how would you tell the difference between the dream world & the real world?",
       "source": "The Matrix",
       "length": 191,
       "id": 5449
     },
-    {
-      "text": "If real is what you can feel, smell, taste and see, then 'real' is simply electrical signals interpreted by your brain.",
-      "source": "The Matrix",
-      "length": 119,
-      "id": 5450
-    },
     {
       "text": "If you ain’t scared... you ain’t human.",
       "source": "Alby, The Maze Runner",
@@ -32503,12 +32491,6 @@
       "length": 154,
       "id": 5469
     },
-    {
-      "text": "You get tough like me and you don't get hurt. You look out for yourself and nothin' can touch you...",
-      "source": "Dally, The Outsiders",
-      "length": 100,
-      "id": 5470
-    },
     {
       "text": "Things are rough all over.",
       "source": "Cherry, The Outsiders"
@@ -32531,12 +32513,6 @@
       "length": 54,
       "id": 5473
     },
-    {
-      "text": "Destroying things is much easier than making them.",
-      "source": "The Hunger Games",
-      "length": 50,
-      "id": 5474
-    },
     {
       "text": "You have only one life, make the most of it.",
       "source": "Holes",

static/quotes/turkish.json

@@ -73,12 +73,6 @@
       "length": 32,
       "id": 11
     },
-    {
-      "text": "Ağılda oğlak doğsa ovada otu biter.",
-      "source": "Atasözü",
-      "length": 35,
-      "id": 12
-    },
     {
       "text": "Aç aman bilmez, çocuk zaman bilmez.",
       "source": "Atasözü",
@@ -115,12 +109,6 @@
       "length": 45,
       "id": 18
     },
-    {
-      "text": "Ağustosta gölge kovan, zemheride karnın ovar.",
-      "source": "Atasözü",
-      "length": 45,
-      "id": 19
-    },
     {
       "text": "Gölgeyi hoş gören tekneyi boş görür.",
       "source": "Atasözü",