Commit 8f9855b5 authored by Tim Zallmann's avatar Tim Zallmann

Merge branch 'gl_crop' into 'master'

Remove var from gl_crop.js

Closes #36280

See merge request gitlab-org/gitlab!20119
parents 2f9f9523 9f052516
/* eslint-disable no-useless-escape, no-var, no-underscore-dangle, func-names, no-return-assign, one-var, consistent-return, class-methods-use-this */ /* eslint-disable no-useless-escape, no-underscore-dangle, func-names, no-return-assign, consistent-return, class-methods-use-this */
import $ from 'jquery'; import $ from 'jquery';
import 'cropper'; import 'cropper';
...@@ -59,8 +59,7 @@ import _ from 'underscore'; ...@@ -59,8 +59,7 @@ import _ from 'underscore';
} }
bindEvents() { bindEvents() {
var _this; const _this = this;
_this = this;
this.fileInput.on('change', function(e) { this.fileInput.on('change', function(e) {
_this.onFileInputChange(e, this); _this.onFileInputChange(e, this);
this.value = null; this.value = null;
...@@ -70,8 +69,7 @@ import _ from 'underscore'; ...@@ -70,8 +69,7 @@ import _ from 'underscore';
this.modalCrop.on('hidden.bs.modal', this.onModalHide); this.modalCrop.on('hidden.bs.modal', this.onModalHide);
this.uploadImageBtn.on('click', this.onUploadImageBtnClick); this.uploadImageBtn.on('click', this.onUploadImageBtnClick);
this.cropActionsBtn.on('click', function() { this.cropActionsBtn.on('click', function() {
var btn; const btn = this;
btn = this;
return _this.onActionBtnClick(btn); return _this.onActionBtnClick(btn);
}); });
return (this.croppedImageBlob = null); return (this.croppedImageBlob = null);
...@@ -82,8 +80,7 @@ import _ from 'underscore'; ...@@ -82,8 +80,7 @@ import _ from 'underscore';
} }
onModalShow() { onModalShow() {
var _this; const _this = this;
_this = this;
return this.modalCropImg.cropper({ return this.modalCropImg.cropper({
viewMode: 1, viewMode: 1,
center: false, center: false,
...@@ -128,8 +125,7 @@ import _ from 'underscore'; ...@@ -128,8 +125,7 @@ import _ from 'underscore';
} }
onActionBtnClick(btn) { onActionBtnClick(btn) {
var data; const data = $(btn).data();
data = $(btn).data();
if (this.modalCropImg.data('cropper') && data.method) { if (this.modalCropImg.data('cropper') && data.method) {
return this.modalCropImg.cropper(data.method, data.option); return this.modalCropImg.cropper(data.method, data.option);
} }
...@@ -140,9 +136,8 @@ import _ from 'underscore'; ...@@ -140,9 +136,8 @@ import _ from 'underscore';
} }
readFile(input) { readFile(input) {
var _this, reader; const _this = this;
_this = this; const reader = new FileReader();
reader = new FileReader();
reader.onload = () => { reader.onload = () => {
_this.modalCropImg.attr('src', reader.result); _this.modalCropImg.attr('src', reader.result);
return _this.modalCrop.modal('show'); return _this.modalCrop.modal('show');
...@@ -151,9 +146,10 @@ import _ from 'underscore'; ...@@ -151,9 +146,10 @@ import _ from 'underscore';
} }
dataURLtoBlob(dataURL) { dataURLtoBlob(dataURL) {
var array, binary, i, len; let i = 0;
binary = atob(dataURL.split(',')[1]); let len = 0;
array = []; const binary = atob(dataURL.split(',')[1]);
const array = [];
for (i = 0, len = binary.length; i < len; i += 1) { for (i = 0, len = binary.length; i < len; i += 1) {
array.push(binary.charCodeAt(i)); array.push(binary.charCodeAt(i));
...@@ -164,9 +160,8 @@ import _ from 'underscore'; ...@@ -164,9 +160,8 @@ import _ from 'underscore';
} }
setPreview() { setPreview() {
var filename; const filename = this.fileInput.val().replace(FILENAMEREGEX, '');
this.previewImage.attr('src', this.dataURL); this.previewImage.attr('src', this.dataURL);
filename = this.fileInput.val().replace(FILENAMEREGEX, '');
return this.filename.text(filename); return this.filename.text(filename);
} }
......
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