Skip to content

Manage images #493

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

Open
Luc-cpl wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Manage images #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93f43cc
Update image.coffee
Luc-cpl Apr 7, 2018
c95865d
Add images ui
Luc-cpl Apr 7, 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
71 changes: 59 additions & 12 deletions src/scripts/ui/dialogs/image.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class ContentTools.ImageDialog extends ContentTools.DialogUI
ContentTools.IMAGE_UPLOADER(this)

# Read-only properties

cropRegion: () ->
# Return the defined crop-region (top, left, bottom, right), values are
# normalized to the range 0.0 - 1.0. If no crop region is defined then
Expand All @@ -48,7 +48,39 @@ class ContentTools.ImageDialog extends ContentTools.DialogUI
return [0, 0, 1, 1]

# Methods


hideImages: () ->
if @_domImagesContainer
@_domImagesContainer.parentNode.removeChild(@_domImagesContainer)

# show images passed by user and adds event listners to that images
showImages: () ->
@hideImages

if @images
@_domImagesContainer = @constructor.createDiv(['ct-image-dialog-images__container'])

@_domView.appendChild(@_domImagesContainer)

_domImages = @constructor.createDiv(['ct-image-dialog-images'])
@_domImagesContainer.appendChild(_domImages)

for image in @images
_domImageDiv = @constructor.createDiv(['ct-image-dialog-images__image'])
_domImage = new Image()
_domImage.src = image

_domImageDiv.appendChild(_domImage)
_domImages.appendChild(_domImageDiv)

_domImage.addEventListener 'click', (ev) =>
@_imageSelected = {src: ev.target.src, size: [ev.target.naturalWidth, ev.target.naturalHeight]}
@populate(@_imageSelected.src, @_imageSelected.size)

# Add URLs of images in array passed by user
addImages: (images) ->
@images = images

addCropMarks: () ->
# Add crop marks to the current image
if @_cropMarks
Expand All @@ -73,6 +105,8 @@ class ContentTools.ImageDialog extends ContentTools.DialogUI

# Set the dialog to empty
@state('empty')

@showImages()

mount: () ->
# Mount the widget
Expand Down Expand Up @@ -185,9 +219,12 @@ class ContentTools.ImageDialog extends ContentTools.DialogUI
@_addDOMEventListeners()

@dispatchEvent(@createEvent('imageuploader.mount'))

@showImages()

populate: (imageURL, imageSize) ->
# Populate the dialog with an image
@hideImages()

# Set image attributes
@_imageURL = imageURL
Expand Down Expand Up @@ -230,15 +267,25 @@ class ContentTools.ImageDialog extends ContentTools.DialogUI

save: (imageURL, imageSize, imageAttrs) ->
# Save and insert the current image
@dispatchEvent(
@createEvent(
'save',
{
'imageURL': imageURL,
'imageSize': imageSize,
'imageAttrs': imageAttrs
})
)
if imageURL
@dispatchEvent(
@createEvent(
'save',
{
'imageURL': imageURL,
'imageSize': imageSize,
'imageAttrs': imageAttrs
})
)
else if @_imageSelected
@dispatchEvent(
@createEvent(
'save',
{
'imageURL': @_imageSelected.src,
'imageSize': @_imageSelected.size
})
)

state: (state) ->
# Set/get the state of the dialog (empty, uploading, populated)
Expand Down Expand Up @@ -548,4 +595,4 @@ class CropMarksUI extends ContentTools.AnchoredComponentUI

# Unset dragging state
@_dragging = null
@_draggingOrigin = null
@_draggingOrigin = null
27 changes: 27 additions & 0 deletions src/styles/ui/_dialogs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,33 @@
}
}

.ct-image-dialog-images__container{
overflow-y: auto;
width: 100%;
height: 100%;
.ct-image-dialog-images{
width: 100%;
height: 100%;
display: initial;
overflow-y: auto;
div{
padding: 4px;
width: calc(100% / 3);
height: 150px;
display: inline-block;
img{
cursor: pointer;
height: 100%;
width: 100%;
object-fit: contain;
margin: auto;
background: #fafafa;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
}
}
}
}


/**
* The properties dialog displays the attributes and styles for an element
Expand Down