From 2704c413c45dbf7009a7548bb4517a2942c7587a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Thu, 25 Oct 2018 02:20:13 +0200 Subject: [PATCH] js/ui/controls.js: remove webcam code. assets/sally.css, index.html: updated. --- assets/sally.css | 2 -- index.html | 5 ----- js/ui/controls.js | 24 ------------------------ 3 files changed, 31 deletions(-) diff --git a/assets/sally.css b/assets/sally.css index 9d5b697..b52875b 100644 --- a/assets/sally.css +++ b/assets/sally.css @@ -173,8 +173,6 @@ textarea { font-size:12pt; width: 37vw; height: 300px; background: #333; color: user-select: none; } .close { position: absolute; top: 20px; right: 20px; z-index: 2; padding: 10px; background: black; cursor: pointer; } -#webcam_rapper { display: none; position: absolute; top: 0px; left: 0px; width:100%;height:100%; box-sizing:border-box; border: 40px solid rgba(0,0,0,0.5); background-color: rgba(0,0,0,0.5); } -#webcam_iframe { position: absolute; top: 0px; left: 0px; width:100%;height:100%; background-color: rgba(0,0,0,0.5); border: 0; } #experimental_palette_toggle.focused { box-shadow: none; } #cursor_input { position: fixed; top: 0; right: 0; width:30px; opacity: 0; font-size: 16px; } .selector_el { diff --git a/index.html b/index.html index 06677ab..88ec4d2 100644 --- a/index.html +++ b/index.html @@ -68,7 +68,6 @@ load
shader - webcam doc gallery
@@ -105,10 +104,6 @@ -
- x - -
diff --git a/js/ui/controls.js b/js/ui/controls.js index 32bc7f2..f240937 100644 --- a/js/ui/controls.js +++ b/js/ui/controls.js @@ -116,30 +116,6 @@ var controls = (function(){ current_filetool && current_filetool.blur() } - controls.webcam = new FileTool (webcam_el) - controls.webcam.load = function(){ - this.loaded = true - webcam_close.addEventListener("click", function(){ controls.webcam.blur() }) - window.addEventListener("message", function(e){ - if (e.origin !== window.location.origin) return - controls.webcam.blur() - controls.circle.focus() - import_textarea.value = e.data - clipboard.import_colorcode() - }) - } - controls.webcam.use = function(){ - if (! this.loaded) { - this.load() - } - webcam_iframe.src = "webcam.html" - webcam_rapper.style.display = "block" - } - controls.webcam.done = function(){ - webcam_iframe.src = "" - webcam_rapper.style.display = "none" - } - controls.grid = new BlurredCheckbox (grid_el) controls.grid.memorable = true controls.grid.use = function(state){