oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-10 09:04:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure theme consistency when using filebrowser

Browse source 
- Send frio filebrowser result to current frame instead of parent one
This commit is contained in:
Hypolite Petovan 2019-04-25 22:06:27 -04:00
parent 611220cb53
commit a88df9b259
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
view/theme/frio/js/modal.js
View file

@ -120,7 +120,7 @@ Dialog.show = function(url, title) {
Dialog._get_url = function(type, name, id) {
var hash = name;
if (id !== undefined) hash = hash + "-" + id;
return "fbrowser/"+type+"/?mode=none#"+hash;
return "fbrowser/"+type+"/?mode=none&theme=frio#"+hash;
};
// Does load the filebrowser into the jot modal.
@ -148,7 +148,7 @@ Dialog._load = function(url) {
var type = $("#fb-type").attr("value");
// Try to fetch the hash form the url.
var match = url.match(/fbrowser\/[a-z]+\/\?mode=none(.*)/);
var match = url.match(/fbrowser\/[a-z]+\/.*(#.*)/);
if (match===null) return; //not fbrowser
var hash = match[1];