GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-06-12 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #425 from Sebring/master

Browse Source 
Showing total in stores tooltip - Issue #170
This commit is contained in:
Michael Townsend
2015-08-02 11:36:57 -04:00
parent 95cf44c2f2 1e37f45530
commit 64f6797c3e
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/main.css
+4
View File
@@ -182,6 +182,10 @@ div.row_val {
float: right; float: right;
} }
div.total {
font-weight: bold;
}
/* Notifications */ /* Notifications */
div#notifications { div#notifications {
script/room.js
+10
View File
@@ -885,6 +885,7 @@ var Room = {
updateIncomeView: function() { updateIncomeView: function() {
var stores = $('div#resources'); var stores = $('div#resources');
var totalIncome = {};
if(stores.length === 0 || typeof $SM.get('income') == 'undefined') return; if(stores.length === 0 || typeof $SM.get('income') == 'undefined') return;
$('div.storeRow', stores).each(function(index, el) { $('div.storeRow', stores).each(function(index, el) {
el = $(el); el = $(el);
@@ -900,10 +901,19 @@ var Room = {
.addClass('row_val') .addClass('row_val')
.text(Engine.getIncomeMsg(income.stores[store], income.delay)) .text(Engine.getIncomeMsg(income.stores[store], income.delay))
.appendTo(tt); .appendTo(tt);
if (totalIncome[store] === undefined || totalIncome[store]['income'] === undefined) {
totalIncome[store] = {};
totalIncome[store]['income'] = 0;
}
totalIncome[store]['income'] += Number(income.stores[store]);
totalIncome[store]['delay'] = income.delay;
} }
} }
} }
if(tt.children().length > 0) { if(tt.children().length > 0) {
var total = totalIncome[storeName]['income'];
$('<div>').addClass('total row_key').text(_('total')).appendTo(tt);
$('<div>').addClass('total row_val').text(Engine.getIncomeMsg(total, totalIncome[storeName]['delay'])).appendTo(tt);
tt.appendTo(el); tt.appendTo(el);
} }
}); });