Merge branch 'master' into add-beta-nightly-clippy

This commit is contained in:
Konrad Borowski 2019-12-25 17:05:50 +01:00
commit de19b5f39e
4 changed files with 34 additions and 9 deletions

View File

@ -31,6 +31,8 @@ test:stable: &test
stage: test
services:
- postgres
- name: registry.gitlab.com/pastebin.run/sandbox/master
alias: sandbox
variables:
POSTGRES_DB: db
POSTGRES_USER: user
@ -38,7 +40,7 @@ test:stable: &test
image: rust:latest
script:
- *init
- DATABASE_URL=postgresql://user:password@postgres/db cargo test --verbose --features=database_tests
- DATABASE_URL=postgresql://user:password@postgres/db SANDBOX_URL=http://sandbox:8888 cargo test --verbose --features=database_tests,sandbox_tests
- *clean_cargo
cache:
key: ${CI_JOB_NAME}

View File

@ -100,7 +100,8 @@ class Editor {
}
changeToLookLikeNewPaste() {
this.clearOutput()
this.output.clear()
this.editor.update()
if (this.autodeleteText) {
this.autodeleteText.style.display = 'none'
}
@ -142,7 +143,8 @@ class Editor {
}
async run(wrapper, compilerOptions) {
this.clearOutput()
this.output.spin()
this.editor.update()
if (this.abortEval) {
this.abortEval.abort()
}
@ -180,11 +182,6 @@ class Editor {
this.output.display(wrapper, response)
this.editor.update()
}
clearOutput() {
this.output.clear()
this.editor.update()
}
}
export default function createEditor(form) {

View File

@ -1,5 +1,5 @@
import './spinner.css'
import { Wrapper } from './types'
import { SplitChunksPlugin } from 'webpack'
const filterRegex = /(?:\t\.(?:text|file|section|globl|p2align|type|cfi_.*|size|section)\b|.Lfunc_end).*\n?/g
@ -46,6 +46,14 @@ export default class Output {
this.update()
}
spin() {
this.output.textContent = ''
const spinner = document.createElement('div')
spinner.className = 'spinner'
this.output.append(spinner)
this.split.append(this.outputContainer)
}
update() {
const { stdout, stderr, status } = this.json
this.clear()

View File

@ -0,0 +1,18 @@
@keyframes spinner {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
.spinner {
animation: 1s linear infinite spinner;
border: solid 3px #f5f2f0;
border-bottom-color: #c7c75c;
border-radius: 50%;
width: 50px;
height: 50px;
}