clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Apply suggestions from code review 

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
This commit is contained in:
Philipp 2022-11-26 23:34:16 +01:00 committed by Philipp
parent e60dfef0d0
commit 3607aa32ca
No known key found for this signature in database
GPG Key ID: 24A7501396EB5432
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Photo.php
View File

@ -185,7 +185,7 @@ class Photo
{ {
$photos = DBA::toArray( $photos = DBA::toArray(
DBA::p( DBA::p(
"SELECT DISTINCT(`album`) AS `albume` FROM `photo` WHERE `uid` = ? AND NOT `photo-type` IN (?, ?)", "SELECT DISTINCT(`album`) AS `album` FROM `photo` WHERE `uid` = ? AND NOT `photo-type` IN (?, ?)",
$uid, $uid,
static::CONTACT_AVATAR, static::CONTACT_AVATAR,
static::CONTACT_BANNER static::CONTACT_BANNER

8
view/js/filebrowser.js
View File

@ -60,11 +60,11 @@ const FileBrowser = {
init: function (nickname, type) { init: function (nickname, type) {
FileBrowser.nickname = nickname; FileBrowser.nickname = nickname;
FileBrowser.type = type; FileBrowser.type = type;
FileBrowser.event = "fbrowser." + type; FileBrowser.event = 'fbrowser.' + type;
if (location['hash'] !== "") { if (location['hash'] !== '') {
const h = location['hash'].replace('#', ''); const h = location['hash'].replace('#', '');
FileBrowser.event = FileBrowser.event + "." + h.split("-")[0]; FileBrowser.event = FileBrowser.event + '.' + h.split('-')[0];
FileBrowser.id = h.split("-")[1]; FileBrowser.id = h.split('-')[1];
} }
console.log('FileBrowser:', nickname, type, FileBrowser.event, FileBrowser.id); console.log('FileBrowser:', nickname, type, FileBrowser.event, FileBrowser.id);

6
view/js/main.js
View File

@ -166,7 +166,7 @@ $(function() {
/* event from comment textarea button popups */ /* event from comment textarea button popups */
/* insert returned bbcode at cursor position or replace selected text */ /* insert returned bbcode at cursor position or replace selected text */
$("body").on("fbrowser.photos.comment", function(e, filename, bbcode, id) { $('body').on('fbrowser.photos.comment', function(e, filename, bbcode, id) {
$.colorbox.close(); $.colorbox.close();
var textarea = document.getElementById("comment-edit-text-" +id); var textarea = document.getElementById("comment-edit-text-" +id);
var start = textarea.selectionStart; var start = textarea.selectionStart;
@ -1069,7 +1069,7 @@ var Dialog = {
* to the event handler * to the event handler
*/ */
doImageBrowser : function (name, id) { doImageBrowser : function (name, id) {
var url = Dialog._get_url("photos",name,id); var url = Dialog._get_url('photos', name, id);
return Dialog.show(url); return Dialog.show(url);
}, },
@ -1086,7 +1086,7 @@ var Dialog = {
* to the event handler * to the event handler
*/ */
doFileBrowser : function (name, id) { doFileBrowser : function (name, id) {
var url = Dialog._get_url("attachment",name,id); var url = Dialog._get_url('attachment', name, id);
return Dialog.show(url); return Dialog.show(url);
}, },

1
view/theme/frio/js/filebrowser.js
View File

@ -113,7 +113,6 @@ var FileBrowser = {
embed = '[url=' + this.dataset.link + '][img=' + this.dataset.img + ']' + this.dataset.alt + '[/img][/url]'; embed = '[url=' + this.dataset.link + '][img=' + this.dataset.img + ']' + this.dataset.alt + '[/img][/url]';
} }
if (FileBrowser.type === 'attachment') { if (FileBrowser.type === 'attachment') {
// attachment links are "baseurl/attach/id"; we need id
embed = '[attachment]' + this.dataset.link + '[/attachment]'; embed = '[attachment]' + this.dataset.link + '[/attachment]';
} }

2
view/theme/frio/js/modal.js
View File

@ -132,7 +132,7 @@ Dialog.show = function (url, title) {
Dialog._get_url = function (type, name, id) { Dialog._get_url = function (type, name, id) {
var hash = name; var hash = name;
if (id !== undefined) hash = hash + "-" + id; if (id !== undefined) hash = hash + "-" + id;
return "profile/" + localNickname + "/" + type + "/browser?mode=none&theme=frio#" + hash; return 'profile/' + localNickname + '/' + type + '/browser?mode=none&theme=frio#' + hash;
}; };
// Does load the filebrowser into the jot modal. // Does load the filebrowser into the jot modal.