axiom-team
/
feedless
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix publishing on other's profile and secrets modal closing on desktop

This commit is contained in:
Rogerio Chaves 2020-04-26 11:13:04 +02:00
parent de012758f9
commit d291483908
No known key found for this signature in database
GPG Key ID: E6AF5440509B1D94
9 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/public/js/desktop.js
View File

@ -11,7 +11,9 @@ document.onkeydown = (e) => {
const openModalFor = (elem, onConfirm, afterClose = null) => {
const overlay = elem.parentElement.querySelector(".overlay");
const modal = elem.parentElement.querySelector(".modal");
const confirmButtons = elem.parentElement.querySelectorAll(".modal-confirm");
const confirmButtons = elem.parentElement.querySelectorAll(
".js-modal-confirm"
);
const steps = elem.parentElement.querySelectorAll(".js-step");
overlay.style.display = "block";
@ -35,7 +37,7 @@ const openModalFor = (elem, onConfirm, afterClose = null) => {
steps.forEach((step, index) => {
if (currentStep == index) {
step.style.display = "block";
} else if (step.style.display == "block") {
} else if (step.style.display != "none") {
currentStep = index;
currentStep++;
if (currentStep < steps.length) step.style.display = "none";

4
app/public/js/mobile.js
View File

@ -17,7 +17,9 @@ if (composePost) {
const openModalFor = (elem, onConfirm, afterClose = null) => {
const overlay = elem.parentElement.querySelector(".overlay");
const modal = elem.parentElement.querySelector(".modal");
const confirmButtons = elem.parentElement.querySelectorAll(".modal-confirm");
const confirmButtons = elem.parentElement.querySelectorAll(
".js-modal-confirm"
);
const steps = elem.parentElement.querySelectorAll(".js-step");
const closeButton = elem.parentElement.querySelector(".js-modal-close");
const backButtons = elem.parentElement.querySelectorAll(".js-modal-back");

2
app/views/mobile/profile.ejs
View File

@ -33,7 +33,7 @@
<div class="tab-content">
<div class="tab-item js-tab-item">
<% if (posts.length > 0) { %>
<form action="/publish" method="POST" style="padding: 0px 8px 5px 8px;">
<form action="<%= profileUrl(profile.id, "/publish") %>" method="POST" style="padding: 0px 8px 5px 8px;">
<textarea name="message" class="compose-post js-compose-post" placeholder="Write something to <%= profile.name %>..."></textarea>
<div class="reverse-columns">
<input type="submit" value="Publish" style="display: none; margin: 5px 0" class="js-publish-button" />

4
app/views/mobile/secrets.ejs
View File

@ -38,10 +38,10 @@
<div class="modal-footer">
<% if (index == chat.messages.length - 1) { %>
<span></span>
<button class="modal-confirm">Close</button>
<button class="js-modal-confirm">Close</button>
<% } else { %>
<span></span>
<button class="modal-confirm">Next</button>
<button class="js-modal-confirm">Next</button>
<% } %>
</div>

4
app/views/mobile/secrets/_compose_multiple.ejs
View File

@ -7,7 +7,7 @@
<div class="modal-group js-step">
<div class="modal-footer">
<a href="javascript:;" class="js-modal-close" role="button">Close</a>
<button class="modal-confirm">Next</button>
<button class="js-modal-confirm">Next</button>
</div>
<div class="modal-header">Write a secret message</div>
<div class="modal-body">
@ -18,7 +18,7 @@
<div class="modal-group js-step" style="display: none">
<div class="modal-footer">
<a href="javascript:;" class="js-modal-back" role="button">⬅ Back</a>
<button class="modal-confirm js-secret-publish">Send</button>
<button class="js-modal-confirm js-secret-publish">Send</button>
<div style="display: none" class="js-sending-message"></div>
</div>
<div class="modal-header">Choose the recipients</div>

2
app/views/mobile/secrets/_compose_single.ejs
View File

@ -2,7 +2,7 @@
<div class="modal" style="display: none">
<div class="modal-footer">
<a href="javascript:;" class="js-modal-close" role="button">Close</a>
<button class="modal-confirm js-secret-publish">Send</button>
<button class="js-modal-confirm js-secret-publish">Send</button>
<div style="display: none" class="js-sending-message"></div>
</div>
<div class="modal-header">Write a secret message to <%= profile.name %></div>

4
app/views/secrets/_compose_multiple.ejs
View File

@ -11,7 +11,7 @@
</div>
<div class="modal-footer">
you can choose the recipients in the next step
<button class="modal-confirm">Next</button>
<button class="js-modal-confirm">Next</button>
</div>
</div>
<div class="js-step" style="display: none">
@ -33,7 +33,7 @@
</div>
<div class="modal-footer">
this message will disapear right after being read
<button class="modal-confirm js-secret-publish">Send</button>
<button class="js-modal-confirm js-secret-publish">Send</button>
<div style="display: none" class="js-sending-message"></div>
</div>
</div>

2
app/views/secrets/_compose_single.ejs
View File

@ -6,7 +6,7 @@
</div>
<div class="modal-footer">
this message will disapear right after being read
<button class="modal-confirm js-secret-publish">Send</button>
<button class="js-modal-confirm js-secret-publish">Send</button>
<div style="display: none" class="js-sending-message"></div>
</div>
</div>

4
app/views/secrets/_messages.ejs
View File

@ -40,10 +40,10 @@
<div class="modal-footer">
<% if (index == chat.messages.length - 1) { %>
after you close this box the message will be gone forever
<button class="modal-confirm">Close</button>
<button class="js-modal-confirm">Close</button>
<% } else { %>
<span></span>
<button class="modal-confirm">Next</button>
<button class="js-modal-confirm">Next</button>
<% } %>
</div>
</div>