Skip to content
This repository has been archived by the owner on Oct 29, 2018. It is now read-only.

Commit

Permalink
Merge pull request #567 from raelgc/563-paste-image-into-message-input
Browse files Browse the repository at this point in the history
Fixing image pasting in qt5 (#563)
  • Loading branch information
raelgc authored Apr 20, 2017
2 parents 57b53f2 + 92fb486 commit 4a57215
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion scudcloud/resources/scudcloud.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions sources/scudcloud.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ ScudCloud = {
// Let's really check if image_44 is ready (Fixes #554)
if('undefined'!= TS && TS.model && TS.model.team && TS.model.team.icon && TS.model.team.icon.image_44){
desktop.populate(JSON.stringify({'channels': ScudCloud.listChannels(), 'teams': ScudCloud.listTeams(), 'icon': TS.model.team.icon.image_44}));
// Restoring image pasting into message input (Fixes #563)
document.querySelector(".ql-editor").addEventListener('paste', desktop.pasted);
} else {
var max = 1000;
var min = 100;
Expand Down

0 comments on commit 4a57215

Please sign in to comment.