| Index: chrome/browser/resources/file_manager/js/image_editor/image_editor.js
|
| diff --git a/chrome/browser/resources/file_manager/js/image_editor/image_editor.js b/chrome/browser/resources/file_manager/js/image_editor/image_editor.js
|
| index 341551adc2eb1b19080d27b098bb4bc7a8f85f7f..adabe3940a693dcc25b45f2cb42eda336a6a592b 100644
|
| --- a/chrome/browser/resources/file_manager/js/image_editor/image_editor.js
|
| +++ b/chrome/browser/resources/file_manager/js/image_editor/image_editor.js
|
| @@ -270,7 +270,8 @@ ImageEditor.ScaleControl = function(parent, viewport) {
|
| this.scaleRange_ = parent.ownerDocument.createElement('input');
|
| this.scaleRange_.type = 'range';
|
| this.scaleRange_.max = ImageEditor.ScaleControl.MAX_SCALE;
|
| - this.scaleRange_.addEventListener('change', this.onSliderChange.bind(this));
|
| + this.scaleRange_.addEventListener(
|
| + 'change', this.onSliderChange.bind(this), false);
|
| scaleDiv.appendChild(this.scaleRange_);
|
|
|
| this.scaleLabel_ = parent.ownerDocument.createElement('span');
|
| @@ -282,6 +283,12 @@ ImageEditor.ScaleControl = function(parent, viewport) {
|
| scaleUp.addEventListener('click', this.onUpButton.bind(this));
|
| scaleDiv.appendChild(scaleUp);
|
|
|
| + var scale1to1 = parent.ownerDocument.createElement('button');
|
| + scale1to1.className = 'scale-1to1';
|
| + scale1to1.textContent = '1:1';
|
| + scale1to1.addEventListener('click', this.on1to1Button.bind(this), false);
|
| + scaleDiv.appendChild(scale1to1);
|
| +
|
| var scaleFit = parent.ownerDocument.createElement('button');
|
| scaleFit.className = 'scale-fit';
|
| scaleFit.textContent = '\u2610';
|
| @@ -306,7 +313,7 @@ ImageEditor.ScaleControl.FACTOR = 100;
|
| */
|
| ImageEditor.ScaleControl.prototype.setMinScale = function(scale) {
|
| this.scaleRange_.min = Math.min(
|
| - Math.round(scale * ImageEditor.ScaleControl.FACTOR),
|
| + Math.round(Math.min(1, scale) * ImageEditor.ScaleControl.FACTOR),
|
| ImageEditor.ScaleControl.MAX_SCALE);
|
| };
|
|
|
| @@ -378,6 +385,11 @@ ImageEditor.ScaleControl.prototype.onFitButton = function () {
|
| this.viewport_.repaint();
|
| };
|
|
|
| +ImageEditor.ScaleControl.prototype.on1to1Button = function () {
|
| + this.viewport_.setScale(1);
|
| + this.viewport_.repaint();
|
| +};
|
| +
|
| /**
|
| * A helper object for panning the ImageBuffer.
|
| */
|
| @@ -507,13 +519,18 @@ ImageEditor.Toolbar.prototype.addRange = function(
|
| range.setValue(value);
|
| };
|
|
|
| - range.addEventListener('change', function() {
|
| - mirror();
|
| - self.updateCallback_(self.getOptions());
|
| - });
|
| + range.addEventListener('change',
|
| + function() {
|
| + mirror();
|
| + self.updateCallback_(self.getOptions());
|
| + },
|
| + false);
|
|
|
| range.setValue(value);
|
|
|
| + var descr = this.create_('span');
|
| + descr.textContent = name;
|
| + this.add(descr);
|
| this.add(range);
|
| this.add(label);
|
|
|
|
|