diff options
| -rwxr-xr-x | classes/feeds.php | 4 | ||||
| -rw-r--r-- | js/Feeds.js | 22 |
2 files changed, 24 insertions, 2 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 815673491..86fa45ea7 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -730,10 +730,10 @@ class Feeds extends Handler_Protected { print "<section>"; print "<fieldset>"; - print "<input dojoType='dijit.form.ValidationTextBox' + print "<input dojoType='dijit.form.ValidationTextBox' id='search_query' style='font-size : 16px; width : 540px;' placeHolder=\"".T_sprintf("Search %s...", $this->getFeedTitle($active_feed_id, $is_cat))."\" - required='1' name='query' type='search' value=''>"; + name='query' type='search' value=''>"; print "</fieldset>"; if (DB_TYPE == "pgsql") { diff --git a/js/Feeds.js b/js/Feeds.js index cb3cc3612..459ccc4dd 100644 --- a/js/Feeds.js +++ b/js/Feeds.js @@ -552,6 +552,11 @@ define(["dojo/_base/declare"], function (declare) { execute: function () { if (this.validate()) { Feeds._search_query = this.attr('value'); + + // disallow empty queries + if (!Feeds._search_query.query) + Feeds._search_query = false; + this.hide(); Feeds.reloadCurrent(); } @@ -559,6 +564,23 @@ define(["dojo/_base/declare"], function (declare) { href: query }); + const tmph = dojo.connect(dialog, 'onLoad', function () { + dojo.disconnect(tmph); + + console.log('S_onload'); + + if (Feeds._search_query) { + if (Feeds._search_query.query) + dijit.byId('search_query') + .attr('value', Feeds._search_query.query); + + if (Feeds._search_query.search_language) + dijit.byId('search_language') + .attr('value', Feeds._search_query.search_language); + } + + }); + dialog.show(); }, updateRandom: function() { |