From c511f5d7c855b915baac7a014fbfaba974323537 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 30 Oct 2013 15:41:29 +0100
Subject: Eliminate "blinking" loading icon in browser on messages selection -
 do not assign location.href to the same value as it is

---
 program/js/app.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'program/js/app.js')

diff --git a/program/js/app.js b/program/js/app.js
index 81b796ec1..42cbaa6f9 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2062,12 +2062,14 @@ function rcube_webmail()
 
     if (name && (frame = this.get_frame_element(name))) {
       if (!show && (win = this.get_frame_window(name))) {
-        if (win.stop)
-          win.stop();
-        else // IE
-          win.document.execCommand('Stop');
+        if (win.location.href.indexOf(this.env.blankpage) < 0) {
+          if (win.stop)
+            win.stop();
+          else // IE
+            win.document.execCommand('Stop');
 
-        win.location.href = this.env.blankpage;
+          win.location.href = this.env.blankpage;
+        }
       }
       else if (!bw.safari && !bw.konq)
         $(frame)[show ? 'show' : 'hide']();
-- 
cgit v1.2.3


From 8f8e263977cc356bf754236ed0182515b26337ca Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 30 Oct 2013 16:06:27 +0100
Subject: CS fixes

---
 program/js/app.js  | 9 ++++++---
 program/js/list.js | 7 ++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'program/js/app.js')

diff --git a/program/js/app.js b/program/js/app.js
index 42cbaa6f9..55dea3620 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3032,9 +3032,12 @@ function rcube_webmail()
   // test if purge command is allowed
   this.purge_mailbox_test = function()
   {
-    return (this.env.exists && (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox
-      || this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter))
-      || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))));
+    return (this.env.exists && (
+      this.env.mailbox == this.env.trash_mailbox
+      || this.env.mailbox == this.env.junk_mailbox
+      || this.env.mailbox.indexOf(this.env.trash_mailbox + this.env.delimiter) == 0
+      || this.env.mailbox.indexOf(this.env.junk_mailbox + this.env.delimiter) == 0
+    ));
   };
 
 
diff --git a/program/js/list.js b/program/js/list.js
index a814c325c..46d9d2757 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -1245,14 +1245,15 @@ scrollto: function(id)
       scroll_to = Number(row.offsetTop);
     }
 
-    if(this.fixed_header)
+    if (this.fixed_header)
       head_offset = Number(this.thead.offsetHeight);
-    
+
     // if row is above the frame (or behind header)
     if (scroll_to < Number(this.frame.scrollTop) + head_offset) {
       // scroll window so that row isn't behind header
       this.frame.scrollTop = scroll_to - head_offset;
-    } else if (scroll_to + Number(row.offsetHeight) > Number(this.frame.scrollTop) + Number(this.frame.offsetHeight))
+    }
+    else if (scroll_to + Number(row.offsetHeight) > Number(this.frame.scrollTop) + Number(this.frame.offsetHeight))
       this.frame.scrollTop = (scroll_to + Number(row.offsetHeight)) - Number(this.frame.offsetHeight);
   }
 },
-- 
cgit v1.2.3