Commit 53ef33c1 authored by Dominik Rosiek's avatar Dominik Rosiek

jest ok, better loading :)

parent 014e26f4
......@@ -34,7 +34,7 @@ Map.prototype.addMarker = function(data){
title: data.title,
beacon: data.beacon
}).addListener('click', function() {
self.showInfo(this)
self.showInfo(this.beacon)
})
self.markers.push(marker)
......@@ -55,7 +55,40 @@ Map.prototype.getAllBeacons = function(){
})
}
Map.prototype.showInfo = function(marker){
Map.prototype.showInfo = function(beacon){
$("#myModalLabel").text([beacon.name, " (", beacon.uuid, ")"].join(""))
$("#modal-content").html([
'<div class="col-md-6">',
'description:',
'</div>',
'<div class="col-md-6">',
beacon.description,
'</div>',
'<div class="col-md-6">',
'name:',
'</div>',
'<div class="col-md-6">',
beacon.name,
'</div>',
'<div class="col-md-6">',
'uuid:',
'</div>',
'<div class="col-md-6">',
beacon.uuid,
'</div>',
'<div class="col-md-6">',
'longitude:',
'</div>',
'<div class="col-md-6">',
beacon.longitude,
'</div>',
'<div class="col-md-6">',
'latitude:',
'</div>',
'<div class="col-md-6">',
beacon.latitude,
'</div>',
'<div class="clearfix"></div>'].join(""))
$("#myModal").modal("show");
// alert('marker klikniety' + marker.beacon.uuid)
}
\ No newline at end of file
......@@ -24,8 +24,8 @@
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">Modal title</h4>
</div>
<div class="modal-body">
hehe
<div class="modal-body" id="modal-content">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment