diff options
| author | Julie Lala <jules@okfoc.us> | 2014-08-22 12:54:27 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-08-22 12:54:27 -0400 |
| commit | 4ec4b0e42c06b63962658ae8b886ee9466d09a21 (patch) | |
| tree | 5e3b0a52d61efa91495932f8cfe53a02dbe95af7 /public/assets/javascripts/ui/editor/MediaViewer.js | |
| parent | 978634c1c323240f36548468703a9512710c60e7 (diff) | |
reject image if it doesnt fit
Diffstat (limited to 'public/assets/javascripts/ui/editor/MediaViewer.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/MediaViewer.js | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js index 5540023..40bfe80 100644 --- a/public/assets/javascripts/ui/editor/MediaViewer.js +++ b/public/assets/javascripts/ui/editor/MediaViewer.js @@ -133,7 +133,9 @@ var MediaViewer = ModalView.extend({ var $floatingImg = $('.floatingImg'); Scenery.nextMedia = media - console.log(media.type) + +// console.log(media.type) + switch (media.type) { case "video": $floatingImg.attr('src', '/assets/img/playbutton.png') @@ -150,18 +152,23 @@ var MediaViewer = ModalView.extend({ function _followCursor(e) { $floatingImg.parent().css({ top: (e.pageY - (height / 2)) + 'px', - left: (e.pageX - (width / 2)) + 'px' + left: (e.pageX - (width / 2)) + 'px', }); } - $(window).on('mousemove', _followCursor); - $(window).one('click', function () { + function _hideCursor (e) { + if (Scenery.nextMedia) { + return + } var $floatingImg = $('.floatingImg') - $floatingImg.attr('src', ''); - $(window).off('mousemove', _followCursor); - $floatingImg.parent().removeClass('edit'); - }); - $ants.addClass('edit'); - _followCursor(e); + $floatingImg.attr('src', '') + $(window).off('mousemove', _followCursor) + $(window).off('mousedown', _hideCursor) + $floatingImg.parent().removeClass('edit') + } + $(window).on('mousemove', _followCursor) + $(window).on('mousedown', _hideCursor) + $ants.addClass('edit') + _followCursor(e) }, }) |
