Commit d14a87ca by Chris Rodriguez

Moving zoomed to top center, RTL Sass, reversing keys

parent 97f82f48
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
.indicator { .indicator {
display: none; display: none;
position: absolute; position: absolute;
left: 46%; @include left(46%);
top: 45%; top: 45%;
width: 50px; width: 50px;
height: 50px; height: 50px;
...@@ -101,8 +101,9 @@ ...@@ -101,8 +101,9 @@
position: absolute; position: absolute;
height: 350px; height: 350px;
width: 350px; width: 350px;
top: 10% !important; top: -375px;
right: -350px !important; @include left(50%);
@include margin-left(-175px);
border-radius: 50%; border-radius: 50%;
border: 2px solid $gray-d4; border: 2px solid $gray-d4;
background: $white; background: $white;
......
...@@ -42,6 +42,7 @@ data: | ...@@ -42,6 +42,7 @@ data: |
<div class="zooming-image-place" style="position: relative;"> <div class="zooming-image-place" style="position: relative;">
<a class="edx-zoom" href="https://studio.edx.org/c4x/edX/DemoX/asset/pathways_detail_01.png"> <a class="edx-zoom" href="https://studio.edx.org/c4x/edX/DemoX/asset/pathways_detail_01.png">
<img alt="magnify" src="https://studio.edx.org/c4x/edX/DemoX/asset/pathways_overview_01.png" /> <img alt="magnify" src="https://studio.edx.org/c4x/edX/DemoX/asset/pathways_overview_01.png" />
<span class="indicator icon fa fa-search-plus" aria-hidden="true"></span>
</a> </a>
<div class="script_placeholder" data-src="https://studio.edx.org/c4x/edX/DemoX/asset/image-zoom-tool.js" /> <div class="script_placeholder" data-src="https://studio.edx.org/c4x/edX/DemoX/asset/image-zoom-tool.js" />
</div> </div>
......
...@@ -66,11 +66,9 @@ ...@@ -66,11 +66,9 @@
width: settings.width width: settings.width
}); });
$this.on('click keydown', function(event) { $targetImage.on('click', function(event) {
event.preventDefault(); event.preventDefault();
});
$targetImage.on('click', function(event) {
if (!$zoomed.hasClass('is-visible')) { if (!$zoomed.hasClass('is-visible')) {
var left = event.pageX, var left = event.pageX,
top = event.pageY; top = event.pageY;
...@@ -80,7 +78,7 @@ ...@@ -80,7 +78,7 @@
} }
setTimeout(function() { setTimeout(function() {
appendZoomed(); appendZoomed(true);
magnifyWithMouse(left, top); magnifyWithMouse(left, top);
if (settings.lightbox == true) { if (settings.lightbox == true) {
...@@ -117,12 +115,10 @@ ...@@ -117,12 +115,10 @@
top = event.pageY; top = event.pageY;
switch (event.which) { switch (event.which) {
case keys.tab:
return true;
break;
case keys.enter: case keys.enter:
case keys.space: case keys.space:
event.preventDefault();
if (!$zoomed.hasClass('is-visible')) { if (!$zoomed.hasClass('is-visible')) {
var left = event.pageX, var left = event.pageX,
top = event.pageY; top = event.pageY;
...@@ -145,12 +141,9 @@ ...@@ -145,12 +141,9 @@
default: default:
return true; return true;
} }
}); });
$zoomed.on('keydown', function(event) { $zoomed.on('keydown', function(event) {
event.preventDefault();
var left, var left,
top, top,
$zoomedImage = $zoomed.find('img'), $zoomedImage = $zoomed.find('img'),
...@@ -161,7 +154,7 @@ ...@@ -161,7 +154,7 @@
switch (event.which) { switch (event.which) {
case keys.esc: case keys.esc:
case keys.tab: event.preventDefault();
if ($zoomed.hasClass('is-visible')) { if ($zoomed.hasClass('is-visible')) {
detachZoomed(); detachZoomed();
...@@ -174,19 +167,23 @@ ...@@ -174,19 +167,23 @@
break; break;
case keys.up: case keys.up:
magnifyWithKeyboard(0, -1); // we move two spaces at a time
magnifyWithKeyboard(0, 2, event);
break; break;
case keys.down: case keys.down:
magnifyWithKeyboard(0, 1); // we move two spaces at a time
magnifyWithKeyboard(0, -2, event);
break; break;
case keys.left: case keys.left:
magnifyWithKeyboard(-1, 0); // we move two spaces at a time
magnifyWithKeyboard(2, 0, event);
break; break;
case keys.right: case keys.right:
magnifyWithKeyboard(1, 0); // we move two spaces at a time
magnifyWithKeyboard(-2, 0, event);
break; break;
default: default:
...@@ -206,11 +203,6 @@ ...@@ -206,11 +203,6 @@
$(window).resize(function() { $(window).resize(function() {
if ($zoomed.is(':visible')) { if ($zoomed.is(':visible')) {
// $zoomed.css({
// left: $targetImage.offset().left + ($targetImage.width() / 2) - ($zoomed.width() / 2),
// top: $targetImage.offset().top + ($targetImage.height() / 2) - ($zoomed.height() / 2)
// });
$magnifiedImage.css({ $magnifiedImage.css({
left: -($magnifiedImage.width() / 2) + ($zoomed.width() / 2), left: -($magnifiedImage.width() / 2) + ($zoomed.width() / 2),
top: -($magnifiedImage.height() / 2) + ($zoomed.height() / 2) top: -($magnifiedImage.height() / 2) + ($zoomed.height() / 2)
...@@ -243,10 +235,12 @@ ...@@ -243,10 +235,12 @@
}); });
}; };
function magnifyWithKeyboard(left, top) { function magnifyWithKeyboard(left, top, event) {
var newLeft, var newLeft,
newTop; newTop;
event.preventDefault();
newLeft = $magnifiedImage.css('left'); newLeft = $magnifiedImage.css('left');
newLeft = newLeft.replace('px', ''); newLeft = newLeft.replace('px', '');
newLeft = parseInt(newLeft) + left; newLeft = parseInt(newLeft) + left;
...@@ -324,9 +318,6 @@ ...@@ -324,9 +318,6 @@
$.fn.edxImageZoomTool.defaults = { $.fn.edxImageZoomTool.defaults = {
zIndex: 1000, zIndex: 1000,
// width: 150,
// height: 150,
// border: '2px solid #191919',
fadeSpeed: 250, fadeSpeed: 250,
lightbox: true, lightbox: true,
errorMessage: 'Image load error' errorMessage: 'Image load error'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment