Also update the public view filter because that's important.

index.php

@@ -118,7 +118,7 @@ require_once(SITE_LOCATION . '/php/notificationconditiontree.php');
             <label style="display:block;margin-bottom:0;"><b>Filter Words</b></label>
             <div id="filterOptions" style="display:block"></div>
             <div style="display:block;">
-                <span style="display:inline;cursor:pointer;font-size:12px;font-weight:bold;" onclick="ToggleAllFilters(true)">Check All</span>&nbsp;/&nbsp;<span style="display:inline;cursor:pointer;font-size:12px;font-weight:bold;" onclick="ToggleAllFilters(false)">Uncheck All</span>
+                <span style="display:inline;cursor:pointer;font-size:12px;font-weight:bold;" onclick="ToggleAllFilters(true);ShowDictionary();">Check All</span>&nbsp;/&nbsp;<span style="display:inline;cursor:pointer;font-size:12px;font-weight:bold;" onclick="ToggleAllFilters(false);ShowDictionary();">Uncheck All</span>
             </div>
         </div>
         <div id="filterWordCount"></div>

js/min/publicView.js

@@ -1 +1 @@
-function IsValidPublicDicitonary(){return"string"!=typeof publicDictionary}function ShowPublicDictionary(){if(IsValidPublicDicitonary()){var e=document.getElementById("wordFilter").value,i=[],t=htmlEntitiesParseForSearchEntry(document.getElementById("searchBox").value),n=document.getElementById("searchOptionWord").checked,r=document.getElementById("searchOptionSimple").checked,c=document.getElementById("searchOptionLong").checked,o=!document.getElementById("searchCaseSensitive").checked,a=document.getElementById("searchIgnoreDiacritics").checked;if(""!=t&&(n||r||c)){var d=[],s=htmlEntitiesParseForSearch(JSON.stringify(publicDictionary));o&&(t=t.toLowerCase()),a&&(t=removeDiacritics(t),s=removeDiacritics(s)),n&&d.push("contains("+(o?"name":'translate(name, "", "")')+', "'+t+'")'),r&&d.push("contains("+(o?"simpleDefinition":'translate(simpleDefinition, "", "")')+', "'+t+'")'),c&&d.push("contains("+(o?"longDefinition":'translate(longDefinition, "", "")')+', "'+t+'")');var l=JSON.parse(s);i=JSON.search(l,"//words["+d.join(" or ")+"]/wordId")}var m=document.getElementById("dictionaryName");m.innerHTML=htmlEntitiesParse(publicDictionary.name)+" Dictionary";var p=document.getElementById("dictionaryBy");p.innerHTML="created by "+htmlEntitiesParse(publicDictionary.createdBy);var u=document.getElementById("incompleteNotice");publicDictionary.settings.isComplete||(u.innerHTML="<em>Note: This dictionary is not yet complete and is likely to change.</em>");var y=document.getElementById("dictionaryDescription");y.innerHTML=marked(htmlEntitiesParse(publicDictionary.description));var h=document.getElementById("theDictionary"),D="",g=0;if(publicDictionary.words.length>0)for(var w=0;w<publicDictionary.words.length;w++)(""==e||""!=e&&publicDictionary.words[w].partOfSpeech==e)&&(""==t||""!=t&&(n||r||c)&&i.indexOf(publicDictionary.words[w].wordId)>=0)&&(publicDictionary.words[w].hasOwnProperty("pronunciation")||(publicDictionary.words[w].pronunciation=""),publicDictionary.words[w].hasOwnProperty("wordId")||(publicDictionary.words[w].wordId=w+1),D+=PublicDictionaryEntry(w),g++);else D="There are no entries in the dictionary.";h.innerHTML=D,ShowFilterWordCount(g)}else document.getElementById("dictionaryContainer").innerHTML=publicDictionary}function PublicDictionaryEntry(e){var i="<entry><a name='"+publicDictionary.words[e].wordId+"'></a><a href='#"+publicDictionary.words[e].wordId+"' class='wordLink clickable'>&#x1f517;</a>",t=regexParseForSearch(document.getElementById("searchBox").value),n=document.getElementById("searchOptionWord").checked,r=document.getElementById("searchOptionSimple").checked,c=document.getElementById("searchOptionLong").checked,o=!document.getElementById("searchCaseSensitive").checked,a=document.getElementById("searchIgnoreDiacritics").checked,d=new RegExp("("+(a?removeDiacritics(t)+"|"+t:t)+")","g"+(o?"i":""));return i+="<word>",i+=""!=t&&n?htmlEntitiesParse(publicDictionary.words[e].name).replace(d,"<searchTerm>$1</searchterm>"):publicDictionary.words[e].name,i+="</word>",""!=publicDictionary.words[e].pronunciation&&(i+="<pronunciation>",i+=marked(htmlEntitiesParse(publicDictionary.words[e].pronunciation)).replace("<p>","").replace("</p>",""),i+="</pronunciation>"),""!=publicDictionary.words[e].partOfSpeech&&(i+="<partofspeech>",i+=publicDictionary.words[e].partOfSpeech,i+="</partofspeech>"),i+="<br>",""!=publicDictionary.words[e].simpleDefinition&&(i+="<simpledefinition>",i+=""!=t&&r?htmlEntitiesParse(publicDictionary.words[e].simpleDefinition).replace(d,"<searchTerm>$1</searchterm>"):publicDictionary.words[e].simpleDefinition,i+="</simpledefinition>"),""!=publicDictionary.words[e].longDefinition&&(i+="<longdefinition>",i+=""!=t&&c?marked(htmlEntitiesParse(publicDictionary.words[e].longDefinition).replace(d,"<searchTerm>$1</searchterm>")):marked(htmlEntitiesParse(publicDictionary.words[e].longDefinition)),i+="</longdefinition>"),i+="</entry>"}function SetPublicPartsOfSpeech(){for(var e=document.getElementById("wordFilter"),i=htmlEntitiesParse(publicDictionary.settings.partsOfSpeech).trim().split(","),t=0;t<i.length;t++){var n=document.createElement("option");n.appendChild(document.createTextNode(i[t].trim())),n.value=i[t].trim(),e.appendChild(n)}}
+function IsValidPublicDicitonary(){return"string"!=typeof publicDictionary}function ShowPublicDictionary(){if(IsValidPublicDicitonary()){var e=GetSelectedFilters(),i=[],t=htmlEntitiesParseForSearchEntry(document.getElementById("searchBox").value),n=document.getElementById("searchOptionWord").checked,r=document.getElementById("searchOptionSimple").checked,c=document.getElementById("searchOptionLong").checked,o=!document.getElementById("searchCaseSensitive").checked,a=document.getElementById("searchIgnoreDiacritics").checked;if(""!=t&&(n||r||c)){var l=[],s=htmlEntitiesParseForSearch(JSON.stringify(publicDictionary));o&&(t=t.toLowerCase()),a&&(t=removeDiacritics(t),s=removeDiacritics(s)),n&&l.push("contains("+(o?"name":'translate(name, "", "")')+', "'+t+'")'),r&&l.push("contains("+(o?"simpleDefinition":'translate(simpleDefinition, "", "")')+', "'+t+'")'),c&&l.push("contains("+(o?"longDefinition":'translate(longDefinition, "", "")')+', "'+t+'")');var d=JSON.parse(s);i=JSON.search(d,"//words["+l.join(" or ")+"]/wordId")}var p=document.getElementById("dictionaryName");p.innerHTML=htmlEntitiesParse(publicDictionary.name)+" Dictionary";var m=document.getElementById("dictionaryBy");m.innerHTML="created by "+htmlEntitiesParse(publicDictionary.createdBy);var u=document.getElementById("incompleteNotice");publicDictionary.settings.isComplete||(u.innerHTML="<em>Note: This dictionary is not yet complete and is likely to change.</em>");var y=document.getElementById("dictionaryDescription");y.innerHTML=marked(htmlEntitiesParse(publicDictionary.description));var h=document.getElementById("theDictionary"),D="",g=0;if(publicDictionary.words.length>0)for(var b=0;b<publicDictionary.words.length;b++)(0==e.length||e.length>0&&e.indexOf(publicDictionary.words[b].partOfSpeech)>-1)&&(""==t||""!=t&&(n||r||c)&&i.indexOf(publicDictionary.words[b].wordId)>=0)&&(publicDictionary.words[b].hasOwnProperty("pronunciation")||(publicDictionary.words[b].pronunciation=""),publicDictionary.words[b].hasOwnProperty("wordId")||(publicDictionary.words[b].wordId=b+1),D+=PublicDictionaryEntry(b),g++);else D="There are no entries in the dictionary.";h.innerHTML=D,ShowFilterWordCount(g)}else document.getElementById("dictionaryContainer").innerHTML=publicDictionary}function PublicDictionaryEntry(e){var i="<entry><a name='"+publicDictionary.words[e].wordId+"'></a><a href='#"+publicDictionary.words[e].wordId+"' class='wordLink clickable'>&#x1f517;</a>",t=regexParseForSearch(document.getElementById("searchBox").value),n=document.getElementById("searchOptionWord").checked,r=document.getElementById("searchOptionSimple").checked,c=document.getElementById("searchOptionLong").checked,o=!document.getElementById("searchCaseSensitive").checked,a=document.getElementById("searchIgnoreDiacritics").checked,l=new RegExp("("+(a?removeDiacritics(t)+"|"+t:t)+")","g"+(o?"i":""));return i+="<word>",i+=""!=t&&n?htmlEntitiesParse(publicDictionary.words[e].name).replace(l,"<searchTerm>$1</searchterm>"):publicDictionary.words[e].name,i+="</word>",""!=publicDictionary.words[e].pronunciation&&(i+="<pronunciation>",i+=marked(htmlEntitiesParse(publicDictionary.words[e].pronunciation)).replace("<p>","").replace("</p>",""),i+="</pronunciation>"),""!=publicDictionary.words[e].partOfSpeech&&(i+="<partofspeech>",i+=publicDictionary.words[e].partOfSpeech,i+="</partofspeech>"),i+="<br>",""!=publicDictionary.words[e].simpleDefinition&&(i+="<simpledefinition>",i+=""!=t&&r?htmlEntitiesParse(publicDictionary.words[e].simpleDefinition).replace(l,"<searchTerm>$1</searchterm>"):publicDictionary.words[e].simpleDefinition,i+="</simpledefinition>"),""!=publicDictionary.words[e].longDefinition&&(i+="<longdefinition>",i+=""!=t&&c?marked(htmlEntitiesParse(publicDictionary.words[e].longDefinition).replace(l,"<searchTerm>$1</searchterm>")):marked(htmlEntitiesParse(publicDictionary.words[e].longDefinition)),i+="</longdefinition>"),i+="</entry>"}function SetPublicPartsOfSpeech(){for(var e=document.getElementById("filterOptions"),i=htmlEntitiesParse(publicDictionary.settings.partsOfSpeech).trim().split(","),t=0;t<i.length;t++){var n=i[t].trim(),r=document.createElement("label");r.appendChild(document.createTextNode(n+" ")),r["part-of-speech"]=n,r.className="filterOption";var c=document.createElement("input");c.type="checkbox",c.onchange=function(){ShowPublicDictionary()},r.appendChild(c),e.appendChild(r)}}

