Index: chrome/browser/resources/print_preview/margin_line.js |
diff --git a/chrome/browser/resources/print_preview/margin_line.js b/chrome/browser/resources/print_preview/margin_line.js |
index f8999c1a239c586ad097b10eacf6548909ca8029..e31cbc82a882de786d7b68839ab7bb1683195eb5 100644 |
--- a/chrome/browser/resources/print_preview/margin_line.js |
+++ b/chrome/browser/resources/print_preview/margin_line.js |
@@ -8,116 +8,38 @@ cr.define('print_preview', function() { |
function MarginLine(groupName) { |
var line = document.createElement('div'); |
line.__proto__ = MarginLine.prototype; |
- line.className = MarginLine.CSS_CLASS_DRAGGABLE_AREA; |
+ line.className = MarginLine.CSS_CLASS_MARGIN_LINE; |
+ |
// @type {string} Specifies which margin this line refers to. |
line.marginGroup = groupName; |
- // @type {print_preview.Rect} A rectangle describing the values of all |
- // margins. |
- line.rectangle = null; |
- // @type {HTMLDivElement} The dotted line representing the margin. |
- line.visibleLine = document.createElement('div'); |
- line.visibleLine.className = MarginLine.CSS_CLASS_MARGIN_LINE; |
- |
- line.appendChild(line.visibleLine); |
+ |
return line; |
} |
MarginLine.CSS_CLASS_MARGIN_LINE = 'margin-line'; |
- MarginLine.CSS_CLASS_DRAGGABLE_AREA = 'draggable-area'; |
- // Width of the clickable region around each margin line in screen pixels. |
- MarginLine.CLICKABLE_REGION = 20; |
MarginLine.prototype = { |
__proto__: HTMLDivElement.prototype, |
- update: function(marginsRectangle) { |
- this.rectangle = this.getCoordinates_(marginsRectangle); |
- }, |
- |
/** |
- * Draws |this| on screen. Essentially two divs are being drawn, the drag |
- * control area (invisible) and the dotted margin line (visible). |
+ * Draws a dotted line representing the margin. |
*/ |
draw: function() { |
- this.drawDraggableArea_(); |
- this.drawDottedLine_(); |
- }, |
- |
- /** |
- * Draws the dotted line representing the margin. |
- * @private |
- */ |
- drawDottedLine_ : function() { |
- var rectangle = this.getVisibleLineCoordinates_(); |
- this.visibleLine.style.left = 100 * rectangle.x + '%'; |
- this.visibleLine.style.top = 100 * rectangle.y + '%'; |
- this.visibleLine.style.width = 100 * rectangle.width + '%'; |
- this.visibleLine.style.height = 100 * rectangle.height + '%'; |
- }, |
- |
- /** |
- * Draws the area the draggable area (not visible). |
- * @private |
- */ |
- drawDraggableArea_: function() { |
- var width = previewArea.pdfPlugin_.offsetWidth; |
- var height = previewArea.pdfPlugin_.offsetHeight; |
- |
- this.style.left = Math.round(this.rectangle.x * width) + 'px'; |
- this.style.top = Math.round(this.rectangle.y * height) + 'px'; |
- this.style.width = Math.round(this.rectangle.width * width) + 'px'; |
- this.style.height = Math.round(this.rectangle.height * height) + 'px'; |
- }, |
- |
- /** |
- * Calculates the coordinates and size of |this|. |
- * @param {print_preview.Rect} marginsRectangle A rectangle describing the |
- * selected margins values in percentages. |
- * @private |
- */ |
- getCoordinates_: function(marginsRectangle) { |
- var pageLocation = previewArea.getPageLocationNormalized(); |
- var totalWidth = previewArea.pdfPlugin_.offsetWidth; |
- var totalHeight = previewArea.pdfPlugin_.offsetHeight; |
- var offsetY = (MarginLine.CLICKABLE_REGION / 2) / totalHeight; |
- var offsetX = (MarginLine.CLICKABLE_REGION / 2) / totalWidth; |
- |
- if (this.isTop_()) { |
- var lineCoordinates = new print_preview.Rect( |
- pageLocation.x, |
- marginsRectangle.y - offsetY, |
- pageLocation.width, |
- MarginLine.CLICKABLE_REGION / totalHeight); |
- } else if (this.isBottom_()) { |
- var lineCoordinates = new print_preview.Rect( |
- pageLocation.x, |
- marginsRectangle.bottom - offsetY, |
- pageLocation.width, |
- MarginLine.CLICKABLE_REGION / totalHeight); |
- } else if (this.isRight_()) { |
- var lineCoordinates = new print_preview.Rect( |
- marginsRectangle.right - offsetX, |
- pageLocation.y, |
- MarginLine.CLICKABLE_REGION / totalWidth, |
- pageLocation.height); |
- } else if (this.isLeft_()) { |
- var lineCoordinates = new print_preview.Rect( |
- marginsRectangle.x - offsetX, |
- pageLocation.y, |
- MarginLine.CLICKABLE_REGION / totalWidth, |
- pageLocation.height); |
- } |
- return lineCoordinates; |
+ var rectangle = this.getCoordinates_(); |
+ this.style.left = 100 * rectangle.x + '%'; |
+ this.style.top = 100 * rectangle.y + '%'; |
+ this.style.width = 100 * rectangle.width + '%'; |
+ this.style.height = 100 * rectangle.height + '%'; |
}, |
/** |
- * Calculates the coordinates in percentages and size of the visible margin |
- * line, with respect to |this| div element. |
+ * Calculates the coordinates and size of the margin line in percentages, |
+ * with respect to parent element. |
* @return {print_preview.Rect} A rectangle describing the position of the |
* visible line in percentages. |
* @private |
*/ |
- getVisibleLineCoordinates_: function() { |
+ getCoordinates_: function() { |
if (this.isHorizontal_()) |
var innerMarginsRect = new print_preview.Rect(0, 0.5, 1, 0); |
else if (this.isVertical_()) |