@@ -6,7 +6,10 @@ let musicToggles = Object.keys(MusicSelectionPanel).map(category => category.rep
66musicToggles . forEach ( toggle => {
77 document . getElementById ( `${ toggle } _collapse_toggle` ) . addEventListener ( "click" , toggle_collapsible_container ) ;
88} ) ;
9-
9+ // Utility function to zip two arrays together.
10+ function zipArr ( arr1 , arr2 ) {
11+ return arr1 . map ( ( value , index ) => [ value , arr2 [ index ] ] ) ;
12+ }
1013function toggle_collapsible_container ( evt ) {
1114 /**
1215 * Show or hide a collapsible container.
@@ -88,16 +91,16 @@ function serialize_music_selections(form, for_file = false) {
8891 songs_map [ "vanilla" ] [ location ] = get_value ( chosen_val ) ;
8992 } else {
9093 // If this is a custom song, find and use the full string path.
91- let bgm_map = zip ( cosmetic_truncated_names . bgm , cosmetic_names . bgm ) ;
92- let major_map = zip (
94+ let bgm_map = zipArr ( cosmetic_truncated_names . bgm , cosmetic_names . bgm ) ;
95+ let major_map = zipArr (
9396 cosmetic_truncated_names . majoritems ,
9497 cosmetic_names . majoritems
9598 ) ;
96- let minor_map = zip (
99+ let minor_map = zipArr (
97100 cosmetic_truncated_names . minoritems ,
98101 cosmetic_names . minoritems
99102 ) ;
100- let event_map = zip (
103+ let event_map = zipArr (
101104 cosmetic_truncated_names . events ,
102105 cosmetic_names . events
103106 ) ;
@@ -176,13 +179,6 @@ function validate_music_file(fileContents) {
176179}
177180
178181
179-
180-
181- // Utility function to zip two arrays together.
182- function zip ( arr1 , arr2 ) {
183- return arr1 . map ( ( value , index ) => [ value , arr2 [ index ] ] ) ;
184- }
185-
186182function is_song_category_randomized ( category ) {
187183 /**
188184 * Return true if this song category is randomized.
@@ -280,16 +276,16 @@ function get_custom_song_map() {
280276 * Return a map between song categories and their relevant lists.
281277 */
282278 return {
283- bgm : zip ( cosmetic_names . bgm , cosmetic_truncated_names . bgm ) ,
284- majoritems : zip (
279+ bgm : zipArr ( cosmetic_names . bgm , cosmetic_truncated_names . bgm ) ,
280+ majoritems : zipArr (
285281 cosmetic_names . majoritems ,
286282 cosmetic_truncated_names . majoritems
287283 ) ,
288- minoritems : zip (
284+ minoritems : zipArr (
289285 cosmetic_names . minoritems ,
290286 cosmetic_truncated_names . minoritems
291287 ) ,
292- events : zip ( cosmetic_names . events , cosmetic_truncated_names . events ) ,
288+ events : zipArr ( cosmetic_names . events , cosmetic_truncated_names . events ) ,
293289 } ;
294290}
295291
0 commit comments