Changeset 171

Timestamp:

Sep 5, 2014, 10:54:12 PM (10 years ago)

Author:

alloc

Message:

Minor webserver files update

Location:

binary-improvements/webserver

Files:

• css/style.css (modified) (1 diff)
• index.html (modified) (1 diff)
• js/index.js (modified) (5 diffs)

binary-improvements/webserver/css/style.css

@@ -43 +43 @@
                 1px 1px 0 #000;
 }
+.inventoryButton {
+        color: #00ff00;
+        cursor: pointer;
+}
+#playerInventoryDialog {
+        display:none;
+}
+.ui-dialog {
+        z-index:1011 !important;
+}
+.ui-widget-overlay {
+        z-index:1010 !important;
+}
 

binary-improvements/webserver/index.html

@@ -16 +16 @@
                 MouseCoords: <span id="pos"></span>
         </div>
-        <div id="dialog-message" title="Player inventory" style="display:none">
+        <div id="playerInventoryDialog" title="Player inventory">
                 Player: <span id="invPlayerName"></span>
                 <table class="invTable" id="bagTable">

binary-improvements/webserver/js/index.js

@@ -180 +180 @@
                 }
 
-                $( "#dialog-message" ).dialog({
+                $( "#playerInventoryDialog" ).css("z-index", "1010").dialog({
                         modal: true,
-                        width: BAG_COLS*INV_ITEM_WIDTH + 60,
+                        width: BAG_COLS*(INV_ITEM_WIDTH+14) + 20,
                         buttons: {
                                 Ok: function() {
@@ -190 +190 @@
                 });
         })
-        .fail(function() {
+        .fail(function(jqxhr, textStatus, error) {
                 console.log("Error fetching player inventory");
         })
@@ -214 +214 @@
                 "</td>");
 }
+
+$(".leaflet-popup-pane").on('click.action', '.inventoryButton', function(event) {
+        showInv($(this).data('steamid'));
+});
 
 var setPlayerMarkers = function(data) {
@@ -226 +230 @@
                         marker = L.marker([val.position.z, val.position.x]).bindPopup(
                                 "Player: " + val.name + "<br/>" +
-                                "<a onClick='showInv(\""+val.steamid+"\")'>Show inventory</a>" 
+                                "<a class='inventoryButton' data-steamid='"+val.steamid+"'>Show inventory</a>"
                         );
                         playersMappingList[val.steamid] = { online: !val.online };
@@ -256 +260 @@
         $.getJSON( "../api/getplayerslocation")
         .done(setPlayerMarkers)
-        .fail(function() {
+        .fail(function(jqxhr, textStatus, error) {
                 console.log("Error fetching players list");
         })