ponymail-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject incubator-ponymail git commit: search phrase dropped from list.html URI if date span is yyyy-mm
Date Sun, 22 Jan 2017 18:53:41 GMT
Repository: incubator-ponymail
Updated Branches:
  refs/heads/master 7834846cd -> b56cf42e6


search phrase dropped from list.html URI if date span is yyyy-mm

This fixes #347

Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/b56cf42e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/b56cf42e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/b56cf42e

Branch: refs/heads/master
Commit: b56cf42e60780fc1de4b0e34c1959916ae3a3c7c
Parents: 7834846
Author: Sebb <sebb@apache.org>
Authored: Sun Jan 22 18:53:28 2017 +0000
Committer: Sebb <sebb@apache.org>
Committed: Sun Jan 22 18:53:28 2017 +0000

----------------------------------------------------------------------
 CHANGELOG.md                        | 1 +
 site/js/dev/ponymail_pagebuilder.js | 6 +++---
 site/js/ponymail.js                 | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b56cf42e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d1210f..f63d25d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -129,6 +129,7 @@
 - Make it clearer when you're not logged in. (#195)
 - list name not normalised when imported (#253)
 - GUI ignores date span in list.html URI if query is blank (#346)
+- search phrase dropped from list.html URI if date span is yyyy-mm (#347)
 
 ## CHANGES in 0.9b:
 

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b56cf42e/site/js/dev/ponymail_pagebuilder.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_pagebuilder.js b/site/js/dev/ponymail_pagebuilder.js
index 4191ea1..4617fb3 100644
--- a/site/js/dev/ponymail_pagebuilder.js
+++ b/site/js/dev/ponymail_pagebuilder.js
@@ -363,8 +363,10 @@ function getListInfo(list, xdomain, nopush) {
             if (xdomain.search(/:/) != -1) {
                 var arr = xdomain.split(/:/)
                 xdomain = arr[0]
+                current_query = unescape(arr[2] || '')
                 xlist = xdomain
-                if (arr[1].match(/-/) && !arr[1].match(/\|/)) {
+                // ensure query is not ignored
+                if (current_query == "" && arr[1].match(/-/) && !arr[1].match(/\|/))
{
                     var ya = arr[1].split(/-/)
                     toggleEmail(ya[0], ya[1], nopush)
                     current_retention = arr[1]
@@ -374,9 +376,7 @@ function getListInfo(list, xdomain, nopush) {
                     if (("x"+current_retention) != ("x"+arr[1])) {
                         current_retention = arr[1]
                         nopush = true
-                        
                     }
-                    current_query = unescape(arr[2])
                 }
             }
             if (xdomain.search(/@/) != -1) {

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b56cf42e/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index 089d149..d3f5699 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -3959,8 +3959,10 @@ function getListInfo(list, xdomain, nopush) {
             if (xdomain.search(/:/) != -1) {
                 var arr = xdomain.split(/:/)
                 xdomain = arr[0]
+                current_query = unescape(arr[2] || '')
                 xlist = xdomain
-                if (arr[1].match(/-/) && !arr[1].match(/\|/)) {
+                // ensure query is not ignored
+                if (current_query == "" && arr[1].match(/-/) && !arr[1].match(/\|/))
{
                     var ya = arr[1].split(/-/)
                     toggleEmail(ya[0], ya[1], nopush)
                     current_retention = arr[1]
@@ -3970,9 +3972,7 @@ function getListInfo(list, xdomain, nopush) {
                     if (("x"+current_retention) != ("x"+arr[1])) {
                         current_retention = arr[1]
                         nopush = true
-                        
                     }
-                    current_query = unescape(arr[2])
                 }
             }
             if (xdomain.search(/@/) != -1) {


Mime
View raw message