Skip to content
This repository was archived by the owner on Mar 17, 2019. It is now read-only.

Commit be2cf1a

Browse files
committed
https://github.com/binjospookie/--shots/issues/11
1 parent da07cf0 commit be2cf1a

2 files changed

Lines changed: 20 additions & 11 deletions

File tree

‎scripts/functions/sendToServer.js‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ const popUp = require('./popUp');
33
const popupWindow = document.querySelector('aside#messageToUser');
44
const popupText = popupWindow.querySelector('p');
55

6+
const xhr = new XMLHttpRequest();
7+
68
module.exports = function sendToServer(code, old, loader, loaderText, path) {
79
const data = new FormData();
8-
const xhr = new XMLHttpRequest()
910
let now;
1011
let difference;
1112
let callAfter;
@@ -69,4 +70,13 @@ module.exports = function sendToServer(code, old, loader, loaderText, path) {
6970
break;
7071
}
7172
};
73+
74+
window.addEventListener('keydown', event => {
75+
if (event.which === 27) {
76+
if (loader.classList.contains('show')) {
77+
xhr.abort();
78+
hideLoader(3000, 'Abort', loaderText);
79+
}
80+
}
81+
});
7282
};

‎scripts/renderer.js‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ textEventListeners(textareaContent, textateaFontSize, textateaFontColor, textare
188188

189189
/**
190190
* Обработчик закртыия формы с текстом
191-
* @return {[type]} [description]
191+
* @return {[type]}
192192
*/
193193
function applyTextButtonClickHandler() {
194194
hideControls(activeShape, stage);
@@ -199,7 +199,7 @@ function applyTextButtonClickHandler() {
199199

200200
/**
201201
* Обработчик удаления текста из формы
202-
* @return {[type]} [description]
202+
* @return {[type]}
203203
*/
204204
function deleteTextButtonClickHandler() {
205205
stage.removeChild(activeShape);
@@ -209,8 +209,8 @@ function deleteTextButtonClickHandler() {
209209
}
210210
/**
211211
* Обработчик изменения контента текста
212-
* @param {[type]} event [description]
213-
* @return {[type]} [description]
212+
* @param {[type]} event
213+
* @return {[type]}
214214
*/
215215
function textareaValueChangeHadler(event) {
216216
let textareaValue = event.target.value;
@@ -221,8 +221,8 @@ function textareaValueChangeHadler(event) {
221221

222222
/**
223223
* Обработчик изменения кегля
224-
* @param {[type]} event [description]
225-
* @return {[type]} [description]
224+
* @param {[type]} event
225+
* @return {[type]}
226226
*/
227227
function textareaFontSizeChangeHadler(event) {
228228
let textareaFontSize = event.target.value;
@@ -235,8 +235,8 @@ function textareaFontSizeChangeHadler(event) {
235235

236236
/**
237237
* Обработчик изменения текста
238-
* @param {[type]} event [description]
239-
* @return {[type]} [description]
238+
* @param {[type]} event
239+
* @return {[type]}
240240
*/
241241
function textareaFontColorChangeHadler(event) {
242242
let textareaColor = event.target.value;
@@ -701,7 +701,6 @@ function setDefaultSceneState() {
701701
setDefaultFrame(frame);
702702

703703
// если жмём esc во время работы с фигурой
704-
// добавить условие про crop
705704
if (onCreate === true) {
706705
mouseDownX = 0;
707706
mouseDownY = 0;
@@ -1001,7 +1000,7 @@ function createText(oldEvent) {
10011000

10021001
/**
10031002
* Инициализация модалки при открытии
1004-
* @return {[type]} [description]
1003+
* @return {[type]}
10051004
*/
10061005
function openTextSidebar() {
10071006
const paragraph = activeShape.children[0];

0 commit comments

Comments
 (0)