makes tooltip work with DOM element as an inpput

pull/1/head
LianaHus 6 years ago
parent de4dfadc12
commit ed01b037ab
  1. 8
      src/app/files/fileManager.js
  2. 9
      src/app/ui/tooltip.js

@ -149,7 +149,13 @@ class FileManager extends FileSystemApi {
}}>Save As Copy</button> }}>Save As Copy</button>
</div>` </div>`
} }
await toaster(yo`<div><i class="fas fa-exclamation-triangle text-info mr-1"></i><span class="text-primary">${this.currentRequest.from}</span> is modyfing <span class="text-primary">${path}</span></div>`, actions, { time: 4000 }) await toaster(yo`
<div>
<i class="fas fa-exclamation-triangle text-danger mr-1"></i>
<span>
${this.currentRequest.from}<span class="text-warning"> is modyfing </span>${path}
</span>
</div>`, actions, { time: 4000 })
if (reject) throw new Error(`set file operation on ${path} aborted by user.`) if (reject) throw new Error(`set file operation on ${path} aborted by user.`)
if (savedAsAnotherFile) return if (savedAsAnotherFile) return
} }

@ -24,7 +24,11 @@ class Toaster {
} }
render (tooltipText, action, opts) { render (tooltipText, action, opts) {
opts = defaultOptions(opts) opts = defaultOptions(opts)
let canShorten = true
if (tooltipText instanceof Element)
{
canShorten = false
} else {
if (typeof tooltipText === 'object') { if (typeof tooltipText === 'object') {
if (tooltipText.message) { if (tooltipText.message) {
tooltipText = tooltipText.message tooltipText = tooltipText.message
@ -35,9 +39,10 @@ class Toaster {
} }
} }
} }
}
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const shortTooltipText = tooltipText.length > 201 ? tooltipText.substring(0, 200) + '...' : tooltipText const shortTooltipText = (canShorten && tooltipText.length > 201) ? tooltipText.substring(0, 200) + '...' : tooltipText
let button = tooltipText.length > 201 ? yo` let button = tooltipText.length > 201 ? yo`
<button class="btn btn-secondary btn-sm" onclick=${() => { modal.alert(tooltipText) }}>show full message</button> <button class="btn btn-secondary btn-sm" onclick=${() => { modal.alert(tooltipText) }}>show full message</button>

Loading…
Cancel
Save