From 85fece2c4dbc6ef36ccd08d32e35501a1d131f81 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 27 Sep 2013 14:56:25 +0200
Subject: rcube_list_widget.rows is not an array - fixed checking if it's empty
 (#1489359)

---
 program/js/app.js  | 10 +++++-----
 program/js/list.js | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index 337a12156..2d8be37d7 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2832,10 +2832,10 @@ function rcube_webmail()
   {
     var len = a_uids.length,
       i, uid, all_deleted = true,
-      rows = this.message_list ? this.message_list.rows : [];
+      rows = this.message_list ? this.message_list.rows : {};
 
     if (len == 1) {
-      if (!rows.length || (rows[a_uids[0]] && !rows[a_uids[0]].deleted))
+      if (!this.message_list || (rows[a_uids[0]] && !rows[a_uids[0]].deleted))
         this.flag_as_deleted(a_uids);
       else
         this.flag_as_undeleted(a_uids);
@@ -2876,7 +2876,7 @@ function rcube_webmail()
     var r_uids = [],
       post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: 'delete'}),
       lock = this.display_message(this.get_label('markingmessage'), 'loading'),
-      rows = this.message_list ? this.message_list.rows : [],
+      rows = this.message_list ? this.message_list.rows : {},
       count = 0;
 
     for (var i=0, len=a_uids.length; i<len; i++) {
@@ -2896,7 +2896,7 @@ function rcube_webmail()
 
     // make sure there are no selected rows
     if (this.env.skip_deleted && this.message_list) {
-      if(!this.env.display_next)
+      if (!this.env.display_next)
         this.message_list.clear_selection();
       if (count < 0)
         post_data._count = (count*-1);
@@ -2920,7 +2920,7 @@ function rcube_webmail()
   this.flag_deleted_as_read = function(uids)
   {
     var icn_src, uid, i, len,
-      rows = this.message_list ? this.message_list.rows : [];
+      rows = this.message_list ? this.message_list.rows : {};
 
     uids = String(uids).split(',');
 
diff --git a/program/js/list.js b/program/js/list.js
index c2ad3f7c3..0f8d56c19 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -35,7 +35,7 @@ function rcube_list_widget(list, p)
   this.tbody;
   this.fixed_header;
   this.frame = null;
-  this.rows = [];
+  this.rows = {};
   this.selection = [];
   this.rowcount = 0;
   this.colcount = 0;
@@ -86,7 +86,7 @@ init: function()
   }
 
   if (this.tbody) {
-    this.rows = [];
+    this.rows = {};
     this.rowcount = 0;
 
     var r, len, rows = this.tbody.childNodes;
@@ -240,7 +240,7 @@ clear: function(sel)
     $(this.row_tagname() + ':not(.thead)', this.tbody).remove();
   }
 
-  this.rows = [];
+  this.rows = {};
   this.rowcount = 0;
 
   if (sel)
@@ -471,7 +471,7 @@ click_row: function(e, id)
   this.in_selection_before = false;
 
   // row was double clicked
-  if (this.rows && dblclicked && this.in_selection(id)) {
+  if (this.rowcount && dblclicked && this.in_selection(id)) {
     this.triggerEvent('dblclick');
     now = 0;
   }
@@ -703,7 +703,7 @@ update_expando: function(uid, expanded)
  */
 get_next_row: function()
 {
-  if (!this.rows)
+  if (!this.rowcount)
     return false;
 
   var last_selected_row = this.rows[this.last_selected],
@@ -717,7 +717,7 @@ get_next_row: function()
 
 get_prev_row: function()
 {
-  if (!this.rows)
+  if (!this.rowcount)
     return false;
 
   var last_selected_row = this.rows[this.last_selected],
@@ -969,7 +969,7 @@ in_selection: function(id)
  */
 select_all: function(filter)
 {
-  if (!this.rows || !this.rows.length)
+  if (!this.rowcount)
     return false;
 
   // reset but remember selection first
@@ -1001,7 +1001,7 @@ select_all: function(filter)
  */
 invert_selection: function()
 {
-  if (!this.rows || !this.rows.length)
+  if (!this.rowcount)
     return false;
 
   // remember old selection
-- 
cgit v1.2.3