浏览代码

change all remaining 'import * as x from...' imports to 'import x...'

related to such changes in #706
(vexflow update to 1.2.91 requiring these at different spots)
sschmid 5 年之前
父节点
当前提交
7693c76dd5

+ 5 - 2
src/MusicalScore/Graphical/DrawingEnums.ts

@@ -1,4 +1,5 @@
-import * as Collections from "typescript-collections";
+// import * as Collections from "typescript-collections";
+import Collections = require("typescript-collections");
 
 /**
  * The supported styles to draw a rectangle on the music sheet
@@ -40,7 +41,9 @@ export enum OutlineAndFillStyleEnum {
 }
 
 // tslint:disable-next-line:max-line-length A linebreak would be more confusing here
-export const OUTLINE_AND_FILL_STYLE_DICT: Collections.Dictionary<OutlineAndFillStyleEnum, string> = new Collections.Dictionary<OutlineAndFillStyleEnum, string>();
+console.dir(Collections);
+export const OUTLINE_AND_FILL_STYLE_DICT: Collections.Dictionary<OutlineAndFillStyleEnum, string> =
+    new Collections.Dictionary<OutlineAndFillStyleEnum, string>();
 OUTLINE_AND_FILL_STYLE_DICT.setValue(OutlineAndFillStyleEnum.BaseWritingColor, "Thistle");
 OUTLINE_AND_FILL_STYLE_DICT.setValue(OutlineAndFillStyleEnum.FollowingCursor, "Aqua");
 OUTLINE_AND_FILL_STYLE_DICT.setValue(OutlineAndFillStyleEnum.AlternativeFollowingCursor, "Azure");

+ 1 - 1
src/MusicalScore/Graphical/VexFlow/VexFlowBackend.ts

@@ -1,4 +1,4 @@
-import * as Vex from "vexflow";
+import Vex from "vexflow";
 import {FontStyles} from "../../../Common/Enums/FontStyles";
 import {Fonts} from "../../../Common/Enums/Fonts";
 import {RectangleF2D} from "../../../Common/DataObjects/RectangleF2D";

+ 0 - 3
src/MusicalScore/Graphical/VexFlow/VexFlowMeasure.ts

@@ -1,6 +1,3 @@
-// import Vex from "vexflow";
-// import * as Vex from "vexflow";
-// import {NoteSubGroup} from "vexflow";
 import Vex from "vexflow";
 import {GraphicalMeasure} from "../GraphicalMeasure";
 import {SourceMeasure} from "../../VoiceData/SourceMeasure";

+ 1 - 1
src/Util/BaseIdClass.ts

@@ -1,4 +1,4 @@
-//import * as shortid from "shortid";
+//import shortid from "shortid";
 
 /**
  * Support for the unique id generator.

+ 2 - 2
test/MusicalScore/ScoreIO/Key_Test.ts

@@ -3,8 +3,8 @@ import { MusicSheet }             from "../../../src/MusicalScore/MusicSheet";
 import { IXmlElement }            from "../../../src/Common/FileIO/Xml";
 import { KeyInstruction }         from "../../../src/MusicalScore/VoiceData/Instructions/KeyInstruction";
 import { KeyEnum as KeyModeEnum } from "../../../src/MusicalScore/VoiceData/Instructions/KeyInstruction";
-import { VexFlowConverter } from "../../../src/MusicalScore/Graphical/VexFlow/VexFlowConverter";
-import * as chai                  from "chai";
+import { VexFlowConverter }       from "../../../src/MusicalScore/Graphical/VexFlow/VexFlowConverter";
+import chai                       from "chai";
 import { AbstractNotationInstruction } from "../../../src/MusicalScore/VoiceData/Instructions/AbstractNotationInstruction";
 import { RhythmInstruction, RhythmSymbolEnum } from "../../../src/MusicalScore/VoiceData/Instructions/RhythmInstruction";
 

+ 1 - 1
test/Util/DiffImages_Test_Experimental.ts

@@ -1,6 +1,6 @@
 import { OpenSheetMusicDisplay, CanvasVexFlowBackend } from "../../src";
 import { TestUtils } from "./TestUtils";
-//import * as fs from "fs";
+//import fs from "fs";
 
 // experimental code, shouldn't be included in Karma test suite