Changeset 253 for binary-improvements/webserver/js

Timestamp:

Dec 12, 2015, 4:08:53 PM (9 years ago)

Author:

alloc

Message:

Fixes 6_8_10

Location:

binary-improvements/webserver/js

Files:

• inventory_dialog.js (modified) (1 diff)
• map.js (modified) (1 diff)

binary-improvements/webserver/js/inventory_dialog.js

@@ -18 +18 @@
                 qual.removeClass ("visible");
 
-                if (itemdata !== null) {
-                        cell.attr("style", "background-image: url(" + ITEMICONBASEURL + itemdata.icon + "@@" + itemdata.iconcolor + ".png);");
+                if (itemdata !== null && itemdata !== undefined) {
+                        cell.attr("style", "background-image: url(" + ITEMICONBASEURL + itemdata.icon + "__" + itemdata.iconcolor + ".png);");
                         if (itemdata.quality >= 0) {
                                 cell.attr("title", itemdata.name + " (quality: " + itemdata.quality + ")");

binary-improvements/webserver/js/map.js

@@ -124 +124 @@
 
         var measure = L.control.measure({
-                //primaryLengthUnit: "meters",
-                //primaryAreaUnit: "sqmeters",
+                units: {
+                        sdtdMeters: {
+                                factor: 0.00001,
+                                display: 'XMeters',
+                                decimals: 0
+                        },
+                        sdtdSqMeters: {
+                                factor: 0.000000001,
+                                display: 'XSqMeters',
+                                decimals: 0
+                        }
+                },
+                primaryLengthUnit: "sdtdMeters",
+                primaryAreaUnit: "sdtdSqMeters",
                 //activeColor: "#ABE67E",
                 //completedColor: "#C8F2BE",