Quellcode durchsuchen

merge osmd-public 1.4.2: minor build config change (typings location), minor fix

sschmidTU vor 3 Jahren
Ursprung
Commit
9f3b39e31d

+ 1 - 1
demo/index.js

@@ -267,7 +267,7 @@ import { TransposeCalculator } from '../src/Plugins/Transpose/TransposeCalculato
         showDebugControls = paramDebugControls !== '0';
         if (showDebugControls) {
             var elementsToEnable = [
-                selectSample, selectBounding, selectPageSize, backendSelect, backendSelectDiv, divControls
+                selectSample, selectBounding, selectPageSizes[0], backendSelect, backendSelectDiv, divControls
             ];
             for (var i=0; i<elementsToEnable.length; i++) {
                 if (elementsToEnable[i]) { // make sure this element is not null/exists in the index.html, e.g. github.io demo has different index.html

+ 2 - 2
package.json

@@ -1,9 +1,9 @@
 {
   "name": "osmd-extended",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Private / sponsor exclusive OSMD mirror/audio player.",
   "main": "build/opensheetmusicdisplay.min.js",
-  "types": "dist/src/OpenSheetMusicDisplay/index.d.ts",
+  "types": "build/dist/src/OpenSheetMusicDisplay/index.d.ts",
   "scripts": {
     "docs": "typedoc --out ./build/docs --name OpenSheetMusicDisplay ./src",
     "eslint": "eslint -c .eslintrc.js --ext .ts .",

+ 3 - 3
src/MusicalScore/Graphical/MusicSheetCalculator.ts

@@ -2122,9 +2122,9 @@ export abstract class MusicSheetCalculator {
             // const currentMin: number = skyBottomLineCalculator.getSkyLineMinInRange(startX, endX);
 
             relative.y += lyricist.PositionAndShape.BorderBottom;
-            if (composerRelativeY) {
-                relative.y = Math.min(relative.y, composerRelativeY); // same height as composer label (at least not lower)
-            } // else relative.y will be NaN
+            relative.y = Math.min(relative.y, composerRelativeY ?? Number.MAX_SAFE_INTEGER);
+            // same height as composer label (at least not lower). ?? prevents undefined -> Math.min returns NaN
+
             //skyBottomLineCalculator.updateSkyLineInRange(startX, endX, currentMin - lyricist.PositionAndShape.MarginSize.height);
             //relative.y = Math.max(relative.y, composer.PositionAndShape.RelativePosition.y);
             lyricist.PositionAndShape.RelativePosition = relative;

+ 1 - 1
src/OpenSheetMusicDisplay/OpenSheetMusicDisplay.ts

@@ -35,7 +35,7 @@ import { DynamicsCalculator } from "../MusicalScore/ScoreIO/MusicSymbolModules/D
  * After the constructor, use load() and render() to load and render a MusicXML file.
  */
 export class OpenSheetMusicDisplay {
-    private version: string = "1.4.1-audio-extended"; // getter: this.Version
+    private version: string = "1.4.2-audio-extended"; // getter: this.Version
     // at release, bump version and change to -release, afterwards to -dev again
 
     /**