Skip to content

Commit 12d93af

Browse files
committed
prevent localstorage load when editor closed
1 parent 6549c1a commit 12d93af

File tree

6 files changed

+48
-23
lines changed

6 files changed

+48
-23
lines changed

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
10.9.0

example/codeKeyframes.js

Lines changed: 17 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/codeKeyframes.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/index.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,12 @@
6363
waveColor: '#3AEAD2',
6464
progressColor: '#0c9fa7',
6565
bgColor: '#222',
66-
label: 'Tracktitle Music: Artistname Visuals: Artistname',
67-
autoplay: true,
68-
keyframes: [] // paste in after exporting keyframes
66+
label: 'Track title by ArtistName | Visual: ArtistName',
67+
autoplay: false,
68+
keyframes: [{"start":2.6663112837830205,"end":2.7663112837830206,"data":{"code":"document.querySelector('#example').innerHTML = 'test1'"}},{"start":5.4326092407079045,"end":5.532609240707904,"data":{"code":"document.querySelector('#example').innerHTML = 'test2'"}},{"start":8.03226274239635,"end":8.13226274239635,"data":{"code":"document.querySelector('#example').innerHTML = 'test3'"}}], // paste in after exporting keyframes,
69+
onCanPlay: function(){
70+
// alert('can play')
71+
}
6972
})
7073
</script>
7174

src/html/index.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,12 @@
6363
waveColor: '#3AEAD2',
6464
progressColor: '#0c9fa7',
6565
bgColor: '#222',
66-
label: 'Tracktitle Music: Artistname Visuals: Artistname',
67-
autoplay: true,
68-
keyframes: [] // paste in after exporting keyframes
66+
label: 'Track title by ArtistName | Visual: ArtistName',
67+
autoplay: false,
68+
keyframes: [{"start":2.6663112837830205,"end":2.7663112837830206,"data":{"code":"document.querySelector('#example').innerHTML = 'test1'"}},{"start":5.4326092407079045,"end":5.532609240707904,"data":{"code":"document.querySelector('#example').innerHTML = 'test2'"}},{"start":8.03226274239635,"end":8.13226274239635,"data":{"code":"document.querySelector('#example').innerHTML = 'test3'"}}], // paste in after exporting keyframes,
69+
onCanPlay: function(){
70+
// alert('can play')
71+
}
6972
})
7073
</script>
7174

src/js/app/main.js

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ function CodeKeyframes(args){
77
this.keyframes = args.keyframes || []
88
this.label = args.label
99
this.autoplay = args.autoplay || false
10+
this.onCanPlay = args.onCanPlay || function(){}
1011

1112
this.activeRegion = null
1213
this.skipLength = 1
@@ -17,7 +18,8 @@ function CodeKeyframes(args){
1718
this.sequence = []
1819
this.sequenceCursor = 0
1920
this.sequenceNextTime = null
20-
21+
22+
2123
document.querySelector('body').insertAdjacentHTML('beforeend',`
2224
<div id="ckf-editor">
2325
<div id="ckf-waveform" tabindex="0"></div>
@@ -103,13 +105,13 @@ function CodeKeyframes(args){
103105
this._closeButton.onclick = (e) => {
104106
this._editor.classList.add('closed')
105107
this._codeForm.remove()
108+
this.editorOpen = false
106109
}
107110

108-
109-
110111
document.addEventListener('keydown', (e) => {
111112

112-
console.log(e.which)
113+
114+
// console.log(e.which)
113115

114116
var keycodes = {
115117

@@ -219,9 +221,11 @@ function CodeKeyframes(args){
219221
this.updateSequence()
220222
},
221223

222-
223224
}
224225

226+
// prevent all key actions except space bar when editor closed
227+
if(!this.editorOpen && e.which !== 32 ) return
228+
225229
if( keycodes[e.which] ){
226230
keycodes[e.which]()
227231
}
@@ -230,6 +234,8 @@ function CodeKeyframes(args){
230234

231235
document.addEventListener('keyup', (e) =>{
232236

237+
if( !this.editorOpen ) return
238+
233239
var keycodes = {
234240
// shift
235241
16:()=>{
@@ -278,19 +284,20 @@ function CodeKeyframes(args){
278284

279285
this.loadRegions = function(regions){
280286

287+
// load regions from saved code in declaration
281288
var keyframeRegions = this.keyframes
282289

290+
// load regions from localstorage
283291
var localRegions = []
284-
if( localStorage.regions ) {
292+
if( localStorage.regions && this.editorOpen ) {
285293
localRegions = JSON.parse(localStorage.regions)
286294
}
287295

288-
// combne and deduplicate
296+
// combine and deduplicate
289297
var combinedRegions = []
290298

291299
var arr = keyframeRegions.concat(localRegions)
292300
var len = arr.length
293-
294301
while (len--) {
295302
var itm = arr[len]
296303
unique = true
@@ -508,6 +515,8 @@ function CodeKeyframes(args){
508515
if(this.autoplay){
509516
this.wavesurfer.play()
510517
}
518+
519+
this.onCanPlay()
511520
})
512521

513522
this.wavesurfer.on('region-click', (region) => {

0 commit comments

Comments
 (0)