Merge branch 'master' into feature/add-bar

banburybill · banburybill · commit adf805383220 · 2021-05-27T13:07:08.000+01:00
diff --git a/src/anno.ts b/src/anno.ts
@@ -66,8 +66,8 @@ export class AnnoInfo {
     });
 
     // Overwrite it with new points
-    this.trace = {...this.trace, x, y, text};
-    this.trace.marker!.color = color;
+    this.trace = {...this.trace, x, y, text} as any;
+    (this.trace as any).marker.color = color;
     return x.length > 0;
   }
 }
diff --git a/src/partials/tab_traces.html b/src/partials/tab_traces.html
@@ -19,7 +19,7 @@
           class="btn btn-success" ng-click="ctrl.editor.createTrace();"
           style="margin-bottom: 5px; width: 100%"
         >
-          <i class="fa fa-plus"/> Add new
+          <i class="fa fa-plus" ></i> Add new
         </button>
       </li>
       <li>
@@ -28,7 +28,7 @@
           ng-if="ctrl.traces.length > 1"
           style="width: 100%"
         >
-          <i class="fa fa-trash"/> Delete
+          <i class="fa fa-trash"></i> Delete
         </button>
       </li>
     </ul>
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ export class AnnoInfo {`
`66`	`66`	`});`
`67`	`67`
`68`	`68`	`// Overwrite it with new points`
`69`		`- this.trace = {...this.trace, x, y, text};`
`70`		`- this.trace.marker!.color = color;`
	`69`	`+ this.trace = {...this.trace, x, y, text} as any;`
	`70`	`+ (this.trace as any).marker.color = color;`
`71`	`71`	`return x.length > 0;`
`72`	`72`	`}`
`73`	`73`	`}`