fixed conflicts

This commit is contained in:
alicestrt 2020-09-29 15:40:42 +02:00
commit 2d92d16c0a

View File

@ -8,7 +8,7 @@
<div class="row">
<div class="col-md-1 col-sm-4">
<svg id="first_circle" onclick="scrolldiv()">
<svg id="first_circle" onclick="scrolldiv();play();">
<circle cx="50" cy="50" r="2rem" stroke="green" stroke-width="4" fill="yellow" />
<text id="angela" x="50" y="50" text-anchor="middle">hello </text>
</svg>
@ -25,8 +25,8 @@
</div>
</div>
<div class="col-md-9">
<audio id="audio-1" controls onclick="Start()">
<source src="../static/audio/myths.mp3" type="audio/mpeg">
<audio id='audio-1' controls>
<source src="../static/audio/HNI_Soundinstall_3tracks_together1.mp3" type="audio/mpeg">
Your browser does not support the audio tag.
</audio>
</div>
@ -91,16 +91,12 @@
elem.scrollIntoView();
}
var soundToPlay = document.getElementById('audio-1');
function Start(){
randomStartingTime = Random.Range(0.0, 3099.0);
PlaySound();
}
function PlaySound(){
soundToPlay.time = randomStartingTime;
soundToPlay.Play();
}
function play() {
var audio = document.getElementById("audio-1");
audio.currentTime=12;
audio.play();
}
// document.getElementById("audio-1").loop = true;
</script>