Do you want to update it to what you have set above?"; - updateConflictText += ''; - updateConflictText += ' '; - - updateConflictArea.innerHTML = updateConflictText; - } else { - errorMessage = "\"" + word + "\" is already in the dictionary exactly as it is written above"; - if (currentDictionary.words[wordIndex].name != word) { - errorMessage += ". (Your dictionary is currently set to ignore case.)" - } - } - } else { - currentDictionary.words.push({name: word, pronunciation: pronunciation, partOfSpeech: ((partOfSpeech.length > 0) ? partOfSpeech : " "), simpleDefinition: simpleDefinition, longDefinition: longDefinition, wordId: currentDictionary.nextWordId++}); - SaveAndUpdateWords("new"); - FocusAfterAddingNewWord(); - NewWordNotification(word); - } - - errorMessageArea.innerHTML = ""; - } else { - if (word == "") { - errorMessage += "Word cannot be blank"; - if (simpleDefinition == "" && longDefinition == "") { - errorMessage += " and you need at least one definition."; - } else { - errorMessage += "."; - } - } else if (simpleDefinition == "" && longDefinition == "") { - errorMessage += "You need at least one definition." - } - } - - errorMessageArea.innerHTML = errorMessage; -} - -function ShowWordEditForm(index) { - var indexString = index.toString(); // Variable for reduced processing - var word = currentDictionary.words[index]; // Reference for easier reading - var editForm = ''; - - document.getElementById("entry" + indexString).innerHTML = editForm; - - SetPartsOfSpeech("partOfSpeech" + indexString); - document.getElementById("partOfSpeech" + indexString).value = htmlEntitiesParse(word.partOfSpeech); - - document.getElementById("word" + indexString).focus(); -} - -function CancelEditForm(index) { - document.getElementById("entry" + index.toString()).innerHTML = DictionaryEntry(index).replace("
"; - updateConflictArea.innerHTML += ''; - updateConflictArea.innerHTML += ''; - } else { - errorMessage = "No change has been made to \"" + word + "\""; - if (currentDictionary.words[parseInt(indexString)].name != word) { - errorMessage += ". (Your dictionary is currently set to ignore case.)"; - } - } - - errorMessageArea.innerHTML = errorMessage; - - if (document.getElementById("updateConfirmButton" + indexString)) { - document.getElementById("updateConfirmButton" + indexString).focus(); - } -} - -function UpdateWord(wordIndex, word, pronunciation, partOfSpeech, simpleDefinition, longDefinition) { - SaveScroll(); - - currentDictionary.words[wordIndex].name = word; - currentDictionary.words[wordIndex].pronunciation = pronunciation; - currentDictionary.words[wordIndex].partOfSpeech = ((partOfSpeech.length > 0) ? partOfSpeech : " "); - currentDictionary.words[wordIndex].simpleDefinition = simpleDefinition; - currentDictionary.words[wordIndex].longDefinition = longDefinition; - - SaveAndUpdateWords("update", wordIndex); - - window.scroll(savedScroll.x, savedScroll.y); - - if (!wordFormIsLocked()) { - FocusAfterAddingNewWord(); - } -} - -function DeleteWord(index) { - var deleteWord = new XMLHttpRequest(); - deleteWord.open('POST', "/php/ajax_dictionarymanagement.php?action=worddelete"); - deleteWord.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); - deleteWord.onreadystatechange = function() { - if (deleteWord.readyState == 4 && deleteWord.status == 200) { - if (deleteWord.responseText == "deleted successfully" || deleteWord.responseText == "not signed in") { - currentDictionary.words.splice(index, 1); - - SaveWords(false); - } - console.log(deleteWord.responseText); - return true; - } else { - return false; - } - } - deleteWord.send("dict=" + currentDictionary.externalID.toString() + "&word=" + currentDictionary.words[index].wordId.toString()); -} - -function ShowDictionary() { - var filters = GetSelectedFilters(); - - var searchResults = []; - var search = htmlEntitiesParseForSearchEntry(document.getElementById("searchBox").value); - var searchByWord = document.getElementById("searchOptionWord").checked; - var searchBySimple = document.getElementById("searchOptionSimple").checked; - var searchByLong = document.getElementById("searchOptionLong").checked; - var searchIgnoreCase = !document.getElementById("searchCaseSensitive").checked; //It's easier to negate case here instead of negating it every use since ignore case is default. - var searchIgnoreDiacritics = document.getElementById("searchIgnoreDiacritics").checked; - if (search != "" && (searchByWord || searchBySimple || searchByLong)) { - var xpath = []; - var searchDictionaryJSON = htmlEntitiesParseForSearch(JSON.stringify(currentDictionary)); - if (searchIgnoreCase) { - search = search.toLowerCase(); - } - if (searchIgnoreDiacritics) { - search = removeDiacritics(search); - searchDictionaryJSON = removeDiacritics(searchDictionaryJSON); - } - if (searchByWord) { - xpath.push('contains('+ ((searchIgnoreCase) ? 'name' : 'translate(name, "", "")') +', "'+ search +'")'); - } - if (searchBySimple) { - xpath.push('contains('+ ((searchIgnoreCase) ? 'simpleDefinition' : 'translate(simpleDefinition, "", "")') +', "'+ search +'")'); - } - if (searchByLong) { - xpath.push('contains('+ ((searchIgnoreCase) ? 'longDefinition' : 'translate(longDefinition, "", "")') +', "'+ search +'")'); - } - var searchDictionary = JSON.parse(searchDictionaryJSON); - searchResults = JSON.search(searchDictionary, '//words['+ xpath.join(' or ') +']/wordId'); - } - - var dictionaryNameArea = document.getElementById("dictionaryName"); - dictionaryNameArea.innerHTML = currentDictionary.name + " Dictionary"; - if (loggedIn && currentDictionary.settings.isPublic) { - dictionaryNameArea.innerHTML += "➦"; - } - - var dictionaryDescriptionArea = document.getElementById("dictionaryDescription"); - dictionaryDescriptionArea.innerHTML = marked(htmlEntitiesParseForMarkdown(currentDictionary.description)); - - var dictionaryArea = document.getElementById("theDictionary"); - var dictionaryText = ""; - var numberOfWordsDisplayed = 0; - - if (currentDictionary.words.length > 0) { - for (var i = 0; i < currentDictionary.words.length; i++) { - if (filters.length == 0 || (filters.length > 0 && filters.indexOf(currentDictionary.words[i].partOfSpeech) > -1)) { - if (search == "" || (search != "" && (searchByWord || searchBySimple || searchByLong) && searchResults.indexOf(currentDictionary.words[i].wordId) >= 0)) { - if (!currentDictionary.words[i].hasOwnProperty("pronunciation")) { - currentDictionary.words[i].pronunciation = ""; //Account for new property - } - if (!currentDictionary.words[i].hasOwnProperty("wordId")) { - currentDictionary.words[i].wordId = i + 1; //Account for new property - } - dictionaryText += DictionaryEntry(i); - numberOfWordsDisplayed++; - } - } - } - } else { - dictionaryText = "There are no entries in the dictionary."; - } - - dictionaryArea.innerHTML = dictionaryText; - ShowFilterWordCount(numberOfWordsDisplayed); -} - -function DictionaryEntry(itemIndex) { - var searchTerm = regexParseForSearch(document.getElementById("searchBox").value); - var searchByWord = document.getElementById("searchOptionWord").checked; - var searchBySimple = document.getElementById("searchOptionSimple").checked; - var searchByLong = document.getElementById("searchOptionLong").checked; - var searchIgnoreCase = !document.getElementById("searchCaseSensitive").checked; //It's easier to negate case here instead of negating it every use since ignore case is default. - var searchIgnoreDiacritics = document.getElementById("searchIgnoreDiacritics").checked; - - var searchRegEx = new RegExp("(" + ((searchIgnoreDiacritics) ? removeDiacritics(searchTerm) + "|" + searchTerm : searchTerm) + ")", "g" + ((searchIgnoreCase) ? "i" : "")); - - var wordName = wordPronunciation = wordPartOfSpeech = wordSimpleDefinition = wordLongDefinition = ""; - - if (searchTerm != "" && searchByWord) { - // Parse HTML Entities while searching so the regex can search actual characters instead of HTML. - wordName += htmlEntities(htmlEntitiesParse(currentDictionary.words[itemIndex].name).replace(searchRegEx, "
";
-
- managementHTML += "Edit";
- managementHTML += "Delete";
-
- managementHTML += "";
-
- managementHTML += "
";
-
- return managementHTML;
-}
-
-function DictionaryEntryTemplate(wordObject, managementIndex) {
- managementIndex = (typeof managementIndex !== 'undefined') ? managementIndex : false;
- var entryText = ""; - - if (wordObject.simpleDefinition != "") { - entryText += "
Loading " + userDictionariesSelect.options[userDictionariesSelect.selectedIndex].text + "...
"); - HideSettings(); - - ChangeDictionaryToId(userDictionariesSelect.value, function(response) { - if (response == "no dictionaries") { - console.log(response); - SendDictionary(false); - } else if (response.length < 60) { - console.log(response); - } else { - currentDictionary = JSON.parse(response); - SaveDictionary(false); - ProcessLoad(); - LoadUserDictionaries(); - HideInfo(); // Hide the loading screen. - } - }); - } -} - -function ChangeDictionaryToId(dictionaryId, callbackFunction) { - var changeDictionaryRequest = new XMLHttpRequest(); - changeDictionaryRequest.open('POST', "/php/ajax_dictionarymanagement.php?action=switch"); - changeDictionaryRequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); - var postString = "newdictionaryid=" + dictionaryId.toString(); - changeDictionaryRequest.onreadystatechange = function() { - if (changeDictionaryRequest.readyState == 4 && changeDictionaryRequest.status == 200) { - callbackFunction(changeDictionaryRequest.responseText); - } - } - changeDictionaryRequest.send(postString); -} - -function LoadLocalDictionary() { - if (localStorage.getItem('dictionary')) { - var tmpDictionary = JSON.parse(localStorage.getItem('dictionary')); - if (tmpDictionary.words.length > 0 || tmpDictionary.description != "A new dictionary." || tmpDictionary.name != "New") { - currentDictionary = JSON.parse(localStorage.getItem('dictionary')); - } - tmpDictionary = null; - } -} - -function ProcessLoad() { - if (!currentDictionary.hasOwnProperty("nextWordId")) { - currentDictionary.nextWordId = currentDictionary.words.length + 1; - } - - HideSettingsWhenComplete(); - - ShowDictionary(); - - SetPartsOfSpeech(); - - if (currentDictionary.settings.isComplete) { - document.getElementById("wordEntryForm").style.display = "none"; - } - - SavePreviousDictionary(); -} - -function SavePreviousDictionary () { - // Save non-word data to check if anything has changed (words can identify themselves if changed). - // Used to minimize data pushed to database. - previousDictionary = { - name: currentDictionary.name, - description: currentDictionary.description, - nextWordId: currentDictionary.nextWordId, - allowDuplicates: currentDictionary.settings.allowDuplicates, - caseSensitive: currentDictionary.settings.caseSensitive, - partsOfSpeech: currentDictionary.settings.partsOfSpeech, - sortByEquivalent: currentDictionary.settings.sortByEquivalent, - isComplete: currentDictionary.settings.isComplete, - isPublic: currentDictionary.settings.isPublic - }; -} - -function ExportDictionary() { - var downloadName = removeDiacritics(stripHtmlEntities(currentDictionary.name)).replace(/\W/g, ''); - if (downloadName == "") { - downloadName = "export"; - } - download(downloadName + ".dict", localStorage.getItem('dictionary')); -} - -function ExportWords() { - if (currentDictionary.words.length > 0) { - var downloadName = removeDiacritics(stripHtmlEntities(currentDictionary.name)).replace(/\W/g, ''); - if (downloadName == "") { - downloadName = "export"; - } - downloadName += "_words"; - - var wordsCSV = "word,pronunciation,part of speech,definition,explanation\n"; - for (var i = 0; i < currentDictionary.words.length; i++) { - var word = "\"" + htmlEntitiesParse(currentDictionary.words[i].name).trim().replace(/\"/g, "\"\"") + "\""; - var pronunciation = "\"" + htmlEntitiesParse(currentDictionary.words[i].pronunciation).trim().replace(/\"/g, "\"\"") + "\""; - var partOfSpeech = "\"" + htmlEntitiesParse(currentDictionary.words[i].partOfSpeech).trim().replace(/\"/g, "\"\"") + "\""; - var simpleDefinition = "\"" + htmlEntitiesParse(currentDictionary.words[i].simpleDefinition).trim().replace(/\"/g, "\"\"") + "\""; - var longDefinition = "\"" + htmlEntitiesParse(currentDictionary.words[i].longDefinition).replace(/\"/g, "\"\"") + "\""; - wordsCSV += word + "," + pronunciation + "," + partOfSpeech + "," + simpleDefinition + "," + longDefinition + "\n"; - } - - download(downloadName + ".csv", wordsCSV); - } else { - alert("Dictionary must have at least 1 word to export."); - } -} - -function ImportDictionary() { - if (currentDictionary.externalID > 0 || confirm("Importing this dictionary will overwrite your current one, making it impossible to retrieve if you have not already exported it! Do you still want to import?")) { - if (!window.FileReader) { - alert('Your browser is not supported'); - return false; - } - - var reader = new FileReader(); - if (document.getElementById("importFile").files.length > 0) { - var file = document.getElementById("importFile").files[0]; - // Read the file - reader.readAsText(file); - // When it's loaded, process it - reader.onloadend = function () { - if (reader.result && reader.result.length) { - var tmpDicitonary = JSON.parse(reader.result); - - if (tmpDicitonary.hasOwnProperty("name") && tmpDicitonary.hasOwnProperty("description") && - tmpDicitonary.hasOwnProperty("words") && tmpDicitonary.hasOwnProperty("settings")) - { - currentDictionary = JSON.parse(reader.result); - currentDictionary.externalID = 0; // Reset external id for imported dictionary. - currentDictionary.settings.isPublic = false; // Reset public setting for imported dictionary. - SaveDictionary(true); - ProcessLoad(); - HideInfo(); - HideSettings(); - document.getElementById("importFile").value = ""; - NewNotification("Successfully Imported the \"" + currentDictionary.name + "\" Dictionary."); - } else { - var errorString = "File is missing:"; - if (!tmpDicitonary.hasOwnProperty("name")) - errorString += " name"; - if (!tmpDicitonary.hasOwnProperty("description")) - errorString += " description"; - if (!tmpDicitonary.hasOwnProperty("words")) - errorString += " words"; - if (!tmpDicitonary.hasOwnProperty("settings")) - errorString += " settings"; - alert("Uploaded file is not compatible.\n\n" + errorString); - } - - tmpDicitonary = null; - } else { - alert("Upload Failed"); - } - reader = null; - } - } else { - alert("You must add a file to import."); - } - } -} - -function ImportWords() { - if (currentDictionary.externalID > 0 || confirm("This will add words in a correctly formatted CSV file to your currently loaded dictionary. Do you still want to import?")) { - if (!window.FileReader) { - alert('Your browser is not supported'); - return false; - } - - if (document.getElementById("importWordsCSV").files.length > 0) { - var file = document.getElementById("importWordsCSV").files[0]; - - var resultsArea = document.getElementById("importOptions"); - resultsArea.innerHTML = "Importing Words...
"; - - var currentRow = 0; // Because of the header, the first row of data is always on line 2. - var rowsImported = 0; - - Papa.parse(file, { - header: true, - step: function(row, parser) { - currentRow++; - // If there are no errors OR the word and either definition or explanation contain data, then import it. - if ((row.data[0].word.trim().length > 0 && (row.data[0].definition.trim().length > 0 || row.data[0].explanation.trim().length > 0)) || row.errors.length == 0) { - var wordName = htmlEntities(row.data[0]["word"]).trim(), - wordPronunciation = htmlEntities(row.data[0]["pronunciation"]).trim(), - wordPartOfSpeech = ((htmlEntities(row.data[0]["part of speech"]).trim().length > 0) ? htmlEntities(row.data[0]["part of speech"]).trim() : " "), - wordSimpleDefinition = htmlEntities(row.data[0]["definition"]).trim(), - wordLongDefinition = htmlEntities(row.data[0]["explanation"]).trim(), - wordId = currentDictionary.nextWordId++; - - currentDictionary.words.push({name: wordName, pronunciation: wordPronunciation, partOfSpeech: wordPartOfSpeech, simpleDefinition: wordSimpleDefinition, longDefinition: wordLongDefinition, wordId: wordId}); - - var wordEntry = DictionaryEntryTemplate(currentDictionary.words[currentDictionary.words.length - 1]); - resultsArea.innerHTML += wordEntry; - - rowsImported++; - } else { - // If it's not just an empty line, give an error. - if (row.data[0].word.trim().length > 0) { - for (var i = 0; i < row.errors.length; i++) { - resultsArea.innerHTML += "Error on record #" + currentRow.toString() + ": " + row.errors[i].message + "
"; - } - } - } - // Scroll to the bottom. - document.getElementById("infoPage").scrollTop = document.getElementById("infoPage").scrollHeight; - }, - complete: function(results) { - SaveAndUpdateWords("all"); - resultsArea.innerHTML += "The file has finished importing " + rowsImported.toString() + " words.
"; - NewNotification("Imported " + rowsImported.toString() + " words."); - // Scroll to the bottom. - document.getElementById("importOptions").scrollTop = document.getElementById("importOptions").scrollHeight; - document.getElementById("numberOfWordsInDictionary").innerHTML = currentDictionary.words.length.toString(); - } - }); - } else { - alert("You must add a file to import."); - } - } -} - -function WordIndex(word, byId) { -// Use byId = true to enter word id number instead of string. - for (var i = 0; i < currentDictionary.words.length; i++) - { - if ((!byId && (!currentDictionary.settings.caseSensitive && currentDictionary.words[i].name.toLowerCase() == word.toLowerCase()) || - (currentDictionary.settings.caseSensitive && currentDictionary.words[i].name == word)) || - (byId && currentDictionary.words[i].wordId == word)) { - return i; - } - } - return -1; -} - -function WordAtIndexWasChanged(indexString, word, pronunciation, partOfSpeech, simpleDefinition, longDefinition) { - return (!currentDictionary.settings.caseSensitive && currentDictionary.words[parseInt(indexString)].name.toLowerCase() != word.toLowerCase()) || - (currentDictionary.settings.caseSensitive && currentDictionary.words[parseInt(indexString)].name != word) || - currentDictionary.words[parseInt(indexString)].pronunciation != pronunciation || - currentDictionary.words[parseInt(indexString)].partOfSpeech.trim() != partOfSpeech || - currentDictionary.words[parseInt(indexString)].simpleDefinition != simpleDefinition || - currentDictionary.words[parseInt(indexString)].longDefinition != longDefinition; -} - -function CheckForPartsOfSpeechChange() { - if (htmlEntities(document.getElementById("dictionaryPartsOfSpeechEdit").value) != currentDictionary.settings.partsOfSpeech) { - if (htmlEntities(document.getElementById("dictionaryPartsOfSpeechEdit").value) != "") { - currentDictionary.settings.partsOfSpeech = htmlEntities(document.getElementById("dictionaryPartsOfSpeechEdit").value); - SetPartsOfSpeech(); - } - } -} diff --git a/js/helpers.js b/js/helpers.js deleted file mode 100644 index e534d42..0000000 --- a/js/helpers.js +++ /dev/null @@ -1,256 +0,0 @@ -function ready(fn) { - if (document.readyState != 'loading'){ - fn(); - } else { - document.addEventListener('DOMContentLoaded', fn); - } -} - -// Set Marked.js settings -marked.setOptions({ - gfm: true, - tables: true, - breaks: true, - sanitize: true -}); - -// Get Keycode based on key name -function keyCodeFor(keyName) { - if (keyName == "backspace") return 8; - else if (keyName == "tab") return 9; - else if (keyName == "ctrlEnter") return 10; - else if (keyName == "enter") return 13; - else if (keyName == "shift") return 16; - else if (keyName == "ctrl") return 17; - else if (keyName == "alt") return 18; - else if (keyName == "pausebreak") return 19; - else if (keyName == "capslock") return 20; - else if (keyName == "escape") return 27; - else if (keyName == "space") return 32; - else if (keyName == "pageup") return 33; - else if (keyName == "pagedown") return 34; - else if (keyName == "end") return 35; - else if (keyName == "home") return 36; - else if (keyName == "left") return 37; - else if (keyName == "up") return 38; - else if (keyName == "right") return 39; - else if (keyName == "down") return 40; - else if (keyName == "insert") return 45; - else if (keyName == "del") return 46; - else if (keyName == "zero") return 48; - else if (keyName == "one") return 49; - else if (keyName == "two") return 50; - else if (keyName == "three") return 51; - else if (keyName == "four") return 52; - else if (keyName == "five") return 53; - else if (keyName == "six") return 54; - else if (keyName == "seven") return 55; - else if (keyName == "eight") return 56; - else if (keyName == "nine") return 57; - else if (keyName == "a") return 65; - else if (keyName == "b") return 66; - else if (keyName == "c") return 67; - else if (keyName == "d") return 68; - else if (keyName == "e") return 69; - else if (keyName == "f") return 70; - else if (keyName == "g") return 71; - else if (keyName == "h") return 72; - else if (keyName == "i") return 73; - else if (keyName == "j") return 74; - else if (keyName == "k") return 75; - else if (keyName == "l") return 76; - else if (keyName == "m") return 77; - else if (keyName == "n") return 78; - else if (keyName == "o") return 79; - else if (keyName == "p") return 80; - else if (keyName == "q") return 81; - else if (keyName == "r") return 82; - else if (keyName == "s") return 83; - else if (keyName == "t") return 84; - else if (keyName == "u") return 85; - else if (keyName == "v") return 86; - else if (keyName == "w") return 87; - else if (keyName == "x") return 88; - else if (keyName == "y") return 89; - else if (keyName == "z") return 90; - else if (keyName == "leftwinkey") return 91; - else if (keyName == "rightwinkey") return 92; - else if (keyName == "selectkey") return 93; - else if (keyName == "numpad_0") return 96; - else if (keyName == "numpad_1") return 97; - else if (keyName == "numpad_2") return 98; - else if (keyName == "numpad_3") return 99; - else if (keyName == "numpad_4") return 100; - else if (keyName == "numpad_5") return 101; - else if (keyName == "numpad_6") return 102; - else if (keyName == "numpad_7") return 103; - else if (keyName == "numpad_8") return 104; - else if (keyName == "numpad_9") return 105; - else if (keyName == "numpad_asterisk") return 106; - else if (keyName == "numpad_plus") return 107; - else if (keyName == "numpad_dash") return 109; - else if (keyName == "numpad_period") return 110; - else if (keyName == "numpad_slash") return 111; - else if (keyName == "f1") return 112; - else if (keyName == "f2") return 113; - else if (keyName == "f3") return 114; - else if (keyName == "f4") return 115; - else if (keyName == "f5") return 116; - else if (keyName == "f6") return 117; - else if (keyName == "f7") return 118; - else if (keyName == "f8") return 119; - else if (keyName == "f9") return 120; - else if (keyName == "f10") return 121; - else if (keyName == "f11") return 122; - else if (keyName == "f12") return 123; - else if (keyName == "numlock") return 144; - else if (keyName == "scrolllock") return 145; - else if (keyName == "semicolon") return 186; - else if (keyName == "equal") return 187; - else if (keyName == "comma") return 188; - else if (keyName == "dash") return 189; - else if (keyName == "period") return 190; - else if (keyName == "slash") return 191; - else if (keyName == "grave") return 192; - else if (keyName == "openbracket") return 219; - else if (keyName == "backslash") return 220; - else if (keyName == "closebraket") return 221; - else if (keyName == "quote") return 222; - else return false; -} - -function getInputSelection(el) { -// Retrieved from http://stackoverflow.com/a/4207763 - var start = 0, end = 0, normalizedValue, range, - textInputRange, len, endRange; - el.focus(); - if (typeof el.selectionStart == "number" && typeof el.selectionEnd == "number") { - start = el.selectionStart; - end = el.selectionEnd; - } else { - range = document.selection.createRange(); - - if (range && range.parentElement() == el) { - len = el.value.length; - normalizedValue = el.value.replace(/\r\n/g, "\n"); - - // Create a working TextRange that lives only in the input - textInputRange = el.createTextRange(); - textInputRange.moveToBookmark(range.getBookmark()); - - // Check if the start and end of the selection are at the very end - // of the input, since moveStart/moveEnd doesn't return what we want - // in those cases - endRange = el.createTextRange(); - endRange.collapse(false); - - if (textInputRange.compareEndPoints("StartToEnd", endRange) > -1) { - start = end = len; - } else { - start = -textInputRange.moveStart("character", -len); - start += normalizedValue.slice(0, start).split("\n").length - 1; - - if (textInputRange.compareEndPoints("EndToEnd", endRange) > -1) { - end = len; - } else { - end = -textInputRange.moveEnd("character", -len); - end += normalizedValue.slice(0, end).split("\n").length - 1; - } - } - } - } - - return { - start: start, - end: end - }; -} - -function setSelectionRange(input, selectionStart, selectionEnd) { -// Retrieved from http://stackoverflow.com/a/17858641/3508346 - if (input.setSelectionRange) { - input.focus(); - input.setSelectionRange(selectionStart, selectionEnd); - } - else if (input.createTextRange) { - var range = input.createTextRange(); - range.collapse(true); - range.moveEnd('character', selectionEnd); - range.moveStart('character', selectionStart); - range.select(); - } -} - -function SaveScroll() { - var doc = document.documentElement; - var left = (window.pageXOffset || doc.scrollLeft) - (doc.clientLeft || 0); - var top = (window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0); - - savedScroll.x = left; - savedScroll.y = top; -} - -function htmlEntities(string) { - return String(string).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"').replace(/'/g, ''').replace(/\\/g, '\').replace(/\n/g, ''); -} - -function htmlEntitiesParse(string) { - return String(string).replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"').replace(/'/g, "'").replace(/\/g, '\\').replace(/
/g, '\n'); -} - -function htmlEntitiesParseForMarkdown(string) { - return String(string).replace(/"/g, '"').replace(/'/g, "'").replace(/\/g, '\\').replace(/
/g, '\n'); -} - -function stripHtmlEntities(string) { - // This is for the export name. - return String(string).replace(/&/g, '').replace(/</g, '').replace(/>/g, '').replace(/"/g, '').replace(/'/g, "").replace(/\/g, '').replace(/
/g, ''); -} - -function htmlEntitiesParseForSearchEntry(string) { - return String(string).replace(/"/g, '%%%%').replace(/'/g, "````"); -} - -function htmlEntitiesParseForSearch(string) { - return String(string).replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '%%%%').replace(/'/g, "````"); -} - -function regexParseForSearch(string) { - return String(string).replace(/([\[\\\^\$\.\|\?\*\+\(\)\{\}\]])/g, "\\$1"); -} - -function dynamicSort(propertiesArray) { - /* Retrieved from http://stackoverflow.com/a/30446887/3508346 - Usage: theArray.sort(dynamicSort(['propertyAscending', '-propertyDescending']));*/ - return function (a, b) { - return propertiesArray - .map(function (o) { - var dir = 1; - if (o[0] === '-') { - dir = -1; - o=o.substring(1); - } - if (removeDiacritics(a[o]).toLowerCase() > removeDiacritics(b[o]).toLowerCase()) return dir; - if (removeDiacritics(a[o]).toLowerCase() < removeDiacritics(b[o]).toLowerCase()) return -(dir); - return 0; - }) - .reduce(function firstNonZeroValue (p,n) { - return p ? p : n; - }, 0); - }; -} - -function download(filename, text) { - /* Retrieved from http://stackoverflow.com/a/18197341/3508346 - Usage: download('test.txt', 'Hello world!');*/ - var element = document.createElement('a'); - element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text)); - element.setAttribute('download', filename); - - element.style.display = 'none'; - document.body.appendChild(element); - - element.click(); - - document.body.removeChild(element); -} \ No newline at end of file diff --git a/js/marked.js b/js/marked.js deleted file mode 100644 index bcea7a6..0000000 --- a/js/marked.js +++ /dev/null @@ -1,1285 +0,0 @@ -/** - * marked - a markdown parser - * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed) - * https://github.com/chjj/marked - */ - -;(function() { - -/** - * Block-Level Grammar - */ - -var block = { - newline: /^\n+/, - code: /^( {4}[^\n]+\n*)+/, - fences: noop, - hr: /^( *[-*_]){3,} *(?:\n+|$)/, - heading: /^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/, - nptable: noop, - lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/, - blockquote: /^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/, - list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/, - html: /^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/, - def: /^ *\[([^\]]+)\]: *]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/, - table: noop, - paragraph: /^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/, - text: /^[^\n]+/ -}; - -block.bullet = /(?:[*+-]|\d+\.)/; -block.item = /^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/; -block.item = replace(block.item, 'gm') - (/bull/g, block.bullet) - (); - -block.list = replace(block.list) - (/bull/g, block.bullet) - ('hr', '\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))') - ('def', '\\n+(?=' + block.def.source + ')') - (); - -block.blockquote = replace(block.blockquote) - ('def', block.def) - (); - -block._tag = '(?!(?:' - + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code' - + '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo' - + '|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b'; - -block.html = replace(block.html) - ('comment', //) - ('closed', /<(tag)[\s\S]+?<\/\1>/) - ('closing', /
'
- + (escaped ? code : escape(code, true))
- + '\n'
- + (escaped ? code : escape(code, true))
- + '\n\n' + quote + '\n'; -}; - -Renderer.prototype.html = function(html) { - return html; -}; - -Renderer.prototype.heading = function(text, level, raw) { - return '
\n' : '
\n'; -}; - -Renderer.prototype.list = function(body, ordered) { - var type = ordered ? 'ol' : 'ul'; - return '<' + type + '>\n' + body + '\n'; -}; - -Renderer.prototype.listitem = function(text) { - return '
' + text + '
\n'; -}; - -Renderer.prototype.table = function(header, body) { - return '' + text + '';
-};
-
-Renderer.prototype.br = function() {
- return this.options.xhtml ? '' : '
'; -}; - -Renderer.prototype.del = function(text) { - return '
An error occured:
' - + escape(e.message + '', true) - + ''; - } - throw e; - } -} - -/** - * Options - */ - -marked.options = -marked.setOptions = function(opt) { - merge(marked.defaults, opt); - return marked; -}; - -marked.defaults = { - gfm: true, - tables: true, - breaks: false, - pedantic: false, - sanitize: false, - sanitizer: null, - mangle: true, - smartLists: false, - silent: false, - highlight: null, - langPrefix: 'lang-', - smartypants: false, - headerPrefix: '', - renderer: new Renderer, - xhtml: false -}; - -/** - * Expose - */ - -marked.Parser = Parser; -marked.parser = Parser.parse; - -marked.Renderer = Renderer; - -marked.Lexer = Lexer; -marked.lexer = Lexer.lex; - -marked.InlineLexer = InlineLexer; -marked.inlineLexer = InlineLexer.output; - -marked.parse = marked; - -if (typeof module !== 'undefined' && typeof exports === 'object') { - module.exports = marked; -} else if (typeof define === 'function' && define.amd) { - define(function() { return marked; }); -} else { - this.marked = marked; -} - -}).call(function() { - return this || (typeof window !== 'undefined' ? window : global); -}()); \ No newline at end of file diff --git a/js/min/defiant.js b/js/min/defiant.js deleted file mode 100644 index dbaa77e..0000000 --- a/js/min/defiant.js +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Defiant.js v1.2.5 - * Serch JSON structures plus smart templating with XSLT and XPath. - * http://defiantjs.com - * - * Copyright (c) 2013-2015, Hakan Bilgin
Do you want to update it to what you have set above?",d+='",d+=' ',c.innerHTML=d}else a='"'+e+'" is already in the dictionary exactly as it is written above',currentDictionary.words[s].name!=e&&(a+=". (Your dictionary is currently set to ignore case.)");else currentDictionary.words.push({name:e,pronunciation:t,partOfSpeech:n.length>0?n:" ",simpleDefinition:i,longDefinition:r,wordId:currentDictionary.nextWordId++}),SaveAndUpdateWords("new"),FocusAfterAddingNewWord(),NewWordNotification(e);o.innerHTML=""}o.innerHTML=a}function ShowWordEditForm(e){var t=e.toString(),n=currentDictionary.words[e],i='';document.getElementById("entry"+t).innerHTML=i,SetPartsOfSpeech("partOfSpeech"+t),document.getElementById("partOfSpeech"+t).value=htmlEntitiesParse(n.partOfSpeech)}function CancelEditForm(e){document.getElementById("entry"+e.toString()).innerHTML=DictionaryEntry(e).replace("
',s.innerHTML+='",s.innerHTML+='"):(c='No change has been made to "'+t+'"',currentDictionary.words[parseInt(e)].name!=t&&(c+=". (Your dictionary is currently set to ignore case.)")),a.innerHTML=c}function UpdateWord(e,t,n,i,r,o){currentDictionary.words[e].name=t,currentDictionary.words[e].pronunciation=n,currentDictionary.words[e].partOfSpeech=i.length>0?i:" ",currentDictionary.words[e].simpleDefinition=r,currentDictionary.words[e].longDefinition=o,SaveAndUpdateWords("update",e),window.scroll(savedScroll.x,savedScroll.y),wordFormIsLocked()||FocusAfterAddingNewWord()}function DeleteWord(e){var t=new XMLHttpRequest;t.open("POST","/php/ajax_dictionarymanagement.php?action=worddelete"),t.setRequestHeader("Content-Type","application/x-www-form-urlencoded"),t.onreadystatechange=function(){return 4==t.readyState&&200==t.status?("deleted successfully"!=t.responseText&&"not signed in"!=t.responseText||(currentDictionary.words.splice(e,1),SaveWords(!1)),console.log(t.responseText),!0):!1},t.send("dict="+currentDictionary.externalID.toString()+"&word="+currentDictionary.words[e].wordId.toString())}function ShowDictionary(){var e=GetSelectedFilters(),t=[],n=htmlEntitiesParseForSearchEntry(document.getElementById("searchBox").value),i=document.getElementById("searchOptionWord").checked,r=document.getElementById("searchOptionSimple").checked,o=document.getElementById("searchOptionLong").checked,a=!document.getElementById("searchCaseSensitive").checked,c=document.getElementById("searchIgnoreDiacritics").checked;if(""!=n&&(i||r||o)){var s=[],d=htmlEntitiesParseForSearch(JSON.stringify(currentDictionary));a&&(n=n.toLowerCase()),c&&(n=removeDiacritics(n),d=removeDiacritics(d)),i&&s.push("contains("+(a?"name":'translate(name, "", "")')+', "'+n+'")'),r&&s.push("contains("+(a?"simpleDefinition":'translate(simpleDefinition, "", "")')+', "'+n+'")'),o&&s.push("contains("+(a?"longDefinition":'translate(longDefinition, "", "")')+', "'+n+'")');var l=JSON.parse(d);t=JSON.search(l,"//words["+s.join(" or ")+"]/wordId")}var u=document.getElementById("dictionaryName");u.innerHTML=currentDictionary.name+" Dictionary",loggedIn&¤tDictionary.settings.isPublic&&(u.innerHTML+="➦");var p=document.getElementById("dictionaryDescription");p.innerHTML=marked(htmlEntitiesParseForMarkdown(currentDictionary.description));var y=document.getElementById("theDictionary"),m="",D=0;if(currentDictionary.words.length>0)for(var g=0;g
";return t+="Edit",t+="Delete',t+="",t+="
"}function DictionaryEntryTemplate(e,t){t="undefined"!=typeof t?t:!1;var n="",""!=e.simpleDefinition&&(n+="
Loading "+e.options[e.selectedIndex].text+"...
"),HideSettings(),ChangeDictionaryToId(e.value,function(e){"no dictionaries"==e?(console.log(e),SendDictionary(!1)):e.length<60?console.log(e):(currentDictionary=JSON.parse(e),SaveDictionary(!1),ProcessLoad(),LoadUserDictionaries(),HideInfo())}))}function ChangeDictionaryToId(e,t){var n=new XMLHttpRequest;n.open("POST","/php/ajax_dictionarymanagement.php?action=switch"),n.setRequestHeader("Content-type","application/x-www-form-urlencoded");var i="newdictionaryid="+e.toString();n.onreadystatechange=function(){4==n.readyState&&200==n.status&&t(n.responseText)},n.send(i)}function LoadLocalDictionary(){if(localStorage.getItem("dictionary")){var e=JSON.parse(localStorage.getItem("dictionary"));(e.words.length>0||"A new dictionary."!=e.description||"New"!=e.name)&&(currentDictionary=JSON.parse(localStorage.getItem("dictionary"))),e=null}}function ProcessLoad(){currentDictionary.hasOwnProperty("nextWordId")||(currentDictionary.nextWordId=currentDictionary.words.length+1),HideSettingsWhenComplete(),ShowDictionary(),SetPartsOfSpeech(),currentDictionary.settings.isComplete&&(document.getElementById("wordEntryForm").style.display="none"),SavePreviousDictionary()}function SavePreviousDictionary(){previousDictionary={name:currentDictionary.name,description:currentDictionary.description,nextWordId:currentDictionary.nextWordId,allowDuplicates:currentDictionary.settings.allowDuplicates,caseSensitive:currentDictionary.settings.caseSensitive,partsOfSpeech:currentDictionary.settings.partsOfSpeech,sortByEquivalent:currentDictionary.settings.sortByEquivalent,isComplete:currentDictionary.settings.isComplete,isPublic:currentDictionary.settings.isPublic}}function ExportDictionary(){var e=removeDiacritics(stripHtmlEntities(currentDictionary.name)).replace(/\W/g,"");""==e&&(e="export"),download(e+".dict",localStorage.getItem("dictionary"))}function ExportWords(){if(currentDictionary.words.length>0){var e=removeDiacritics(stripHtmlEntities(currentDictionary.name)).replace(/\W/g,"");""==e&&(e="export"),e+="_words";for(var t="word,pronunciation,part of speech,definition,explanation\n",n=0;nImporting Words...
";var n=0,i=0;Papa.parse(e,{header:!0,step:function(e,r){if(n++,e.data[0].word.trim().length>0&&(e.data[0].definition.trim().length>0||e.data[0].explanation.trim().length>0)||0==e.errors.length){var o=htmlEntities(e.data[0].word).trim(),a=htmlEntities(e.data[0].pronunciation).trim(),c=htmlEntities(e.data[0]["part of speech"]).trim().length>0?htmlEntities(e.data[0]["part of speech"]).trim():" ",s=htmlEntities(e.data[0].definition).trim(),d=htmlEntities(e.data[0].explanation).trim(),l=currentDictionary.nextWordId++;currentDictionary.words.push({name:o,pronunciation:a,partOfSpeech:c,simpleDefinition:s,longDefinition:d,wordId:l});var u=DictionaryEntryTemplate(currentDictionary.words[currentDictionary.words.length-1]);t.innerHTML+=u,i++}else if(e.data[0].word.trim().length>0)for(var p=0;pThe file has finished importing "+i.toString()+" words.
",NewNotification("Imported "+i.toString()+" words."),document.getElementById("importOptions").scrollTop=document.getElementById("importOptions").scrollHeight,document.getElementById("numberOfWordsInDictionary").innerHTML=currentDictionary.words.length.toString()}})}else alert("You must add a file to import.")}}function WordIndex(e,t){for(var n=0;n")}function htmlEntitiesParse(e){return String(e).replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,'"').replace(/'/g,"'").replace(/\/g,"\\").replace(/
/g,"\n")}function htmlEntitiesParseForMarkdown(e){return String(e).replace(/"/g,'"').replace(/'/g,"'").replace(/\/g,"\\").replace(/
/g,"\n")}function stripHtmlEntities(e){return String(e).replace(/&/g,"").replace(/</g,"").replace(/>/g,"").replace(/"/g,"").replace(/'/g,"").replace(/\/g,"").replace(/
/g,"")}function htmlEntitiesParseForSearchEntry(e){return String(e).replace(/"/g,"%%%%").replace(/'/g,"````")}function htmlEntitiesParseForSearch(e){return String(e).replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,"%%%%").replace(/'/g,"````")}function regexParseForSearch(e){return String(e).replace(/([\[\\\^\$\.\|\?\*\+\(\)\{\}\]])/g,"\\$1")}function dynamicSort(e){return function(t,r){return e.map(function(e){var n=1;return"-"===e[0]&&(n=-1,e=e.substring(1)),removeDiacritics(t[e]).toLowerCase()>removeDiacritics(r[e]).toLowerCase()?n:removeDiacritics(t[e]).toLowerCase()
"+s(c.message+"",!0)+"";throw c}}var p={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:o,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:o,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,blockquote:/^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,def:/^ *\[([^\]]+)\]: *]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:o,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/};p.bullet=/(?:[*+-]|\d+\.)/,p.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/,p.item=l(p.item,"gm")(/bull/g,p.bullet)(),p.list=l(p.list)(/bull/g,p.bullet)("hr","\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))")("def","\\n+(?="+p.def.source+")")(),p.blockquote=l(p.blockquote)("def",p.def)(),p._tag="(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b",p.html=l(p.html)("comment",//)("closed",/<(tag)[\s\S]+?<\/\1>/)("closing",/
'+(n?e:s(e,!0))+"\n"+(n?e:s(e,!0))+"\n\n"+e+"\n"},n.prototype.html=function(e){return e},n.prototype.heading=function(e,t,n){return"
\n":"
\n"},n.prototype.list=function(e,t){var n=t?"ol":"ul";return"<"+n+">\n"+e+"\n"},n.prototype.listitem=function(e){return"
"+e+"
\n"},n.prototype.table=function(e,t){return""+e+""},n.prototype.br=function(){return this.options.xhtml?"":"
"},n.prototype.del=function(e){return"
",""!=e.simpleDefinition&&(n+="
"+e}else document.getElementById("publicLink").innerHTML=""}function SetPartsOfSpeech(e){e="undefined"!=typeof e?e:"partOfSpeech";var t=document.getElementById(e),n=document.getElementById("filterOptions"),o=GetSelectedFilters();t.innerHTML="",n.innerHTML="";var i=document.createElement("option");i.appendChild(document.createTextNode("")),i.value=" ",t.appendChild(i);for(var r=htmlEntitiesParse(currentDictionary.settings.partsOfSpeech).trim().split(","),d=0;d
"; - - if (wordObject.simpleDefinition != "") { - entryText += "
" + publicLink; - } else { - document.getElementById("publicLink").innerHTML = ""; - } -} - -function SetPartsOfSpeech (selectId) { - selectId = (typeof selectId !== 'undefined') ? selectId : "partOfSpeech"; - var partsOfSpeechSelect = document.getElementById(selectId); - - var wordFilterOptions = document.getElementById("filterOptions"); - var wordFiltersSelected = GetSelectedFilters(); - - // Clear parts of speech. - partsOfSpeechSelect.innerHTML = ""; - wordFilterOptions.innerHTML = ""; - - // Insert blank part of speech as first dropdown option. - var blankpartOfSpeechOption = document.createElement('option'); - blankpartOfSpeechOption.appendChild(document.createTextNode("")); - blankpartOfSpeechOption.value = " "; - partsOfSpeechSelect.appendChild(blankpartOfSpeechOption); - - // Rebuild parts of speech - var newPartsOfSpeech = htmlEntitiesParse(currentDictionary.settings.partsOfSpeech).trim().split(","); - for (var j = 0; j < newPartsOfSpeech.length; j++) { - var thePartOfSpeech = newPartsOfSpeech[j].trim(); - - var partOfSpeechOption = document.createElement('option'); - partOfSpeechOption.appendChild(document.createTextNode(thePartOfSpeech)); - partOfSpeechOption.value = thePartOfSpeech; - partsOfSpeechSelect.appendChild(partOfSpeechOption); - - var wordFilterLabel = document.createElement('label'); - wordFilterLabel.appendChild(document.createTextNode(thePartOfSpeech + " ")); - wordFilterLabel['part-of-speech'] = thePartOfSpeech; - wordFilterLabel.className = 'filterOption'; - var wordFilterCheckbox = document.createElement('input'); - wordFilterCheckbox.type = 'checkbox'; - wordFilterCheckbox.onchange = function(){ShowDictionary()}; - if (wordFiltersSelected.indexOf(thePartOfSpeech) > -1) wordFilterCheckbox.checked = true; - wordFilterLabel.appendChild(wordFilterCheckbox); - wordFilterOptions.appendChild(wordFilterLabel); - } - - // Insert blank part of speech as last filter option - var blankwordFilterLabel = document.createElement('label'); - blankwordFilterLabel.appendChild(document.createTextNode("Blanks ")); - blankwordFilterLabel['part-of-speech'] = " "; - blankwordFilterLabel.className = 'filterOption'; - var blankwordFilterCheckbox = document.createElement('input'); - blankwordFilterCheckbox.type = 'checkbox'; - blankwordFilterCheckbox.onchange = function(){ShowDictionary()}; - if (wordFiltersSelected.indexOf(" ") > -1) blankwordFilterCheckbox.checked = true; - blankwordFilterLabel.appendChild(blankwordFilterCheckbox); - wordFilterOptions.appendChild(blankwordFilterLabel); -} - -function GetSelectedFilters() { - var wordFilterOptions = document.getElementById("filterOptions"); - var wordFiltersSelected = []; - - for (var i = 0; i < wordFilterOptions.children.length; i++) { - var filterOption = wordFilterOptions.children[i]; - if (filterOption.children[0].checked) { - wordFiltersSelected.push(filterOption['part-of-speech']); - } - } - - return wordFiltersSelected; -} - -function ToggleAllFilters(doCheck) { - var wordFilterOptions = document.getElementById("filterOptions"); - - for (var i = 0; i < wordFilterOptions.children.length; i++) { - wordFilterOptions.children[i].children[0].checked = doCheck; - } -} - -function ShowFilterWordCount(numberOfWords) { - var filters = GetSelectedFilters(); - var search = htmlEntitiesParseForSearchEntry(document.getElementById("searchBox").value); - var wordCounter = document.getElementById("filterWordCount"); - - if (filters.length > 0 || search != "") { - wordCounter.innerHTML = "Showing " + numberOfWords.toString() + " result" + ((numberOfWords != 1) ? "s" : ""); - } else { - wordCounter.innerHTML = ""; - } -} - -function NewWordNotification(word) { - var wordId = currentDictionary.nextWordId - 1; - NewNotification("New Word Added: " + word + ""); -} - -function NewNotification(message) { - var notificationArea = document.getElementById("notificationArea"); - var notificationMessage = document.getElementById("notificationMessage"); - notificationArea.style.display = "block"; - notificationMessage.innerHTML = message; -} - -function FocusAfterAddingNewWord() { - document.getElementById("word").focus(); -} diff --git a/package.json b/package.json index 08a9691..27cb1a2 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "lexiconga", "title": "Lexiconga", - "version": "1.0.0", + "version": "2.0.0", "description": "A tool to build simple dictionaries using JSON.", "main": "src/app.js", "scripts": { - "start": "node start-server.js", + "serve": "node start-server.js", "pack": "node ./node_modules/webpack/bin/webpack.js -d --progress --display-error-details", "watch": "node ./node_modules/webpack/bin/webpack.js -d --progress --watch", "build": "node ./node_modules/webpack/bin/webpack.js -p --progress" @@ -14,38 +14,33 @@ "type": "git", "url": "git+https://Alamantus@github.com/Alamantus/Lexiconga.git" }, - "author": "Robbie Antenesse
Please try another."; - break; - case "createemailorpasswordblank": - $notificationMessage = "The create account form somehow got submitted without some essential information.
Please try filling it out again."; - break; - case "couldnotsendresetemail": - $notificationMessage = "For some reason, the reset email could not be sent.
Please try again later."; - break; - case "couldnotsetresetlink": - $notificationMessage = "The email address specified for password reset does not have an account."; - break; - case "emailresetinvalid": - $notificationMessage = "The email address specified for password reset didn't work.
Please try again."; - break; - case "resetemailblank": - $notificationMessage = "The password reset form somehow got submitted without some essential information.
Please try filling it out again."; - break; - case "loginfailed": - $notificationMessage = "We couldn't log you in because your email or password was incorrect.
"; - - $_SESSION['loginfailures'] += 1; - if ($_SESSION['loginfailures'] < 10) { - $notificationMessage .= "This is your " . ordinal($_SESSION['loginfailures']) . " failed attempt.
After 10 failures, you will not be able to log in for 1 hour.
Please try again."; - } else { - $_SESSION['loginlockouttime'] = time(); - $notificationMessage .= "Since you failed to log in successfully 10 times, you may not try again for 1 hour."; - } - break; - case "emaildoesnotexist": - $notificationMessage = "The email address you entered doesn't have an account.
Would you like to create an account?"; - break; - case "emailinvalid": - $notificationMessage = "The email address you entered didn't work.
Please try another."; - break; - case "resetlinkfailed": - $notificationMessage = "The reset link used is not valid. Please make sure you have copied it correctly."; - break; - case "resetlinkinvalid": - $notificationMessage = "The reset link used is not valid. Please make sure you have copied it correctly."; - break; - case "couldnotresetpassword": - $notificationMessage = "Your password could not be reset at this time. Please try again later.
If you remember your old password, you may still use it to log in."; - break; - case "passwordresetinvalid": - $notificationMessage = "Something went wrong in the password reset process. Please try again."; - break; - case "newpasswordblank": - $notificationMessage = "All the necessary information did not make it through for your password reset. Please try again."; - break; - case "couldnotupdatesettings": - $notificationMessage = "Could not update your account settings. Please try again."; - break; - case "accountsettingsinvalid": - $notificationMessage = "The email address you entered was either not valid or is already in use by another user. Please choose a different email address if you want to update your account email."; - break; - case "createdaccountsuccessfully": - $notificationMessage = "Your account was created successfully!
Please log in using the email address and password you used to create it and you can start accessing your dictionaries anywhere!"; - break; - case "resetemailsent": - $notificationMessage = "The password reset link has been sent to the email you specified.
If you do not see it in your inbox, please check your junk mail box just in case!
Be sure to use the link before the end of today or else you will need to request a new one."; - break; - case "showresetform": - $notificationMessage = ' -'; - break; - case "passwordresetsuccessfully": - $notificationMessage = "Your password has been successfully reset. You may now log in using your new password."; - break; - case "accountsettingsupdated": - $notificationMessage = "Your settings have been updated."; - break; - } - - $_SESSION['current_status'] = ""; -} - -if (isset($_GET['logout']) && $current_user > 0) { - session_destroy(); - header('Location: ./?loggedout'); -} -elseif (isset($_GET['login']) && $current_user <= 0) { - if (isset($_POST['email']) && isset($_POST['password'])) { - if (filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) { - if (EmailExists($_POST['email'])) { - if (Validate_Login($_POST['email'], $_POST['password'])) { - $_SESSION['user'] = Get_User_Id($_POST['email']); - query("UPDATE `users` SET `last_login`='" . date("Y-m-d H:i:s") . "' WHERE `id`=" . $_SESSION['user'] . ";"); - } else { - $_SESSION['current_status'] = "loginfailed"; - } - } else { - $_SESSION['current_status'] = "emaildoesnotexist"; - } - } else { - $_SESSION['current_status'] = "emailinvalid"; - } - } else { - $_SESSION['current_status'] = "loginemailorpasswordblank"; - } - header('Location: ./'); -} -elseif (isset($_GET['createaccount'])) { - if (isset($_POST['email']) && isset($_POST['password'])) { - if (filter_var($_POST['email'], FILTER_VALIDATE_EMAIL) && !EmailExists($_POST['email'])) { - if (query("INSERT INTO users (email, password, public_name, allow_email) VALUES ('" . $_POST['email'] . "','" . crypt($_POST['password'], $_POST['email']) . "','" . htmlspecialchars($_POST['publicname'], ENT_QUOTES) . "'," . (($_POST['allowemails'] != "on") ? 0 : 1) . ")")) { - $_SESSION['current_status'] = "createdaccountsuccessfully"; - } else { - $_SESSION['current_status'] = "couldnotcreate"; - } - } else { - $_SESSION['current_status'] = "emailcreateinvalid"; - } - } else { - $_SESSION['current_status'] = "createemailorpasswordblank"; - } - header('Location: ./'); -} -elseif (isset($_GET['forgot'])) { - if (isset($_POST['email'])) { - if (filter_var($_POST['email'], FILTER_VALIDATE_EMAIL) && EmailExists($_POST['email'])) { - $reset_email = Set_Password_Reset($_POST['email']); - if ($reset_email === true) { - $_SESSION['current_status'] = "resetemailsent"; - } elseif ($reset_email === "could not send") { - $_SESSION['current_status'] = "couldnotsendresetemail"; - } else { - $_SESSION['current_status'] = "couldnotsetresetlink"; - } - } else { - $_SESSION['current_status'] = "emailresetinvalid"; - } - } else { - $_SESSION['current_status'] = "resetemailblank"; - } - header('Location: ./'); -} -elseif (isset($_GET['passwordreset'])) { - if (isset($_GET['account']) && isset($_GET['code'])) { - $reset_email = Check_Password_Reset($_GET['account'], $_GET['code']); - if ($reset_email == true) { - $_SESSION['current_status'] = "showresetform"; - $_SESSION['reset_account'] = $_GET['account']; - } else { - $_SESSION['current_status'] = "resetlinkfailed"; - } - } else { - $_SESSION['current_status'] = "resetlinkinvalid"; - } - header('Location: ./'); -} -elseif (isset($_GET['resetpassword'])) { - if (isset($_POST['account']) && isset($_POST['password'])) { - if (filter_var($_POST['account'], FILTER_VALIDATE_EMAIL) && EmailExists($_POST['account'])) { - $reset_password_success = Reset_Password($_POST['password'], $_POST['account']); - if ($reset_password_success == true) { - $_SESSION['current_status'] = "passwordresetsuccessfully"; - } else { - $_SESSION['current_status'] = "couldnotresetpassword"; - } - } else { - $_SESSION['current_status'] = "passwordresetinvalid"; - } - } else { - $_SESSION['current_status'] = "newpasswordblank"; - } - header('Location: ./'); -} -elseif (isset($_GET['accountsettings'])) { - if (filter_var($_POST['email'], FILTER_VALIDATE_EMAIL) && - ($_POST['email'] == Get_User_Email($current_user) || !EmailExists($_POST['email']))) - { - $public_name = (isset($_POST['publicname']) && $_POST['publicname'] != "") ? $_POST['publicname'] : "Someone"; - if (query("UPDATE `users` SET `email`='" . $_POST['email'] . "', `public_name`='" . htmlspecialchars($public_name, ENT_QUOTES) . "', `allow_email`=" . (($_POST['allowemails'] != "on") ? 0 : 1) . " WHERE `id`=" . $current_user . ";")) { - $_SESSION['current_status'] = "accountsettingsupdated"; - } else { - $_SESSION['current_status'] = "couldnotupdatesettings"; - } - } else { - $_SESSION['current_status'] = "accountsettingsinvalid"; - } - header('Location: ./'); -} -elseif (isset($_GET['loggedout']) && $current_user <= 0) { - $notificationMessage = "You have been successfully logged out.
You will only be able to use the dictionary saved to your browser."; -} elseif ($current_user > 0) { - if ($notificationMessage != "") { - $notificationMessage = "Welcome back, " . Get_Public_Name_By_Id($current_user) . "!
" . $notificationMessage; - } else { - $notificationMessage = "Welcome back, " . Get_Public_Name_By_Id($current_user) . "!"; - } -} -?> \ No newline at end of file diff --git a/php/passwordreset.php b/php/passwordreset.php deleted file mode 100644 index 63d8dad..0000000 --- a/php/passwordreset.php +++ /dev/null @@ -1,53 +0,0 @@ -\r\n" . - "Reply-To: help@lexicon.ga\r\n" . - "X-Mailer: PHP/" . phpversion(); - - if (mail($to, $subject, $message, $header)) { - return true; - } else { - return "could not send"; - } - } else { - return false; - } -} - -function Check_Password_Reset($id, $code) { - $date = date("Y-m-d"); - $daterange = "'" . $date . " 00:00:00' AND '" . $date . " 23:59:59'"; - $query = "SELECT * FROM `users` WHERE `id`='" . $id . "' AND `password_reset_code`='" . $code . "' AND `password_reset_date` BETWEEN " . $daterange . ";"; - $users = query($query); - - if ($users && num_rows($users) === 1) { - return true; - } else { - return false; - } -} - -function Reset_Password($password, $email) { - $query = "UPDATE `users` SET `password`='" . crypt($password, $email) . "', `password_reset_date`='0000-00-00 00:00:00' WHERE `email`='" . $email . "';"; - $reset = query($query); - - if ($reset) { - return true; - } else { - return false; - } -} -?> \ No newline at end of file diff --git a/php/plugins/easycrypt.php b/php/plugins/easycrypt.php deleted file mode 100644 index 21d7356..0000000 --- a/php/plugins/easycrypt.php +++ /dev/null @@ -1,43 +0,0 @@ - \ No newline at end of file diff --git a/php/validation.php b/php/validation.php deleted file mode 100644 index e5f0252..0000000 --- a/php/validation.php +++ /dev/null @@ -1,104 +0,0 @@ - 0) { - return true; - } else { - return false; - } -} - -function Validate_Login($email, $password) { - $hashed_pw = crypt($password, $email); - $query = "SELECT * FROM `users` WHERE `email`='" . $email . "' AND `password`='" . $hashed_pw . "'"; - $users = query($query); - - if ($users && num_rows($users) === 1) { - return true; - } else { - return false; - } -} - -function Get_User_Id($email) { - $query = "SELECT `id` FROM `users` WHERE `email`='" . $email . "'"; - $users = query($query); - - if ($users && num_rows($users) > 0) { - if (num_rows($users) === 1) { - $user = fetch($users); - return $user["id"]; - } else { - return "More than one user id returned!"; - } - } else { - return "No User"; - } -} - -function Get_User_Email($id) { - $query = "SELECT `email` FROM `users` WHERE `id`='" . $id . "'"; - $users = query($query); - - if ($users && num_rows($users) > 0) { - if (num_rows($users) === 1) { - $user = fetch($users); - return $user["email"]; - } else { - return "More than one user id returned!"; - } - } else { - return "No User"; - } -} - -function Get_Public_Name_By_Id($id) { - $query = "SELECT `public_name` FROM `users` WHERE `id`=" . $id . ";"; - $users = query($query); - - if ($users && num_rows($users) > 0) { - if (num_rows($users) === 1) { - $user = fetch($users); - return $user["public_name"]; - } else { - return "More than one public name returned!"; - } - } else { - return "No User"; - } -} - -function Get_Public_Name_By_Email($email) { - $query = "SELECT `public_name` FROM `users` WHERE `email`='" . $email . "';"; - $users = query($query); - - if ($users && num_rows($users) > 0) { - if (num_rows($users) === 1) { - $user = fetch($users); - return $user["public_name"]; - } else { - return "More than one public name returned!"; - } - } else { - return "No User"; - } -} - -function Get_Allow_Email_By_Id($id) { - $query = "SELECT `allow_email` FROM `users` WHERE `id`=" . $id . ";"; - $users = query($query); - - if ($users && num_rows($users) > 0) { - if (num_rows($users) === 1) { - $user = fetch($users); - return $user["allow_email"]; - } else { - return "More than one user returned!"; - } - } else { - return "No User"; - } -} -?> \ No newline at end of file diff --git a/favicon.ico b/public/favicon.ico similarity index 100% rename from favicon.ico rename to public/favicon.ico diff --git a/public/index.html b/public/index.html new file mode 100644 index 0000000..ec9eef0 --- /dev/null +++ b/public/index.html @@ -0,0 +1,17 @@ + + + + + +
-
-
-
-
- );
- } else {
- return (
-
- );
- }
- }
-
- show() {
- this.setState({
- display: true
- });
- }
-
- hide() {
- if (this.props.onHide) {
- this.props.onHide();
- }
-
- this.setState({
- display: false
- });
- }
-
- render() {
- return (
-
-
-
-
-
-
-
- {this.props.children}
-
-
-
- {this.conditionalDisplay()}
-
- );
- }
-}
\ No newline at end of file
diff --git a/src/components/display/InfoDisplay.jsx b/src/components/display/InfoDisplay.jsx
deleted file mode 100644
index 6553da0..0000000
--- a/src/components/display/InfoDisplay.jsx
+++ /dev/null
@@ -1,121 +0,0 @@
-// import React from 'react';
-import Inferno from 'inferno';
-import Component from 'inferno-component';
-import marked from 'marked';
-
-import {WordForm} from '../forms/WordForm';
-import {Button} from '../input/Button';
-
-const saveIcon = 💾;
-const editIcon = 🖉;
-
-// A component to show dictionary information in a tabbed interface.
-// export class InfoDisplay extends React.Component {
-export class InfoDisplay extends Component {
- constructor(props) {
- super(props);
-
- this.state = {
- isDisplayed: props.startDisplayed || false,
- tabDisplay: 0
- };
- }
-
- showTabbedInterface() {
- if (this.state.isDisplayed) {
- return (
-
-
-
- );
- }
- }
-
- toggleDisplay() {
- this.setState({
- isDisplayed: !this.state.isDisplayed
- });
- }
-
- displaySelectedTab() {
- switch(this.state.tabDisplay) {
- case 1: {
- return (
-
- {this.showDetails()}
-
- );
- break;
- }
- default: {
- return (
-
- {this.showDescription()}
-
- );
- break;
- }
- }
- }
-
- showDescription() {
- return (
-
- );
- }
-
- showDetails() {
- return (
-
-
-
- );
- }
-
- changeTab(tabNumber) {
- this.setState({
- tabDisplay: tabNumber
- });
- }
-
- render() {
- return (
- - Created By {this.props.details.createdBy} -
- -- {this.props.numberOfWords} Total Word{(this.props.numberOfWords !== 1) ? 's' : ''} -
- -- {(!this.props.isComplete) ? 'Note: This dictionary is not yet complete and is likely to change.' : ''} -
- -
-
- );
- }
-}
-
-InfoDisplay.defaultProps = {
- isEditing: false
-}
\ No newline at end of file
diff --git a/src/components/display/Word.jsx b/src/components/display/Word.jsx
deleted file mode 100644
index c405b4b..0000000
--- a/src/components/display/Word.jsx
+++ /dev/null
@@ -1,174 +0,0 @@
-// import React from 'react';
-import Inferno from 'inferno';
-import Component from 'inferno-component';
-import marked from 'marked';
-
-import {WordForm} from '../forms/WordForm';
-import {Button} from '../input/Button';
-
-const saveIcon = 💾;
-const editIcon = 🖉;
-
-// export class Word extends React.Component {
-export class Word extends Component {
- constructor(props) {
- super(props);
-
- this.state = {
- editWord: false,
- editName: false,
- editPronunciation: false,
- editPartOfSpeech: false,
- editSimpleDefinition: false,
- editLongDefinition: false
- };
- }
-
- /*
- {
- name: word,
- pronunciation: pronunciation,
- partOfSpeech: ((partOfSpeech.length > 0) ? partOfSpeech : " "),
- simpleDefinition: simpleDefinition,
- longDefinition: longDefinition,
- wordId: currentDictionary.nextWordId++
- }
- */
-
- showName() {
- return (
-
- {this.props.name}
-
- );
- }
-
- showPronunciation() {
- if (this.props.pronunciation !== '') {
- return (
-
- {this.props.pronunciation}
-
- );
- }
- }
-
- showPartOfSpeech() {
- if (this.props.partOfSpeech !== '') {
- return (
-
- {this.props.partOfSpeech}
-
- );
- }
- }
-
- showSimpleDefinition() {
- if (this.props.simpleDefinition !== '') {
- return (
-
- {this.props.simpleDefinition}
-
- );
- }
- }
-
- showLongDefinition() {
- if (this.props.longDefinition !== '') {
- return (
-
- );
- }
- }
-
- showWordOrEdit() {
- if (this.state.editWord) {
- return (
-
-
- );
- }
- }
-
- showManagementArea() {
- if (this.props.isEditing) {
- if (this.state.editWord) {
- return (
-
- {this.showName()}
-
- {this.showPronunciation()}
-
- {this.showPartOfSpeech()}
-
-
-
-
-
- {this.showSimpleDefinition()}
-
- {this.showLongDefinition()}
-
-
-