Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 09:50:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

rename the page template modal.php to none.php because it can be used for more than modals

Browse source
This commit is contained in:
rabuzarus 2016-05-15 13:41:37 +02:00
parent 8384ba833a
commit 64a2f2022b
9 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/filebrowser.js
View file

@ -95,7 +95,7 @@ var FileBrowser = {
$(".folders a, .path a").on("click", function(e){
e.preventDefault();
var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=modal";
var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";
// load new content to fbrowser window
$(".fbrowser").load(url,function(){
@ -161,10 +161,10 @@ var FileBrowser = {
$('#profile-rotator').hide();
return;
}
// location = baseurl + "/fbrowser/image/?mode=modal"+location['hash'];
// location = baseurl + "/fbrowser/image/?mode=none"+location['hash'];
// location.reload(true);
var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=modal"
var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"
// load new content to fbrowser window
$(".fbrowser").load(url,function(){
$(function() {FileBrowser.init(nickname, type, hash);});
@ -186,10 +186,10 @@ var FileBrowser = {
$('#profile-rotator').hide();
return;
}
// location = baseurl + "/fbrowser/file/?mode=modal"+location['hash'];
// location = baseurl + "/fbrowser/file/?mode=none"+location['hash'];
// location.reload(true);
var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=modal"
var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"
// load new content to fbrowser window
$(".fbrowser").load(url,function(){
$(function() {FileBrowser.init(nickname, type, hash);});

4
js/hovercard.js
View file

@ -126,7 +126,7 @@ function removeAllhoverCards(event,priorTo) {
// Ajax request to get json contact data
function getContactData(purl, url, actionOnSuccess) {
var postdata = {
mode : 'modal',
mode : 'none',
profileurl : purl,
datatype : 'json',
};
@ -224,7 +224,7 @@ function getHoverCardContent(purl, url, callback) {
// Ajax request to get the raw template content
function getHoverCardTemplate (url, callback) {
var postdata = {
mode: 'modal',
mode: 'none',
datatype: 'tpl'
};

6
js/modal.js
View file

@ -91,7 +91,7 @@ Dialog.show = function(url) {
Dialog._get_url = function(type, name, id) {
var hash = name;
if (id !== undefined) hash = hash + "-" + id;
return "fbrowser/"+type+"/?mode=modal#"+hash;
return "fbrowser/"+type+"/?mode=none#"+hash;
};
// does load the filebrowser into the jot modal
@ -119,7 +119,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=modal(.*)/);
var match = url.match(/fbrowser\/[a-z]+\/\?mode=none(.*)/);
var hash = match[1];
// initialize the filebrowser
@ -157,7 +157,7 @@ function loadModalTitle() {
function addToModal(url) {
var char = qOrAmp(url);
var url = url + char + 'mode=modal';
var url = url + char + 'mode=none';
var modal = $('#modal').modal();
modal