Merge pull request #62 from LoveEevee/songsel-selectable-assets-cleanup

Hide barlines when they should be hidden
This commit is contained in:
Bui 2018-10-27 22:07:55 +01:00 committed by GitHub
commit 5fcdca89e5
2 changed files with 3 additions and 15 deletions

View File

@ -125,7 +125,6 @@
var branchPreference = "m"
var currentMeasure = []
var firstMeasure = true
var firstNote = true
var circles = []
var circleID = 0
@ -143,17 +142,6 @@
originalMS: ms,
speed: speed
})
if(firstMeasure){
firstMeasure = false
var msPerMeasure = 60000 * measure / bpm
for(var measureMs = ms - msPerMeasure; measureMs > 0; measureMs -= msPerMeasure){
this.measures.push({
ms: measureMs,
originalMS: ms,
speed: speed
})
}
}
}
if(currentMeasure.length){
for(var i = 0; i < currentMeasure.length; i++){

View File

@ -243,8 +243,8 @@ class SongSelect{
this.startP2()
pageEvents.keyAdd(this, "all", "down", this.keyDown.bind(this))
pageEvents.add(window, "mousemove", this.mouseMove.bind(this))
pageEvents.add(window, ["mousedown", "touchstart"], this.mouseDown.bind(this))
pageEvents.add(loader.screen, "mousemove", this.mouseMove.bind(this))
pageEvents.add(loader.screen, ["mousedown", "touchstart"], this.mouseDown.bind(this))
if(touchEnabled && fullScreenSupported){
this.touchFullBtn = document.getElementById("touch-full-btn")
this.touchFullBtn.style.display = "block"
@ -1459,7 +1459,7 @@ class SongSelect{
this.redrawRunning = false
this.endPreview()
pageEvents.keyRemove(this, "all")
pageEvents.remove(window, ["mousemove", "mousedown", "touchstart"])
pageEvents.remove(loader.screen, ["mousemove", "mousedown", "touchstart"])
if(this.touchEnabled && fullScreenSupported){
pageEvents.remove(this.touchFullBtn, "click")
delete this.touchFullBtn