From b4b9dfff3b074ba8961fd84b1f8193aff4756e37 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 1 Nov 2016 22:17:33 +0300
Subject: fix compatibility with vim-like navigation plugins

---
 juick-www/src/main/static/scripts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'juick-www/src')

diff --git a/juick-www/src/main/static/scripts.js b/juick-www/src/main/static/scripts.js
index ebeba198..d368cacd 100644
--- a/juick-www/src/main/static/scripts.js
+++ b/juick-www/src/main/static/scripts.js
@@ -657,7 +657,7 @@ ready(function () {
     });
     document.querySelectorAll('.ir a').forEach(function(e) {
         e.addEventListener('click', function (e) {
-            var fname = e.target.parentNode.getAttribute('data-fname');
+            var fname = e.target.closest('[data-fname]').getAttribute('data-fname');
             if (!showPhotoDialog(fname)) {
                 e.preventDefault();
             }
-- 
cgit v1.2.3


From 38071510b3888f5a4edb31705953a0995256d882 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 2 Nov 2016 10:11:28 +0300
Subject: fix avatar replacing

---
 juick-www/src/main/java/com/juick/www/Settings.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'juick-www/src')

diff --git a/juick-www/src/main/java/com/juick/www/Settings.java b/juick-www/src/main/java/com/juick/www/Settings.java
index 0602bff1..abe588fe 100644
--- a/juick-www/src/main/java/com/juick/www/Settings.java
+++ b/juick-www/src/main/java/com/juick/www/Settings.java
@@ -46,6 +46,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -161,7 +162,7 @@ public class Settings {
                     Path ao = Paths.get(imgPath, "ao", targetName);
                     Path a = Paths.get(imgPath, "a", targetName);
                     Path as = Paths.get(imgPath, "as", targetName);
-                    Files.move(Paths.get(Utils.getTmpDir(), avatarTmpPath), ao);
+                    Files.move(Paths.get(Utils.getTmpDir(), avatarTmpPath), ao, StandardCopyOption.REPLACE_EXISTING);
                     Thumbnails.of(ao.toFile()).size(96, 96).toFile(a.toFile());
                     Thumbnails.of(ao.toFile()).size(32, 32).toFile(as.toFile());
                 }
-- 
cgit v1.2.3