diff options
| author | Alex <alex@al-f.net> | 2018-08-09 16:13:50 +0200 |
|---|---|---|
| committer | Alexandre Flament <alex@al-f.net> | 2018-08-14 17:21:30 +0200 |
| commit | 3ba0d0516e5cabce8ebcc9a27c0fe069fa23f52c (patch) | |
| tree | dffd7311f1bf9bba9386101c67f5e03c30a53116 /searx/static/themes/simple/js/searx_src | |
| parent | 845ba79e7532dedad2bb96e5d68504b6729bee14 (diff) | |
simple theme update
- npm package update
- apply #1226
- implement vim help dialog
- display cookies and search URL with preferences
- allow to enable / disable Open Access DOI rewrite
- add a clear text button on the left of the search button
- implement #1011 : the HTML title page is not set when using POST
- remove searx/static/themes/simple/img/loader.gif
- use full width when only there are only images as result
Diffstat (limited to 'searx/static/themes/simple/js/searx_src')
4 files changed, 70 insertions, 31 deletions
diff --git a/searx/static/themes/simple/js/searx_src/00_searx_toolkit.js b/searx/static/themes/simple/js/searx_src/00_searx_toolkit.js index fca7e1669..fb524427d 100644 --- a/searx/static/themes/simple/js/searx_src/00_searx_toolkit.js +++ b/searx/static/themes/simple/js/searx_src/00_searx_toolkit.js @@ -147,9 +147,18 @@ } }; + searx.insertBefore = function (newNode, referenceNode) { + element.parentNode.insertBefore(newNode, referenceNode); + }; + + searx.insertAfter = function(newNode, referenceNode) { + referenceNode.parentNode.insertBefore(newNode, referenceNode.nextSibling); + }; + searx.on('.close', 'click', function(e) { var el = e.target || e.srcElement; - this.parentNode.style.display="None"; + this.parentNode.classList.add('invisible'); }); + return searx; })(window, document, window.searx); diff --git a/searx/static/themes/simple/js/searx_src/searx_keyboard.js b/searx/static/themes/simple/js/searx_src/searx_keyboard.js index 6365b5243..657d9ec93 100644 --- a/searx/static/themes/simple/js/searx_src/searx_keyboard.js +++ b/searx/static/themes/simple/js/searx_src/searx_keyboard.js @@ -116,7 +116,7 @@ searx.ready(function() { } }; - searx.on(document, "keyup", function(e) { + searx.on(document, "keydown", function(e) { // check for modifiers so we don't break browser's hotkeys if (vimKeys.hasOwnProperty(e.keyCode) && !e.ctrlKey && !e.altKey && !e.shiftKey && !e.metaKey) { var tagName = e.target.tagName.toLowerCase(); @@ -126,6 +126,7 @@ searx.ready(function() { } } else { if (e.target === document.body || tagName === 'a' || tagName === 'button') { + e.preventDefault(); vimKeys[e.keyCode].fun(); } } @@ -290,13 +291,7 @@ searx.ready(function() { }; } - function toggleHelp() { - var helpPanel = document.querySelector('#vim-hotkeys-help'); - if (helpPanel.length) { - helpPanel.classList.toggle('hidden'); - return; - } - + function initHelpContent(divElement) { var categories = {}; for (var k in vimKeys) { @@ -313,14 +308,9 @@ searx.ready(function() { return; } - var html = '<div id="vim-hotkeys-help" class="well vim-hotkeys-help">'; - html += '<div class="container-fluid">'; - - html += '<div class="row">'; - html += '<div class="col-sm-12">'; - html += '<h3>How to navigate searx with Vim-like hotkeys</h3>'; - html += '</div>'; // col-sm-12 - html += '</div>'; // row + var html = '<a href="#" class="close" aria-label="close" title="close">×</a>'; + html += '<h3>How to navigate searx with Vim-like hotkeys</h3>'; + html += '<table>'; for (var i = 0; i < sorted.length; i++) { var cat = categories[sorted[i]]; @@ -329,13 +319,11 @@ searx.ready(function() { var first = i % 2 === 0; if (first) { - html += '<div class="row dflex">'; + html += '<tr>'; } - html += '<div class="col-sm-' + (first && lastCategory ? 12 : 6) + ' dflex">'; + html += '<td>'; - html += '<div class="panel panel-default iflex">'; - html += '<div class="panel-heading">' + cat[0].cat + '</div>'; - html += '<div class="panel-body">'; + html += '<h4>' + cat[0].cat + '</h4>'; html += '<ul class="list-unstyled">'; for (var cj in cat) { @@ -343,18 +331,36 @@ searx.ready(function() { } html += '</ul>'; - html += '</div>'; // panel-body - html += '</div>'; // panel - html += '</div>'; // col-sm-* + html += '</td>'; // col-sm-* if (!first || lastCategory) { - html += '</div>'; // row + html += '</tr>'; // row } } - html += '</div>'; // container-fluid - html += '</div>'; // vim-hotkeys-help + html += '</table>'; + + divElement.innerHTML = html; + } + + function toggleHelp() { + var helpPanel = document.querySelector('#vim-hotkeys-help'); + console.log(helpPanel); + if (helpPanel === undefined || helpPanel === null) { + // first call + helpPanel = document.createElement('div'); + helpPanel.id = 'vim-hotkeys-help'; + helpPanel.className='dialog-modal'; + helpPanel.style='width: 40%'; + initHelpContent(helpPanel); + var body = document.getElementsByTagName('body')[0]; + body.appendChild(helpPanel); + } else { + // togggle hidden + helpPanel.classList.toggle('invisible'); + return; + } - $('body').append(html); } + }); diff --git a/searx/static/themes/simple/js/searx_src/searx_mapresult.js b/searx/static/themes/simple/js/searx_src/searx_mapresult.js index 823f64815..869d07da0 100644 --- a/searx/static/themes/simple/js/searx_src/searx_mapresult.js +++ b/searx/static/themes/simple/js/searx_src/searx_mapresult.js @@ -90,13 +90,14 @@ newHtml += "</td></tr>"; } } - result_table_loadicon.classList.add('invisible'); + result_table_loadicon.parentNode.removeChild(result_table_loadicon); result_table.classList.remove('invisible'); result_table.querySelector("tbody").innerHTML = newHtml; } }) .catch(function() { - result_table_loadicon.innerHTML = result_table_loadicon.innerHTML + "<p class=\"text-muted\">could not load data!</p>"; + result_table_loadicon.classList.remove('invisible'); + result_table_loadicon.innerHTML = "could not load data!"; }); } } diff --git a/searx/static/themes/simple/js/searx_src/searx_search.js b/searx/static/themes/simple/js/searx_src/searx_search.js index 1b93f9039..964be2194 100644 --- a/searx/static/themes/simple/js/searx_src/searx_search.js +++ b/searx/static/themes/simple/js/searx_src/searx_search.js @@ -33,6 +33,26 @@ } } + function createClearButton(qinput) { + var cs = document.getElementById('clear_search'); + var updateClearButton = function() { + if (qinput.value.length === 0) { + cs.classList.add("empty"); + } else { + cs.classList.remove("empty"); + } + }; + + // update status, event listener + updateClearButton(); + cs.addEventListener('click', function() { + qinput.value=''; + qinput.focus(); + updateClearButton(); + }); + qinput.addEventListener('keyup', updateClearButton, false); + } + searx.ready(function() { qinput = d.getElementById(qinput_id); @@ -46,6 +66,9 @@ } if (qinput !== null) { + // clear button + createClearButton(qinput); + // autocompleter if (searx.autocompleter) { searx.autocomplete = AutoComplete.call(w, { |