fly/fgdata
1
0
Fork 0
Code Activity

Phi: Correc vertical size of Map topic's content

Browse source
This commit is contained in:
Torsten Dreyer 2015-02-25 09:27:19 +01:00
parent 7202e25099
commit b522b818a5
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
webgui/topics/Aircraft/Help.js
View file

@ -39,7 +39,6 @@ define([
}); });
} }
}); });
console.log(helpContent);
self.helpContent(helpContent); self.helpContent(helpContent);
}); });

2
webgui/topics/Aircraft/Select.html
View file

@ -1,6 +1,6 @@
<div data-bind="if: catalogs().length == 0"> <div data-bind="if: catalogs().length == 0">
<h3>No Catalogs found</h3> <h3>No Catalogs found</h3>
Sorry, but no package catalogs were found by your FlightGear instance. Sorry, but no package catalogs were found by your FlightGear.
</div> </div>
<div data-bind="foreach: catalogs"> <div data-bind="foreach: catalogs">
<h3>Package <span data-bind="text: id"></span></h3> <h3>Package <span data-bind="text: id"></span></h3>

2
webgui/topics/Map.html
View file

@ -1 +1 @@
<div data-bind="component: { name: 'map', params: { props: $root.props }}"></div> <div data-bind="component: { name: 'map', params: { css: { width: '100%', height: '100%' }}}"></div>

11
webgui/widgets/map.js
View file

@ -22,7 +22,11 @@ define(
fgprop : 'heading' fgprop : 'heading'
}); });
$(self.element).height($(self.element).width()); if (params && params.css)
for ( var p in params.css) {
$(self.element).css(p, params.css[p]);
}
self.map = leaflet.map(self.element).setView([ self.map = leaflet.map(self.element).setView([
53.5, 10.0 53.5, 10.0
@ -86,10 +90,9 @@ define(
], ],
}, this); }, this);
this.popup this.popup
.setContent( '<div class="aircraft-marker aircraft-marker-altitude"><span data-bind="text: altitude().toFixed(0)"></span>ft</div>' .setContent('<div class="aircraft-marker aircraft-marker-altitude"><span data-bind="text: altitude().toFixed(0)"></span>ft</div>'
+ '<div class="aircraft-marker aircraft-marker-heading"><span data-bind="text: heading().toFixed(0)"></span>&deg</div>' + '<div class="aircraft-marker aircraft-marker-heading"><span data-bind="text: heading().toFixed(0)"></span>&deg</div>'
+ '<div class="aircraft-marker aircraft-marker-tas"><span data-bind="text: tas().toFixed(0)"></span>kt</div><div style="clear: both"/>' + '<div class="aircraft-marker aircraft-marker-tas"><span data-bind="text: tas().toFixed(0)"></span>kt</div><div style="clear: both"/>');
);
this.bindPopup(this.popup); this.bindPopup(this.popup);
this.addTo(this._map); this.addTo(this._map);
this.openPopup(); this.openPopup();