github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/hacdias/caddy-filemanager

pull/144/head
fabioswartz 2016-12-30 11:36:33 +00:00
parent 07b8956073 698bdb7da8
commit 41cac9ae12
3 changed files with 90 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
_embed/public/js/common.js
View File

@ -167,25 +167,35 @@ function deleteEvent(event) {
buttons.delete.changeToDone(request.status != 204, html);
}
}
r.send();
request.send();
});
return false;
}
var searchEvent = function(event) {
let value = this.value,
search = document.getElementById('search'),
scrollable = document.querySelector('#search > div'),
box = document.querySelector('#search > div div');
function resetSearchText() {
let box = document.querySelector('#search > div div');
if (value.length == 0) {
box.innerHTML = "Search or use one of your supported commands: " + user.Commands.join(", ") + ".";
if (user.AllowCommands) {
box.innerHTML = `Search or use one of your supported commands: ${user.Commands.join(", ")} `;
} else {
box.innerHTML = "Type and press enter to search.";
}
}
function searchEvent(event) {
if (this.value.length == 0) {
resetSearchText();
return;
}
let pieces = value.split(' ');
let supported = false;
let value = this.value,
search = document.getElementById('search'),
scrollable = document.querySelector('#search > div'),
box = document.querySelector('#search > div div'),
pieces = value.split(' '),
supported = false;
user.Commands.forEach(function(cmd) {
if (cmd == pieces[0]) {
@ -193,7 +203,7 @@ var searchEvent = function(event) {
}
});
if (!supported) {
if (!supported || !user.AllowCommands) {
box.innerHTML = "Press enter to search."
} else {
box.innerHTML = "Press enter to execute."
@ -202,9 +212,16 @@ var searchEvent = function(event) {
if (event.keyCode == 13) {
box.innerHTML = '';
search.classList.add('ongoing');
let url = window.location.host + window.location.pathname;
if (document.getElementById("editor")) {
url = removeLastDirectoryPartOf(url);
}
if (supported && user.AllowCommands) {
let conn = new WebSocket(`ws://${url}?command=true`);
if (supported) {
var conn = new WebSocket('ws://' + window.location.host + window.location.pathname + '?command=true');
conn.onopen = function() {
conn.send(value);
};
@ -218,27 +235,69 @@ var searchEvent = function(event) {
search.classList.remove('ongoing');
reloadListing();
}
} else {
box.innerHTML = '<ul></ul>';
let ul = box.querySelector('ul');
var conn = new WebSocket('ws://' + window.location.host + window.location.pathname + '?search=true');
conn.onopen = function() {
conn.send(value);
};
return;
}
conn.onmessage = function(event) {
ul.innerHTML += '<li><a href="' + event.data + '">' + event.data + '</a></li>';
scrollable.scrollTop = scrollable.scrollHeight;
}
box.innerHTML = '<ul></ul>';
conn.onclose = function(event) {
search.classList.remove('ongoing');
}
let ul = box.querySelector('ul'),
conn = new WebSocket(`ws://${url}?search=true`);
conn.onopen = function() {
conn.send(value);
};
conn.onmessage = function(event) {
ul.innerHTML += '<li><a href="' + event.data + '">' + event.data + '</a></li>';
scrollable.scrollTop = scrollable.scrollHeight;
}
conn.onclose = function(event) {
search.classList.remove('ongoing');
}
}
}
function setupSearch() {
let search = document.getElementById("search"),
searchInput = search.querySelector("input"),
searchDiv = search.querySelector("div"),
hover = false,
focus = false;
resetSearchText();
searchInput.addEventListener('focus', event => {
focus = true;
search.classList.add('active');
});
searchDiv.addEventListener('mouseover', event => {
hover = true;
search.classList.add('active');
});
searchInput.addEventListener('blur', event => {
focus = false;
if (hover) return;
search.classList.remove('active');
});
search.addEventListener('mouseleave', event => {
hover = false;
if (focus) return;
search.classList.remove('active');
});
search.addEventListener("click", event => {
search.classList.add("active");
search.querySelector("input").focus();
});
searchInput.addEventListener('keyup', searchEvent);
}
/* * * * * * * * * * * * * * * *
* *
* BOOTSTRAP *
@ -258,5 +317,6 @@ document.addEventListener("DOMContentLoaded", function(event) {
buttons.delete.addEventListener("click", deleteEvent);
}
setupSearch();
return false;
});

40
_embed/public/js/listing.js
View File

@ -259,7 +259,7 @@ var redefineDownloadURLs = function() {
}
document.addEventListener('listing', event => {
document.addEventListener('DOMContentLoaded', event => {
// Handles the current view mode and adds the event to the button
handleViewType(document.getCookie("view-list"));
document.getElementById("view").addEventListener("click", viewEvent);
@ -283,43 +283,7 @@ document.addEventListener('listing', event => {
}
});
if (user.AllowCommands) {
let search = document.getElementById("search"),
searchInput = search.querySelector("input"),
searchDiv = search.querySelector("div"),
hover = false,
focus = false;
searchInput.addEventListener('focus', event => {
focus = true;
search.classList.add('active');
});
searchDiv.addEventListener('mouseover', event => {
hover = true;
search.classList.add('active');
});
searchInput.addEventListener('blur', event => {
focus = false;
if (hover) return;
search.classList.remove('active');
});
search.addEventListener('mouseleave', event => {
hover = false;
if (focus) return;
search.classList.remove('active');
});
search.addEventListener("click", event => {
search.classList.add("active");
search.querySelector("input").focus();
});
document.querySelector('#search > div div').innerHTML = "Search or use one of your supported commands: " + user.Commands.join(", ") + ".";
document.querySelector('#search input').addEventListener('keyup', searchEvent);
}
if (user.AllowEdit) {
// Enables rename button

4
_embed/templates/base.tmpl
View File

@ -32,16 +32,14 @@
<!-- TOP BAR -->
<div>
<div><p>File Manager</p></div>
{{ if .User.AllowCommands }}
<div id="search">
<i class="material-icons" title="Storage">storage</i>
<input type="text" placeholder="Search or execute a command...">
<div>
<div>Write your git, mercurial or svn command and press enter.</div>
<div>Loading...</div>
<p><i class="material-icons spin">autorenew</i></p>
</div>
</div>
{{ end }}
<div class="action" id="logout">
<i class="material-icons" title="Logout">exit_to_app</i> <span>Logout</span>