diff options
Diffstat (limited to 'juick-www')
| -rw-r--r-- | juick-www/build.gradle | 10 | ||||
| -rw-r--r-- | juick-www/src/main/java/com/juick/www/Settings.java | 3 | ||||
| -rw-r--r-- | juick-www/src/main/static/scripts.js | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/juick-www/build.gradle b/juick-www/build.gradle index 908b8d2f..78ef21e5 100644 --- a/juick-www/build.gradle +++ b/juick-www/build.gradle @@ -29,16 +29,16 @@ repositories { dependencies { compile project(':juick-core') compile project(':deps:com.juick.xmpp') - compile 'com.github.scribejava:scribejava-apis:3.1.0' + compile 'com.github.scribejava:scribejava-apis:3.2.0' compile 'org.apache.httpcomponents:httpclient:4.5.2' - compile 'org.apache.commons:commons-lang3:3.4' + compile 'org.apache.commons:commons-lang3:3.5' compile 'commons-io:commons-io:2.5' - compile "org.springframework:spring-jdbc:4.3.2.RELEASE" + compile "org.springframework:spring-jdbc:4.3.3.RELEASE" compile 'org.apache.commons:commons-dbcp2:2.1.1' compile 'net.coobird:thumbnailator:0.4.8' compile 'com.github.ooxi:serialized-php-parser:0.5.0' - compile 'net.jodah:failsafe:0.9.2' - compile 'com.mitchellbosecke:pebble:2.2.2' + compile 'net.jodah:failsafe:0.9.5' + compile 'com.mitchellbosecke:pebble:2.2.3' compile 'com.sun.mail:javax.mail:1.5.6' providedCompile 'javax.servlet:javax.servlet-api:3.1.0' providedRuntime 'mysql:mysql-connector-java:5.1.39' 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 5a159362..67f001b6 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; @@ -163,7 +164,7 @@ public class Settings { Path ao = Paths.get(imgPath, "ao", originalName); 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()); } 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(); } |