From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 18 Apr 2011 09:09:59 +0000 (+0400)
Subject: filter dialog: display parsed date when checking; fix Check it button not using Dijit... 
X-Git-Tag: 1.5.3~37
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=aaba22250fd497ddbf17a73ca187e13516411454;p=tt-rss.git

filter dialog: display parsed date when checking; fix Check it button not using Dijit control
---

diff --git a/functions.js b/functions.js
index ee92674e..2a4268e8 100644
--- a/functions.js
+++ b/functions.js
@@ -628,7 +628,7 @@ function filterDlgCheckDate() {
 				var reply = JSON.parse(transport.responseText);
 
 				if (reply['result'] == true) {
-					alert(__("Date syntax appears to be correct."));
+					alert(__("Date syntax appears to be correct:") + " " + reply['date']);
 					return;
 				} else {
 					alert(__("Date syntax is incorrect."));
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 4f2ba252..0630d882 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -456,7 +456,8 @@
 			$date = db_escape_string($_REQUEST["date"]);
 			$date_parsed = strtotime($date);
 
-			print json_encode(array("result" => (bool)$date_parsed));
+			print json_encode(array("result" => (bool)$date_parsed,
+				"date" => date("c", $date_parsed)));
 			return;
 		}
 
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 78962dc6..02459ba8 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -466,7 +466,8 @@
 				 name=\"reg_exp\" value=\"$reg_exp\"/>";
 
 			print "<span id=\"filterDlg_dateChkBox\" style=\"display : none\">";
-			print "&nbsp;<button onclick=\"return filterDlgCheckDate()\">".
+			print "&nbsp;<button dojoType=\"dijit.form.Button\"
+				onclick=\"return filterDlgCheckDate()\">".
 				__('Check it')."</button>";
 			print "</span>";