js/publicView.js

@@ -4,7 +4,7 @@ function IsValidPublicDicitonary() {
 
 function ShowPublicDictionary() {
     if (IsValidPublicDicitonary()) {
-        var filter = document.getElementById("wordFilter").value;
+        var filters = GetSelectedFilters();
         
         var searchResults = [];
         var search = htmlEntitiesParseForSearchEntry(document.getElementById("searchBox").value);
@@ -57,7 +57,7 @@ function ShowPublicDictionary() {
 
         if (publicDictionary.words.length > 0) {
             for (var i = 0; i < publicDictionary.words.length; i++) {
-                if (filter == "" || (filter != "" && publicDictionary.words[i].partOfSpeech == filter)) {
+                if (filters.length == 0 || (filters.length > 0 && filters.indexOf(publicDictionary.words[i].partOfSpeech) > -1)) {
                     if (search == "" || (search != "" && (searchByWord || searchBySimple || searchByLong) && searchResults.indexOf(publicDictionary.words[i].wordId) >= 0)) {
                         if (!publicDictionary.words[i].hasOwnProperty("pronunciation")) {
                             publicDictionary.words[i].pronunciation = "";  //Account for new property
@@ -146,13 +146,20 @@ function PublicDictionaryEntry(itemIndex) {
 }
 
 function SetPublicPartsOfSpeech () {
-    var wordFilterSelect = document.getElementById("wordFilter");
+    var wordFilterOptions = document.getElementById("filterOptions");
 
     var newPartsOfSpeech = htmlEntitiesParse(publicDictionary.settings.partsOfSpeech).trim().split(",");
     for (var j = 0; j < newPartsOfSpeech.length; j++) {
-        var wordFilterOption = document.createElement('option');
+        var thePartOfSpeech = newPartsOfSpeech[j].trim();
-        wordFilterOption.appendChild(document.createTextNode(newPartsOfSpeech[j].trim()));
+
-        wordFilterOption.value = newPartsOfSpeech[j].trim();
+        var wordFilterLabel = document.createElement('label');
-        wordFilterSelect.appendChild(wordFilterOption);
+        wordFilterLabel.appendChild(document.createTextNode(thePartOfSpeech + " "));
+        wordFilterLabel['part-of-speech'] = thePartOfSpeech;
+        wordFilterLabel.className = 'filterOption';
+        var wordFilterCheckbox = document.createElement('input');
+        wordFilterCheckbox.type = 'checkbox';
+        wordFilterCheckbox.onchange = function(){ShowPublicDictionary()};
+        wordFilterLabel.appendChild(wordFilterCheckbox);
+        wordFilterOptions.appendChild(wordFilterLabel);
     }
 }

js/ui.js

@@ -636,8 +636,6 @@ function ToggleAllFilters(doCheck) {
     for (var i = 0; i < wordFilterOptions.children.length; i++) {
         wordFilterOptions.children[i].children[0].checked = doCheck;
     }
-    
-    ShowDictionary();
 }
 
 function ShowFilterWordCount(numberOfWords) {

view/index.php

@@ -108,10 +108,11 @@ catch (PDOException $ex) {}
                 </label>
             </div>
             
-            <label style="display:block;"><b>Filter Words </b><select id="wordFilter" onchange="ShowPublicDictionary()">
+            <label style="display:block;margin-bottom:0;"><b>Filter Words</b></label>
-                <option value="">All</option>
+            <div id="filterOptions" style="display:block"></div>
-            </select>
+            <div style="display:block;">
-            </label>
+                <span style="display:inline;cursor:pointer;font-size:12px;font-weight:bold;" onclick="ToggleAllFilters(true);ShowPublicDictionary();">Check All</span>&nbsp;/&nbsp;<span style="display:inline;cursor:pointer;font-size:12px;font-weight:bold;" onclick="ToggleAllFilters(false);ShowPublicDictionary();">Uncheck All</span>
+            </div>
         </div>
         
         <div id="filterWordCount"></div>