Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved pasting images on retina devices.

Browse source
This commit is contained in:
Martin Edenhofer 2016-05-27 15:22:00 +02:00
parent 3375163c9c
commit 0a3bdffc93
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/app/lib/app_post/image_service.coffee
View file

@ -19,6 +19,7 @@ class App.ImageService
imageObject.onload = -> imageObject.onload = ->
imageWidth = imageObject.width imageWidth = imageObject.width
imageHeight = imageObject.height imageHeight = imageObject.height
console.log('ImageService', 'current size', imageWidth, imageHeight)
if y is 'auto' && x is 'auto' if y is 'auto' && x is 'auto'
x = imageWidth x = imageWidth
y = imageHeight y = imageHeight
@ -68,10 +69,10 @@ class App.ImageService
newDataUrl = canvas.toDataURL(type, quallity) newDataUrl = canvas.toDataURL(type, quallity)
if resize if resize
console.log('ImageService', 'resize', x/sizeFactor, y/sizeFactor, quallity, (newDataUrl.length * 0.75)/1024/1024, 'in mb') console.log('ImageService', 'resize', x/sizeFactor, y/sizeFactor, quallity, (newDataUrl.length * 0.75)/1024/1024, 'in mb')
callback(newDataUrl, x/sizeFactor, y/sizeFactor) callback(newDataUrl, x/sizeFactor, y/sizeFactor, true)
return return
console.log('ImageService', 'no resize', x, y, quallity, (newDataUrl.length * 0.75)/1024/1024, 'in mb') console.log('ImageService', 'no resize', x, y, quallity, (newDataUrl.length * 0.75)/1024/1024, 'in mb')
callback(newDataUrl, x, y) callback(newDataUrl, x, y, false)
# load image from data url # load image from data url
imageObject.src = dataURL imageObject.src = dataURL

16
app/assets/javascripts/app/lib/base/jquery.contenteditable.js
View file

@ -221,8 +221,14 @@
var img = document.createElement('img') var img = document.createElement('img')
img.src = result img.src = result
insert = function(dataUrl, width, height) { insert = function(dataUrl, width, height, isRetina) {
//console.log('dataUrl', dataUrl) //console.log('dataUrl', dataUrl)
// adapt image if we are on retina devices
if (!isRetina && window.isRetina && window.isRetina()) {
width = width / 2
height = height / 2
}
_this.log('image inserted') _this.log('image inserted')
result = dataUrl result = dataUrl
img = "<img style=\"width: " + width + "px; height: " + height + "px\" src=\"" + result + "\">" img = "<img style=\"width: " + width + "px; height: " + height + "px\" src=\"" + result + "\">"
@ -330,7 +336,13 @@
img.src = result img.src = result
//Insert the image at the carat //Insert the image at the carat
insert = function(dataUrl, width, height) { insert = function(dataUrl, width, height, isRetina) {
// adapt image if we are on retina devices
if (!isRetina && window.isRetina && window.isRetina()) {
width = width / 2
height = height / 2
}
//console.log('dataUrl', dataUrl) //console.log('dataUrl', dataUrl)
_this.log('image inserted') _this.log('image inserted')

2
test/browser_test_helper.rb
View file

@ -1677,7 +1677,7 @@ wait untill text in selector disabppears
) )
found = false found = false
(1..4).each { (1..8).each {
element = instance.find_elements(css: '.active .newTicket')[0] element = instance.find_elements(css: '.active .newTicket')[0]
if element if element
found = true found = true