Fix a bug with multi influences display

cptpingu · May 25, 2020 · 1060403 · 1060403
1 parent 6df2097
commit 1060403
Show file tree

Hide file tree

Showing 7 changed files with 834 additions and 29 deletions.
diff --git a/data/template/parts/item.tmpl b/data/template/parts/item.tmpl
@@ -36,7 +36,7 @@
                 </div>
                 <div class="socketPopups"></div>
                 <div class="iconContainer">
-                  <div class="icon {{ InfluenceName . }}" {{ GenSpecialBackground . | attr }}>
+                  <div class="icon {{ InfluenceName . true }} {{ InfluenceName . false }}" {{ GenSpecialBackground . | attr }}>
                     <img class="object-img" src="{{ .Icon }}" alt="" />
 
                     {{ if .Sockets }}

diff --git a/data/template/parts/itemdesc.tmpl b/data/template/parts/itemdesc.tmpl
@@ -16,7 +16,7 @@
 
               <div class="itemBoxContent">
                 <div class="itemHeader {{ ItemRarityHeight .FrameType }} {{ if .IsVeiled }}veiled{{ end }}">
-                  <span class="l symbol {{ InfluenceName . }}"></span>
+                  <span class="l symbol {{ InfluenceName . true }}"></span>
                   {{ if .Name }}
                   <div class="itemName">
                     <span class="lc">{{ .Name }}</span>
@@ -33,7 +33,7 @@
                     <span class="lc">{{ .Type }}</span>
                   </div>
                   {{ end }}
-                  <span class="r symbol {{ InfluenceName . }}"></span>
+                  <span class="r symbol {{ InfluenceName . false }}"></span>
                 </div>
 
                 <div class="content">

diff --git a/demo/all_stash_types/stash_0.json b/demo/all_stash_types/stash_0.json
@@ -1,5 +1,5 @@
 {
-    "numTabs": 19,
+    "numTabs": 20,
     "tabs": [
         {
             "n": "empty",
@@ -304,6 +304,22 @@
             "srcL": "https:\/\/web.poecdn.com\/gen\/image\/WzIzLDEseyJ0IjoibCIsImMiOi04NjI5MTk0fV0\/10d10e4923\/Stash_TabL.png",
             "srcC": "https:\/\/web.poecdn.com\/gen\/image\/WzIzLDEseyJ0IjoibSIsImMiOi04NjI5MTk0fV0\/bc028daabc\/Stash_TabL.png",
             "srcR": "https:\/\/web.poecdn.com\/gen\/image\/WzIzLDEseyJ0IjoiciIsImMiOi04NjI5MTk0fV0\/6aa79009ee\/Stash_TabL.png"
+        },
+        {
+            "n": "Influences",
+            "i": 19,
+            "id": "1c073013340d4dc60d2db47c6c31ca9c6fc36767b2c24dcd2af4bb3bb595dbac",
+            "type": "NormalStash",
+            "hidden": false,
+            "selected": true,
+            "colour": {
+                "r": 255,
+                "g": 170,
+                "b": 0
+            },
+            "srcL": "https:\/\/web.poecdn.com\/gen\/image\/WzIzLDEseyJ0IjoibCIsImMiOi04NjI5MTk0fV0\/10d10e4923\/Stash_TabL.png",
+            "srcC": "https:\/\/web.poecdn.com\/gen\/image\/WzIzLDEseyJ0IjoibSIsImMiOi04NjI5MTk0fV0\/bc028daabc\/Stash_TabL.png",
+            "srcR": "https:\/\/web.poecdn.com\/gen\/image\/WzIzLDEseyJ0IjoiciIsImMiOi04NjI5MTk0fV0\/6aa79009ee\/Stash_TabL.png"
         }
     ],
     "items": []

diff --git a/demo/all_stash_types/stash_1.json b/demo/all_stash_types/stash_1.json
@@ -1,5 +1,4 @@
 {
-    "numTabs": 14,
     "currencyLayout": {
         "0": {
             "x": 302.4340770791075,