removed svg-inject dependency from ui

bitgapp · Jun 20, 2020 · 2487ff7 · 2487ff7
1 parent 0b44850
commit 2487ff7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 26 deletions.
diff --git a/native/app/Embedded/ui.zip b/native/app/Embedded/ui.zip
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eqmac",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "scripts": {
     "start": "ng serve",
     "build": "rm -rf dist/ && ng build --prod && cd dist/ && zip -r -D ui.zip * -x '*.DS_Store' && cp ui.zip ../../native/app/Embedded",
@@ -22,7 +22,6 @@
     "@angular/pwa": "^0.803.8",
     "@angular/router": "~8.2.9",
     "@angular/service-worker": "~8.2.9",
-    "@iconfu/svg-inject": "^1.2.3",
     "core-js": "^3.2.1",
     "js-cookie": "^2.2.1",
     "ng-click-outside": "^5.1.1",

diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts
@@ -1,4 +1,3 @@
-import '@iconfu/svg-inject'
 import {
   Component,
   OnInit,

diff --git a/ui/src/app/modules/eqmac-components/components/icon/icon.component.html b/ui/src/app/modules/eqmac-components/components/icon/icon.component.html
@@ -1,4 +1 @@
-<!-- <ng-content></ng-content> -->
-<div class="container" [ngStyle]="style" [innerHtml]="svg">
-  <!-- <img #icon [src]="'assets/icons/' + name + '.svg'" onload="SVGInject(this)"/> -->
-</div>
+<div class="container" [ngStyle]="style" [innerHtml]="svg"></div>
diff --git a/ui/src/app/modules/eqmac-components/components/knob/knob.component.html b/ui/src/app/modules/eqmac-components/components/knob/knob.component.html
@@ -4,8 +4,6 @@
 
   <!-- Large -->
   <div *ngIf="size === 'large'" class="knob large">
-    <!-- <img class="scale" src="assets/knobs/large/scale.svg" onload="SVGInject(this)" /> -->
-    <!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In  -->
     <svg class="scale" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
       x="0px" y="0px" width="175.82px" height="144.94px" viewBox="0 0 175.82 144.94"
       style="enable-background:new 0 0 175.82 144.94;" xml:space="preserve">
@@ -56,7 +54,6 @@
 
   <!-- Medium -->
   <div *ngIf="size === 'medium'" class="knob medium">
-    <!-- <img class="scale" src="assets/knobs/medium/scale.svg" onload="SVGInject(this)" /> -->
     <svg class="scale" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
       <g>
         <path
@@ -72,13 +69,11 @@
             d="M19.000,38.000 C8.507,38.000 -0.000,29.493 -0.000,19.000 C-0.000,8.844 7.974,0.574 18.000,0.050 L18.000,13.000 C18.000,13.552 18.448,14.000 19.000,14.000 C19.552,14.000 20.000,13.552 20.000,13.000 L20.000,0.050 C30.026,0.574 38.000,8.844 38.000,19.000 C38.000,29.493 29.493,38.000 19.000,38.000 Z" />
         </g>
       </svg>
-      <!-- <img src="assets/knobs/medium/cap.svg" onload="SVGInject(this)" /> -->
     </div>
   </div>
 
   <!-- Small -->
   <div *ngIf="size === 'small'" class="knob small">
-    <!-- <img class="scale" src="assets/knobs/small/scale.svg" onload="SVGInject(this)" /> -->
     <svg class="scale" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
       xml:space="preserve">
       <g>
@@ -97,7 +92,6 @@
             d="M12.000,24.000 C5.373,24.000 -0.000,18.627 -0.000,12.000 C-0.000,5.710 4.842,0.560 11.000,0.050 L11.000,6.000 C11.000,6.552 11.448,7.000 12.000,7.000 C12.552,7.000 13.000,6.552 13.000,6.000 L13.000,0.050 C19.158,0.560 24.000,5.710 24.000,12.000 C24.000,18.627 18.627,24.000 12.000,24.000 Z" />
         </g>
       </svg>
-      <!-- <img src="assets/knobs/small/cap.svg" onload="SVGInject(this)" /> -->
     </div>
   </div>
 </div>