Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tabs and close on click outside modal closes #23 #44

Merged
merged 2 commits into from
Oct 15, 2018
Merged

Tabs and close on click outside modal closes #23 #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53db12d
fixed tabs -> spaces
srmcgann Oct 15, 2018
5fb2b32
added config change to close modal on click outside
srmcgann Oct 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
271 changes: 136 additions & 135 deletions fileuploader-kiwiirc-plugin/plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,146 +5,147 @@ const KiB = 2 ** 10
const MiB = 2 ** 20

function getValidUploadTarget() {
const buffer = kiwi.state.getActiveBuffer()
const isValidTarget = buffer && (buffer.isChannel() || buffer.isQuery())
if (!isValidTarget) {
throw new Error('Files can only be shared in channels or queries.')
}
return buffer
const buffer = kiwi.state.getActiveBuffer()
const isValidTarget = buffer && (buffer.isChannel() || buffer.isQuery())
if (!isValidTarget) {
throw new Error('Files can only be shared in channels or queries.')
}
return buffer
}

// doesn't count a final trailing newline as starting a new line
function numLines(str) {
const re = /\r?\n/g
let lines = 1
while (re.exec(str)) {
if (re.lastIndex < str.length) {
lines += 1
}
}
return lines
const re = /\r?\n/g
let lines = 1
while (re.exec(str)) {
if (re.lastIndex < str.length) {
lines += 1
}
}
return lines
}

