You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2016/09/05 14:48:07 UTC
[1/2] incubator-ponymail git commit: reword and tweak the email count
Repository: incubator-ponymail
Updated Branches:
refs/heads/coffee-and-cake a0d9ff371 -> 30a6a077e
reword and tweak the email count
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/dd8f45b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/dd8f45b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/dd8f45b8
Branch: refs/heads/coffee-and-cake
Commit: dd8f45b883fec280d703d9746203ca94a8d0196b
Parents: a0d9ff3
Author: Daniel Gruno <hu...@apache.org>
Authored: Mon Sep 5 16:47:37 2016 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Mon Sep 5 16:47:37 2016 +0200
----------------------------------------------------------------------
site/js/coffee/listview_basic.coffee | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/dd8f45b8/site/js/coffee/listview_basic.coffee
----------------------------------------------------------------------
diff --git a/site/js/coffee/listview_basic.coffee b/site/js/coffee/listview_basic.coffee
index 54c8e16..d1f075e 100644
--- a/site/js/coffee/listview_basic.coffee
+++ b/site/js/coffee/listview_basic.coffee
@@ -78,7 +78,7 @@ class BasicListView
### Show how many threads out of how many we are showing ###
f = pos+1
l = Math.min(@listsize, pos+rpp)
- dStat = new HTML('div', { style: {float: "left", width: "100%", fontSize: "80%", textAlign: "center"}}, "Showing items #{f} through #{l} out of #{@listsize}")
+ dStat = new HTML('div', { style: {float: "left", width: "100%", fontSize: "80%", textAlign: "center"}}, "Showing items #{f} through #{l} out of #{@listsize} results.")
@lv.inject(dStat)
### First, build the prev/next buttons if needed ###
@@ -165,12 +165,11 @@ class BasicListView
### countEmail: func for counting how many emails are in a thread ###
countEmail: (thread) ->
nc = 0
- if thread.children and isArray(thread.children)
+ if isArray(thread.children)
for item in thread.children
nc++
if item.children and isArray(item.children) and item.children.length > 0
- nnc = @countEmail(item)
- nc += nnc
+ nc += @countEmail(item)
return nc
### countPeople: func for counting how many people are in a thread ###
[2/2] incubator-ponymail git commit: regen JS
Posted by hu...@apache.org.
regen JS
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/30a6a077
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/30a6a077
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/30a6a077
Branch: refs/heads/coffee-and-cake
Commit: 30a6a077ea67fc814ee3036f0b88a2fff6298f5a
Parents: dd8f45b
Author: Daniel Gruno <hu...@apache.org>
Authored: Mon Sep 5 16:47:53 2016 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Mon Sep 5 16:47:53 2016 +0200
----------------------------------------------------------------------
site/js/ponymail-coffee.js | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/30a6a077/site/js/ponymail-coffee.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail-coffee.js b/site/js/ponymail-coffee.js
index 419ea51..040a94b 100644
--- a/site/js/ponymail-coffee.js
+++ b/site/js/ponymail-coffee.js
@@ -1398,7 +1398,7 @@ BasicListView = (function() {
fontSize: "80%",
textAlign: "center"
}
- }, "Showing items " + f + " through " + l + " out of " + this.listsize);
+ }, "Showing items " + f + " through " + l + " out of " + this.listsize + " results.");
this.lv.inject(dStat);
/* First, build the prev/next buttons if needed */
@@ -1519,16 +1519,15 @@ BasicListView = (function() {
/* countEmail: func for counting how many emails are in a thread */
BasicListView.prototype.countEmail = function(thread) {
- var item, j, len, nc, nnc, ref;
+ var item, j, len, nc, ref;
nc = 0;
- if (thread.children && isArray(thread.children)) {
+ if (isArray(thread.children)) {
ref = thread.children;
for (j = 0, len = ref.length; j < len; j++) {
item = ref[j];
nc++;
if (item.children && isArray(item.children) && item.children.length > 0) {
- nnc = this.countEmail(item);
- nc += nnc;
+ nc += this.countEmail(item);
}
}
}