From dee08f12e3f90f9f5e0d765266fc60f38fe06373 Mon Sep 17 00:00:00 2001 From: Maxim Lihachev Date: Tue, 8 Nov 2016 17:02:14 +0500 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=81=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF=D1=80=D0=B8=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=86=D1=8B=20=D0=B1=D0=B5=D0=B7=20=D0=BF?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/feminitives.js | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/js/feminitives.js b/js/feminitives.js index 86cb7c7..b170aeb 100644 --- a/js/feminitives.js +++ b/js/feminitives.js @@ -281,23 +281,28 @@ function get_wiktionary(term) { //Создание и вывод феминитива function tr(word) { - HTML.dict().innerHTML = ""; - HTML.content().innerHTML = ""; - //Исходное слово var wd = word || HTML.input().value.trim().split(" ")[0]; - //Вывод дефиниции - get_wiktionary(wd); + if (wd) { + HTML.dict().innerHTML = ""; + HTML.content().innerHTML = ""; + + //Вывод дефиниции + get_wiktionary(wd); - var feminitives = make_feminitives(wd); + var feminitives = make_feminitives(wd); - //Вывод информации - HTML.dict().innerHTML = feminitives[1].join(" | "); - HTML.content().innerHTML = feminitives[0].replace(/(.)/, s => s.toUpperCase()); + //Вывод информации + HTML.dict().innerHTML = feminitives[1].join(" | ") + || "Это слово и так прекрасно. Оставим его как есть."; + HTML.content().innerHTML = feminitives[0].replace(/(.)/, s => s.toUpperCase()); - // - HTML.input().value = wd; + // + HTML.input().value = wd; + } else { + show_help(); + } } //------------------------------------------------------------------------------ @@ -317,19 +322,22 @@ function init(container) { //Разбор адреса querySt = function(option) { - gy = window.location.search.substring(1).split("&"); + gy = window.location.search.substring(1).split("&"); - for (i=0; i < gy.length; i++) { - ft = gy[i].split("="); - if (ft[0] == option) { - return ft[1]; + for (i=0; i < gy.length; i++) { + ft = gy[i].split("="); + if (ft[0] == option) { + return ft[1]; + } } - } } - if (window.location.search.substring(1)) { - HTML.input().value = decodeURIComponent(querySt("word").replace(/\+/g," ")); + var query = decodeURIComponent(querySt("word")); + if (query !== 'undefined') { + HTML.input().value = query.replace(/\+/g," "); tr(); + } else { + show_help(); } }