kiwi.plugin('fileuploader', function(kiwi, log) {
// exposed api object
kiwi.fileuploader = {}

const settings = kiwi.state.setting('fileuploader')

// add button to input bar
const uploadFileButton = document.createElement('i')
uploadFileButton.className = 'upload-file-button fa fa-upload'

kiwi.addUi('input', uploadFileButton)

const uppy = Uppy({
autoProceed: false,
onBeforeFileAdded: (currentFile, files) => {
// throws if invalid, canceling the file add
getValidUploadTarget()
},
restrictions: {
maxFileSize: settings.maxFileSize || 10 * MiB,
},
})
.use(Dashboard, {
trigger: uploadFileButton,
proudlyDisplayPoweredByUppy: false,
note: settings.note,
})
.use(Webcam, { target: Dashboard })
.use(Tus, {
endpoint: settings.server || '/files',
chunkSize: 512 * KiB,
})
.run()

const dashboard = uppy.getPlugin('Dashboard')

// expose plugin api
kiwi.fileuploader.uppy = uppy
kiwi.fileuploader.dashboard = dashboard

// show uppy modal whenever a file is dragged over the page
window.addEventListener('dragenter', event => {
dashboard.openModal()
})

// show uppy modal when files are pasted
kiwi.on('buffer.paste', event => {
// IE 11 puts the clipboardData on the window
const cbData = event.clipboardData || window.clipboardData

if (!cbData) {
return
}

// detect large text pastes, offer to create a file upload instead
const text = cbData.getData('text')
if (text) {
const network = kiwi.state.getActiveNetwork()
const networkMaxLineLen = network.ircClient.options.message_max_length
if (text.length > networkMaxLineLen || numLines(text) > 4) {
const msg = 'You pasted a lot of text.\nWould you like to upload as a file instead?'
if (window.confirm(msg)) {
// stop IrcInput from ingesting the pasted text
event.preventDefault()
event.stopPropagation()

// only if there are no other files waiting for user confirmation to upload
const shouldAutoUpload = uppy.getFiles().length === 0

uppy.addFile({
name: 'pasted.txt',
type: 'text/plain',
data: new Blob([text], { type: 'text/plain' }),
source: 'Local',
isRemote: false,
})

if (shouldAutoUpload) {
uppy.upload()
}

dashboard.openModal()
}
}
}

// ensure a file has been pasted
if (!cbData.files || cbData.files.length <= 0) {
return
}

// pass event to the dashboard for handling
dashboard.handlePaste(event)
dashboard.openModal()
})

uppy.on('file-added', file => {
file.kiwiFileUploaderTargetBuffer = getValidUploadTarget()
})

uppy.on('upload-success', (file, resp, uploadURL) => {
// append filename to uploadURL
uploadURL = `${uploadURL}/${encodeURIComponent(file.meta.name)}`
uppy.setFileState(file.id, { uploadURL })
file = uppy.getFile(file.id)

// emit a global kiwi event
kiwi.emit('fileuploader.uploaded', { url: uploadURL, file })

// send a message with the url of each successful upload
const buffer = file.kiwiFileUploaderTargetBuffer
buffer.say(`Uploaded file: ${uploadURL}`)
})

uppy.on('complete', result => {
// automatically close upload modal if all uploads succeeded
if (result.failed.length === 0) {
uppy.reset()
// TODO: this would be nicer with a css transition: delay, then fade out
dashboard.closeModal()
}
})
// exposed api object
kiwi.fileuploader = {}

const settings = kiwi.state.setting('fileuploader')

// add button to input bar
const uploadFileButton = document.createElement('i')
uploadFileButton.className = 'upload-file-button fa fa-upload'

kiwi.addUi('input', uploadFileButton)

const uppy = Uppy({
autoProceed: false,
onBeforeFileAdded: (currentFile, files) => {
// throws if invalid, canceling the file add
getValidUploadTarget()
},
restrictions: {
maxFileSize: settings.maxFileSize || 10 * MiB,
},
})
.use(Dashboard, {
trigger: uploadFileButton,
proudlyDisplayPoweredByUppy: false,
closeModalOnClickOutside: true,
note: settings.note,
})
.use(Webcam, { target: Dashboard })
.use(Tus, {
endpoint: settings.server || '/files',
chunkSize: 512 * KiB,
})
.run()

const dashboard = uppy.getPlugin('Dashboard')

// expose plugin api
kiwi.fileuploader.uppy = uppy
kiwi.fileuploader.dashboard = dashboard

// show uppy modal whenever a file is dragged over the page
window.addEventListener('dragenter', event => {
dashboard.openModal()
})

// show uppy modal when files are pasted
kiwi.on('buffer.paste', event => {
// IE 11 puts the clipboardData on the window
const cbData = event.clipboardData || window.clipboardData

if (!cbData) {
return
}

// detect large text pastes, offer to create a file upload instead
const text = cbData.getData('text')
if (text) {
const network = kiwi.state.getActiveNetwork()
const networkMaxLineLen = network.ircClient.options.message_max_length
if (text.length > networkMaxLineLen || numLines(text) > 4) {
const msg = 'You pasted a lot of text.\nWould you like to upload as a file instead?'
if (window.confirm(msg)) {
// stop IrcInput from ingesting the pasted text
event.preventDefault()
event.stopPropagation()

// only if there are no other files waiting for user confirmation to upload
const shouldAutoUpload = uppy.getFiles().length === 0

uppy.addFile({
name: 'pasted.txt',
type: 'text/plain',
data: new Blob([text], { type: 'text/plain' }),
source: 'Local',
isRemote: false,
})

if (shouldAutoUpload) {
uppy.upload()
}

dashboard.openModal()
}
}
}

// ensure a file has been pasted
if (!cbData.files || cbData.files.length <= 0) {
return
}

// pass event to the dashboard for handling
dashboard.handlePaste(event)
dashboard.openModal()
})

uppy.on('file-added', file => {
file.kiwiFileUploaderTargetBuffer = getValidUploadTarget()
})

uppy.on('upload-success', (file, resp, uploadURL) => {
// append filename to uploadURL
uploadURL = `${uploadURL}/${encodeURIComponent(file.meta.name)}`
uppy.setFileState(file.id, { uploadURL })
file = uppy.getFile(file.id)

// emit a global kiwi event
kiwi.emit('fileuploader.uploaded', { url: uploadURL, file })

// send a message with the url of each successful upload
const buffer = file.kiwiFileUploaderTargetBuffer
buffer.say(`Uploaded file: ${uploadURL}`)
})

uppy.on('complete', result => {
// automatically close upload modal if all uploads succeeded
if (result.failed.length === 0) {
uppy.reset()
// TODO: this would be nicer with a css transition: delay, then fade out
dashboard.closeModal()
}
})
})