From c2e24f82b6b8a9c0cfd29a095ca6e8efc54d8e28 Mon Sep 17 00:00:00 2001 From: ymq1 Date: Mon, 2 Jun 2025 09:23:13 +0000 Subject: [PATCH] bugfix --- bricks/camera.js | 8 -------- bricks/video.js | 4 ---- 2 files changed, 12 deletions(-) diff --git a/bricks/camera.js b/bricks/camera.js index 945f506..0f9718a 100644 --- a/bricks/camera.js +++ b/bricks/camera.js @@ -85,13 +85,6 @@ bricks.Camera = class extends bricks.Popup { this.task = schedule_once(this.show_picture.bind(this), this.task_period); this.show_cnt += 1; } -<<<<<<< HEAD - take_picture(){ - if (this.task){ - this.task.cancel(); - this.task = null; - } -======= videorecorder_start(){ if (!this.stream) { throw new Error('Media stream is not initialized. Call init() first.'); @@ -125,7 +118,6 @@ bricks.Camera = class extends bricks.Popup { } this.task_period = 0; this.task = null; ->>>>>>> 51416a085b5aa99df9f8edf9989fdc1b6306724c var d = this.imgw.base64(); this.dispatch('shot', d); } diff --git a/bricks/video.js b/bricks/video.js index 955f9e2..35e2a42 100644 --- a/bricks/video.js +++ b/bricks/video.js @@ -78,12 +78,8 @@ bricks.Video = class extends bricks.Layout { } auto_play(){ -<<<<<<< HEAD return; schedule_once(this._auto_play.bind(this), 0.5); -======= - schedule_once(this._auto_play.bind(this), 0.8); ->>>>>>> 51416a085b5aa99df9f8edf9989fdc1b6306724c } _auto_play(){ this.set_url(this.opts.url);