From ec2972df669030827015ad8964f752e1647a17cf Mon Sep 17 00:00:00 2001
From: Luciano Iam <lucianito@gmail.com>
Date: Sat, 25 Jul 2020 18:09:12 +0200
Subject: [PATCH] WS: Add a fullscreen toggle to the mixer demo

---
 share/web_surfaces/builtin/mixer/js/main.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/share/web_surfaces/builtin/mixer/js/main.js b/share/web_surfaces/builtin/mixer/js/main.js
index 8427e89aba..e7dc9fa66e 100644
--- a/share/web_surfaces/builtin/mixer/js/main.js
+++ b/share/web_surfaces/builtin/mixer/js/main.js
@@ -138,7 +138,12 @@ import { createRootContainer, Container, Dialog, Label, Button, DiscreteKnob,
 
     function setupFullscreenButton () {
         const doc = document.documentElement,
+<<<<<<< HEAD
               button = document.getElementById('fullscreen');
+=======
+              button = document.getElementById('fullscreen'),
+              touchOrClick = ('ontouchstart' in doc) ? 'touchstart' : 'click';
+>>>>>>> WS: Add a fullscreen toggle to the mixer demo
 
         let requestFullscreen = null, fullscreenChange = null;