close #60; checksum not available yet

Former-commit-id: e4e5c6469832a146c96ef0a3491e8d92b9a9814d [formerly 2dc8ac05e78ebef3735b54ef21a1a983f9fbb879] [formerly a02a19981511390ca1b3934ab65174138c7dad7a [formerly 9d19467ad5ad4fc5bfe711be5abe265eae0a38bc]]
Former-commit-id: 1b114aac29a96fe6374dc7dcc3eb21422155e1fb [formerly bd9ae2edd12367ae7e8e47903db74fe325095367]
Former-commit-id: 8344bd33d1878a08d1f66881729a93a31e8baa80
This commit is contained in:
Henrique Dias 2017-04-23 14:08:38 +01:00
parent 625797393b
commit f3408df0b5
5 changed files with 126 additions and 55 deletions

View File

@ -1,29 +1,31 @@
'use strict' 'use strict'
var tempID = '_fm_internal_temporary_id', var tempID = '_fm_internal_temporary_id'
ssl = (window.location.protocol === 'https:'), var ssl = (window.location.protocol === 'https:')
templates = {}, var templates = {}
selectedItems = [], var selectedItems = []
overlay, var overlay
clickOverlay var clickOverlay
// Removes an element, if exists, from an array // Removes an element, if exists, from an array
Array.prototype.removeElement = function (element) { Array.prototype.removeElement = function (element) {
var i = this.indexOf(element) var i = this.indexOf(element)
if (i !== -1) if (i !== -1) {
this.splice(i, 1) this.splice(i, 1)
}
} }
// Replaces an element inside an array by another // Replaces an element inside an array by another
Array.prototype.replaceElement = function (oldElement, newElement) { Array.prototype.replaceElement = function (oldElement, newElement) {
var i = this.indexOf(oldElement) var i = this.indexOf(oldElement)
if (i != -1) if (i !== -1) {
this[i] = newElement this[i] = newElement
}
} }
// Sends a costum event to itself // Sends a costum event to itself
Document.prototype.sendCostumEvent = function (text) { Document.prototype.sendCostumEvent = function (text) {
this.dispatchEvent(new CustomEvent(text)) this.dispatchEvent(new window.CustomEvent(text))
} }
// Gets the content of a cookie // Gets the content of a cookie
@ -46,8 +48,8 @@ function getCSSRule (rules) {
rules[i] = rules[i].toLowerCase() rules[i] = rules[i].toLowerCase()
} }
var result = null, let result = null
find = Array.prototype.find let find = Array.prototype.find
find.call(document.styleSheets, styleSheet => { find.call(document.styleSheets, styleSheet => {
result = find.call(styleSheet.cssRules, cssRule => { result = find.call(styleSheet.cssRules, cssRule => {
@ -55,10 +57,11 @@ function getCSSRule (rules) {
if (cssRule instanceof CSSStyleRule) { if (cssRule instanceof CSSStyleRule) {
for (let i = 0; i < rules.length; i++) { for (let i = 0; i < rules.length; i++) {
if (cssRule.selectorText.toLowerCase() == rules[i]) if (cssRule.selectorText.toLowerCase() === rules[i]) {
found = true found = true
} }
} }
}
return found return found
}) })
@ -102,9 +105,10 @@ buttons.setDone = function (name, success = true) {
i.innerHTML = this.previousState[name] i.innerHTML = this.previousState[name]
i.style.opacity = null i.style.opacity = null
if (selectedItems.length == 0 && document.getElementById('listing')) if (selectedItems.length === 0 && document.getElementById('listing')) {
document.sendCostumEvent('changed-selected') document.sendCostumEvent('changed-selected')
} }
}
let secondStep = () => { let secondStep = () => {
i.style.opacity = 0 i.style.opacity = 0
@ -113,9 +117,9 @@ buttons.setDone = function (name, success = true) {
let firstStep = () => { let firstStep = () => {
i.classList.remove('spin') i.classList.remove('spin')
i.innerHTML = success ? i.innerHTML = success
'done' : ? 'done'
'close' : 'close'
i.style.opacity = 1 i.style.opacity = 1
setTimeout(secondStep, 1000) setTimeout(secondStep, 1000)
} }
@ -137,15 +141,15 @@ webdav.convertURL = function (url) {
webdav.move = function (oldLink, newLink) { webdav.move = function (oldLink, newLink) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let request = new XMLHttpRequest(), let request = new window.XMLHttpRequest()
destination = newLink.replace(baseURL + '/', webdavURL + '/') let destination = newLink.replace(baseURL + '/', webdavURL + '/')
destination = window.location.origin + destination.substring(prefixURL.length) destination = window.location.origin + destination.substring(prefixURL.length)
request.open('MOVE', webdav.convertURL(oldLink), true) request.open('MOVE', webdav.convertURL(oldLink), true)
request.setRequestHeader('Destination', destination) request.setRequestHeader('Destination', destination)
request.onload = () => { request.onload = () => {
if (request.status == 201 || request.status == 204) { if (request.status === 201 || request.status === 204) {
resolve() resolve()
} else { } else {
reject(request.statusText) reject(request.statusText)
@ -158,7 +162,7 @@ webdav.move = function (oldLink, newLink) {
webdav.put = function (link, body, headers = {}) { webdav.put = function (link, body, headers = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let request = new XMLHttpRequest() let request = new window.XMLHttpRequest()
request.open('PUT', webdav.convertURL(link), true) request.open('PUT', webdav.convertURL(link), true)
for (let key in headers) { for (let key in headers) {
@ -177,12 +181,33 @@ webdav.put = function (link, body, headers = {}) {
}) })
} }
webdav.propfind = function (link, body, headers = {}) {
return new Promise((resolve, reject) => {
let request = new window.XMLHttpRequest()
request.open('PROPFIND', webdav.convertURL(link), true)
for (let key in headers) {
request.setRequestHeader(key, headers[key])
}
request.onload = () => {
if (request.status < 300) {
resolve(request.responseText)
} else {
reject(request.statusText)
}
}
request.onerror = () => reject(request.statusText)
request.send(body)
})
}
webdav.delete = function (link) { webdav.delete = function (link) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let request = new XMLHttpRequest() let request = new window.XMLHttpRequest()
request.open('DELETE', webdav.convertURL(link), true) request.open('DELETE', webdav.convertURL(link), true)
request.onload = () => { request.onload = () => {
if (request.status == 204) { if (request.status === 204) {
resolve() resolve()
} else { } else {
reject(request.statusText) reject(request.statusText)
@ -195,10 +220,10 @@ webdav.delete = function (link) {
webdav.new = function (link) { webdav.new = function (link) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let request = new XMLHttpRequest() let request = new window.XMLHttpRequest()
request.open((link.endsWith('/') ? 'MKCOL' : 'PUT'), webdav.convertURL(link), true) request.open((link.endsWith('/') ? 'MKCOL' : 'PUT'), webdav.convertURL(link), true)
request.onload = () => { request.onload = () => {
if (request.status == 201) { if (request.status === 201) {
resolve() resolve()
} else { } else {
reject(request.statusText) reject(request.statusText)
@ -217,10 +242,9 @@ webdav.new = function (link) {
function closePrompt (event) { function closePrompt (event) {
let prompt = document.querySelector('.prompt') let prompt = document.querySelector('.prompt')
if (!prompt) if (!prompt) return
return
if (typeof event != 'undefined') { if (typeof event !== 'undefined') {
event.preventDefault() event.preventDefault()
} }
@ -236,7 +260,7 @@ function notImplemented (event) {
event.preventDefault() event.preventDefault()
clickOverlay.click() clickOverlay.click()
let clone = document.importNode(templates.info.content, true) let clone = document.importNode(templates.message.content, true)
clone.querySelector('h3').innerHTML = 'Not implemented' clone.querySelector('h3').innerHTML = 'Not implemented'
clone.querySelector('p').innerHTML = "Sorry, but this feature wasn't implemented yet." clone.querySelector('p').innerHTML = "Sorry, but this feature wasn't implemented yet."
@ -251,19 +275,20 @@ var preventDefault = function (event) {
} }
function logoutEvent (event) { function logoutEvent (event) {
let request = new XMLHttpRequest() let request = new window.XMLHttpRequest()
request.open('GET', window.location.pathname, true, 'username', 'password') request.open('GET', window.location.pathname, true, 'username', 'password')
request.send() request.send()
request.onreadystatechange = function () { request.onreadystatechange = function () {
if (request.readyState == 4) { if (request.readyState === 4) {
window.location = '/' window.location = '/'
} }
} }
} }
function openEvent (event) { function openEvent (event) {
if (event.currentTarget.classList.contains('disabled')) if (event.currentTarget.classList.contains('disabled')) {
return false return false
}
let link = '?raw=true' let link = '?raw=true'
@ -277,12 +302,44 @@ function openEvent (event) {
return false return false
} }
function infoEvent (event) {
event.preventDefault()
if (event.currentTarget.classList.contains('disabled')) {
return
}
let link
if (selectedItems.length) {
link = document.getElementById(selectedItems[0]).dataset.url
} else {
link = window.location.pathname
}
webdav.propfind(link)
.then((text) => {
let parser = new window.DOMParser()
let xml = parser.parseFromString(text, 'text/xml')
let clone = document.importNode(templates.info.content, true)
clone.getElementById('display_name').innerHTML = xml.getElementsByTagName('displayname')[0].innerHTML
clone.getElementById('content_length').innerHTML = xml.getElementsByTagName('getcontentlength')[0].innerHTML
clone.getElementById('last_modified').innerHTML = xml.getElementsByTagName('getlastmodified')[0].innerHTML
document.querySelector('body').appendChild(clone)
document.querySelector('.overlay').classList.add('active')
document.querySelector('.prompt').classList.add('active')
})
.catch(e => {
buttons.setDone('info', false)
console.log(e)
})
}
function deleteOnSingleFile () { function deleteOnSingleFile () {
closePrompt() closePrompt()
buttons.setLoading('delete') buttons.setLoading('delete')
let promises = []
webdav.delete(window.location.pathname) webdav.delete(window.location.pathname)
.then(() => { .then(() => {
window.location.pathname = removeLastDirectoryPartOf(window.location.pathname) window.location.pathname = removeLastDirectoryPartOf(window.location.pathname)
@ -355,7 +412,7 @@ function resetSearchText () {
} }
function searchEvent (event) { function searchEvent (event) {
if (this.value.length == 0) { if (this.value.length === 0) {
resetSearchText() resetSearchText()
return return
} }
@ -379,7 +436,7 @@ function searchEvent (event) {
box.innerHTML = 'Press enter to execute.' box.innerHTML = 'Press enter to execute.'
} }
if (event.keyCode == 13) { if (event.keyCode === 13) {
box.innerHTML = '' box.innerHTML = ''
search.classList.add('ongoing') search.classList.add('ongoing')
@ -392,7 +449,7 @@ function searchEvent (event) {
let protocol = ssl ? 'wss:' : 'ws:' let protocol = ssl ? 'wss:' : 'ws:'
if (supported && user.AllowCommands) { if (supported && user.AllowCommands) {
let conn = new WebSocket(`${protocol}//${url}?command=true`) let conn = new window.WebSocket(`${protocol}//${url}?command=true`)
conn.onopen = function () { conn.onopen = function () {
conn.send(value) conn.send(value)
@ -413,8 +470,8 @@ function searchEvent (event) {
box.innerHTML = '<ul></ul>' box.innerHTML = '<ul></ul>'
let ul = box.querySelector('ul'), let ul = box.querySelector('ul')
conn = new WebSocket(`${protocol}//${url}?search=true`) let conn = new window.WebSocket(`${protocol}//${url}?search=true`)
conn.onopen = function () { conn.onopen = function () {
conn.send(value) conn.send(value)
@ -432,11 +489,11 @@ function searchEvent (event) {
} }
function setupSearch () { function setupSearch () {
let search = document.getElementById('search'), let search = document.getElementById('search')
searchInput = search.querySelector('input'), let searchInput = search.querySelector('input')
searchDiv = search.querySelector('div'), let searchDiv = search.querySelector('div')
hover = false, let hover = false
focus = false let focus = false
resetSearchText() resetSearchText()
@ -452,15 +509,13 @@ function setupSearch () {
searchInput.addEventListener('blur', event => { searchInput.addEventListener('blur', event => {
focus = false focus = false
if (hover) if (hover) return
return
search.classList.remove('active') search.classList.remove('active')
}) })
search.addEventListener('mouseleave', event => { search.addEventListener('mouseleave', event => {
hover = false hover = false
if (focus) if (focus) return
return
search.classList.remove('active') search.classList.remove('active')
}) })
@ -487,17 +542,17 @@ function openHelp (event) {
} }
window.addEventListener('keydown', (event) => { window.addEventListener('keydown', (event) => {
if (event.keyCode == 27) { if (event.keyCode === 27) {
if (document.querySelector('.help.active')) { if (document.querySelector('.help.active')) {
closeHelp(event) closeHelp(event)
} }
} }
if (event.keyCode == 46) { if (event.keyCode === 46) {
deleteEvent(event) deleteEvent(event)
} }
if (event.keyCode == 112) { if (event.keyCode === 112) {
event.preventDefault() event.preventDefault()
openHelp(event) openHelp(event)
} }
@ -517,13 +572,16 @@ document.addEventListener('DOMContentLoaded', function (event) {
buttons.open = document.getElementById('open') buttons.open = document.getElementById('open')
buttons.delete = document.getElementById('delete') buttons.delete = document.getElementById('delete')
buttons.previous = document.getElementById('previous') buttons.previous = document.getElementById('previous')
buttons.info = document.getElementById('info')
// Attach event listeners // Attach event listeners
buttons.logout.addEventListener('click', logoutEvent) buttons.logout.addEventListener('click', logoutEvent)
buttons.open.addEventListener('click', openEvent) buttons.open.addEventListener('click', openEvent)
buttons.info.addEventListener('click', infoEvent)
templates.question = document.querySelector('#question-template') templates.question = document.querySelector('#question-template')
templates.info = document.querySelector('#info-template') templates.info = document.querySelector('#info-template')
templates.message = document.querySelector('#message-template')
templates.move = document.querySelector('#move-template') templates.move = document.querySelector('#move-template')
if (user.AllowEdit) { if (user.AllowEdit) {

View File

@ -203,6 +203,7 @@ listing.handleSelectionChange = function (event) {
if (selectedNumber > 1) { if (selectedNumber > 1) {
buttons.open.classList.add('disabled') buttons.open.classList.add('disabled')
buttons.rename.classList.add('disabled') buttons.rename.classList.add('disabled')
buttons.info.classList.add('disabled')
} }
if (selectedNumber == 1) { if (selectedNumber == 1) {
@ -212,6 +213,7 @@ listing.handleSelectionChange = function (event) {
buttons.open.classList.remove('disabled') buttons.open.classList.remove('disabled')
} }
buttons.info.classList.remove('disabled')
buttons.rename.classList.remove('disabled') buttons.rename.classList.remove('disabled')
} }

View File

@ -167,7 +167,7 @@
{{- end }} {{- end }}
</div> </div>
<div class="action" id="info" onclick="notImplemented(event);"> <div class="action" id="info">
<i class="material-icons" title="Info">info</i><span>Info</span> <i class="material-icons" title="Info">info</i><span>Info</span>
</div> </div>
</div> </div>
@ -210,6 +210,18 @@
</template> </template>
<template id="info-template"> <template id="info-template">
<div class="prompt">
<h3>File Information</h3>
<p><strong>Display Name:</strong> <span id="display_name"></span></p>
<p><strong>Content Length:</strong> <span id="content_length"></span> Bytes</p>
<p><strong>Last Modified:</strong> <span id="last_modified"></span></p>
<div>
<button type="submit" onclick="closePrompt(event);" class="ok">OK</button>
</div>
</div>
</template>
<template id="message-template">
<div class="prompt"> <div class="prompt">
<h3></h3> <h3></h3>
<p></p> <p></p>
@ -220,7 +232,6 @@
</template> </template>
<template id="move-template"> <template id="move-template">
<!-- TODO: And the back button? :) -->
<form class="prompt"> <form class="prompt">
<h3>Move</h3> <h3>Move</h3>
<p>Choose new house for your file(s)/folder(s):</p> <p>Choose new house for your file(s)/folder(s):</p>

View File

@ -1 +1 @@
75422c223db54a8cbea454f33339c9b40d0e1dae bbb145fc8bd2b1a8c6896fb345e858cb02187a9d

View File

@ -4,6 +4,6 @@ go get github.com/jteeuwen/go-bindata/go-bindata
go-bindata -pkg assets -prefix "_embed" \ go-bindata -pkg assets -prefix "_embed" \
-o assets/binary.go -ignore "^.*theme-([^g]|g[^i]|gi[^t]|git[^h]|gith[^u]|githu[^b]).*\.js$" \ -o assets/binary.go -ignore "^.*theme-([^g]|g[^i]|gi[^t]|git[^h]|gith[^u]|githu[^b]).*\.js$" \
_embed/templates/... _embed/public/js/... _embed/public/css/... _embed/public/ace/src-min/... _embed/templates/... _embed/public/js/... _embed/public/css/... _embed/public/ace/src-min/... \
git add -A git add -A