enmi-conf.org: comparison wp/wp-includes/js/imgareaselect/jquery.imgareaselect.js

Mercurial Mercurial > enmi-conf.org / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

wp/wp-includes/js/imgareaselect/jquery.imgareaselect.js

changeset 21	48c4eec2b7e6
parent 18	be944660c56a

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 /*
 * imgAreaSelect jQuery plugin
-* version 0.9.10-wp
+* version 0.9.10-wp-6.2
 *
 * Copyright (c) 2008-2013 Michal Wojciechowski (odyniec.net)
 *
 * Dual licensed under the MIT (MIT-LICENSE.txt)
 * and GPL (GPL-LICENSE.txt) licenses.
 * shortcuts
 */
 var abs = Math.abs,
 max = Math.max,
 min = Math.min,
-round = Math.round;
+floor = Math.floor;
 /**
 * Create a new HTML div element
 *
 * @return A jQuery object representing the new element
 * @return Selection object
 */
 function getSelection(noScale) {
 var sx = noScale || scaleX, sy = noScale || scaleY;
-return { x1: round(selection.x1 * sx),
+return { x1: floor(selection.x1 * sx),
-y1: round(selection.y1 * sy),
+y1: floor(selection.y1 * sy),
-x2: round(selection.x2 * sx),
+x2: floor(selection.x2 * sx),
-y2: round(selection.y2 * sy),
+y2: floor(selection.y2 * sy),
-width: round(selection.x2 * sx) - round(selection.x1 * sx),
+width: floor(selection.x2 * sx) - floor(selection.x1 * sx),
-height: round(selection.y2 * sy) - round(selection.y1 * sy) };
+height: floor(selection.y2 * sy) - floor(selection.y1 * sy) };
 }
 /**
 * Set the current selection
 *
 */
 function setSelection(x1, y1, x2, y2, noScale) {
 var sx = noScale || scaleX, sy = noScale || scaleY;
 selection = {
-x1: round(x1 / sx || 0),
+x1: floor(x1 / sx || 0),
-y1: round(y1 / sy || 0),
+y1: floor(y1 / sy || 0),
-x2: round(x2 / sx || 0),
+x2: floor(x2 / sx || 0),
-y2: round(y2 / sy || 0)
+y2: floor(y2 / sy || 0)
 };
 selection.width = selection.x2 - selection.x1;
 selection.height = selection.y2 - selection.y1;
 }
 /*
 * Get image offset. The .offset() method returns float values, so they
 * need to be rounded.
 */
-imgOfs = { left: round($img.offset().left), top: round($img.offset().top) };
+imgOfs = { left: floor($img.offset().left), top: floor($img.offset().top) };
 /* Get image dimensions */
 imgWidth = $img.innerWidth();
 imgHeight = $img.innerHeight();
 imgOfs.top += ($img.outerHeight() - imgHeight) >> 1;
 imgOfs.left += ($img.outerWidth() - imgWidth) >> 1;
 /* Set minimum and maximum selection area dimensions */
-minWidth = round(options.minWidth / scaleX) || 0;
+minWidth = floor(options.minWidth / scaleX) || 0;
-minHeight = round(options.minHeight / scaleY) || 0;
+minHeight = floor(options.minHeight / scaleY) || 0;
-maxWidth = round(min(options.maxWidth / scaleX || 1<<24, imgWidth));
+maxWidth = floor(min(options.maxWidth / scaleX || 1<<24, imgWidth));
-maxHeight = round(min(options.maxHeight / scaleY || 1<<24, imgHeight));
+maxHeight = floor(min(options.maxHeight / scaleY || 1<<24, imgHeight));
 /*
 * Workaround for jQuery 1.3.2 incorrect offset calculation, originally
 * observed in Safari 3. Firefox 2 is also affected.
 */
 imgOfs.left += max(document.body.scrollLeft, docElem.scrollLeft);
 }
 /* Determine parent element offset */
 parOfs = /absolute|relative/.test($parent.css('position')) ?
-{ left: round($parent.offset().left) - $parent.scrollLeft(),
+{ left: floor($parent.offset().left) - $parent.scrollLeft(),
-top: round($parent.offset().top) - $parent.scrollTop() } :
+top: floor($parent.offset().top) - $parent.scrollTop() } :
 position == 'fixed' ?
 { left: $(document).scrollLeft(), top: $(document).scrollTop() } :
 { left: 0, top: 0 };
 left = viewX(0);
 *            event handler is not activated
 */
 function doUpdate(resetKeyPress) {
 adjust();
 update(resetKeyPress);
+updateSelectionRelativeToParentElement();
+}
+/**
+* Set the correct values of x1, y1, x2, and y2.
+*/
+function updateSelectionRelativeToParentElement() {
 x1 = viewX(selection.x1); y1 = viewY(selection.y1);
 x2 = viewX(selection.x2); y2 = viewY(selection.y2);
 }
 /**
 function fixAspectRatio(xFirst) {
 if (aspectRatio)
 if (xFirst) {
 x2 = max(left, min(left + imgWidth,
 x1 + abs(y2 - y1) * aspectRatio * (x2 > x1 || -1)));
-y2 = round(max(top, min(top + imgHeight,
+y2 = floor(max(top, min(top + imgHeight,
 y1 + abs(x2 - x1) / aspectRatio * (y2 > y1 || -1))));
-x2 = round(x2);
+x2 = floor(x2);
 }
 else {
 y2 = max(top, min(top + imgHeight,
 y1 + abs(x2 - x1) / aspectRatio * (y2 > y1 || -1)));
-x2 = round(max(left, min(left + imgWidth,
+x2 = floor(max(left, min(left + imgWidth,
 x1 + abs(y2 - y1) * aspectRatio * (x2 > x1 || -1))));
-y2 = round(y2);
+y2 = floor(y2);
 }
 }
 /**
 * Resize the selection area respecting the minimum/maximum dimensions and
 * aspect ratio
 */
 function doResize() {
+/*
+* Make sure x1, x2, y1, y2 are initialized to avoid the following calculation
+* getting incorrect results.
+*/
+if ( x1 == null || x2 == null || y1 == null || y2 == null ) {
+updateSelectionRelativeToParentElement();
+}
 /*
 * Make sure the top left corner of the selection area stays within
 * image boundaries (it might not if the image source was dynamically
 * changed).
 */
 /*
 * If handle width/height has not been set with CSS rules, set the
 * default 5px
 */
 if (!parseInt($handles.css('width')) >= 0)
-$handles.width(5).height(5);
+$handles.width(10).height(10);
 /*
 * If the borderWidth option is in use, add a solid border to
 * handles
 */

enmi-conf.org