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

Merge pull request #7044 from MrPetovan/task/router

Browse Source 
Move mod/admin to src/Module/Admin
This commit is contained in:
Philipp
2019-05-02 18:26:30 +02:00
committed by GitHub
parent 07cb887885 b4b8c61daf
commit 774d04cd2f
97 changed files with 3031 additions and 3894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ var FileBrowser = {
// Click on album link
$(".fbrowser").on("click", ".folders a, .path a", function(e) {
e.preventDefault();
var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";
var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none&theme=frio";
FileBrowser.folder = this.dataset.folder;
FileBrowser.loadContent(url);
@@ -134,7 +134,7 @@ var FileBrowser = {
console.log(FileBrowser.event, this.dataset.filename, embed, FileBrowser.id);
parent.$("body").trigger(FileBrowser.event, [
$("body").trigger(FileBrowser.event, [
this.dataset.filename,
embed,
FileBrowser.id,
@@ -152,7 +152,7 @@ var FileBrowser = {
e.preventDefault();
FileBrowser.type = this.getAttribute("data-mode");
$(".fbrowser").removeClass().addClass("fbrowser " + FileBrowser.type);
url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none";
url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none&theme=frio";
FileBrowser.loadContent(url);
});
@@ -183,10 +183,7 @@ var FileBrowser = {
return;
}
// location = baseurl + "/fbrowser/image/?mode=none"+location['hash'];
// location.reload(true);
var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + FileBrowser.folder + "?mode=none";
var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + FileBrowser.folder + "?mode=none&theme=frio";
// load new content to fbrowser window
FileBrowser.loadContent(url);
}
@@ -214,10 +211,7 @@ var FileBrowser = {
return;
}
// location = baseurl + "/fbrowser/file/?mode=none"+location['hash'];
// location.reload(true);
var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none";
var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none&theme=frio";
// Load new content to fbrowser window
FileBrowser.loadContent(url);
}

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];