nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6459 from svbergerem/spv-map-fix-console-error

Browse source 
Fix console error for map in SPV
This commit is contained in:
Jonne Haß 2015-10-05 13:00:43 +02:00
commit 4f23b901e1
2 changed files with 64 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js
View file

@ -27,11 +27,11 @@ app.views.SinglePostContent = app.views.Base.extend({
}, },
map : function(){ map : function(){
if (this.$el.find(".mapContainer")){ if (this.$(".mapContainer").length < 1){ return; }
// find and set height of mapContainer to max size of the container // find and set height of mapContainer to max size of the container
// which is necessary to have all necessary tiles prerendered // which is necessary to have all necessary tiles prerendered
var mapContainer = this.$el.find(".mapContainer"); var mapContainer = this.$(".mapContainer");
mapContainer.css("height", "200px"); mapContainer.css("height", "200px");
// get location data and render map // get location data and render map
@ -72,7 +72,6 @@ app.views.SinglePostContent = app.views.Base.extend({
// put marker on map // put marker on map
L.marker(location).addTo(map); L.marker(location).addTo(map);
return map; return map;
}
}, },
toggleMap: function () { toggleMap: function () {

28
spec/javascripts/app/views/single_post_content_view_spec.js
View file

@ -5,6 +5,34 @@ describe("app.views.SinglePostContent", function() {
gon.appConfig = { map: {mapbox: {enabled: true, id: "yourID", accessToken: "yourAccessToken" }}}; gon.appConfig = { map: {mapbox: {enabled: true, id: "yourID", accessToken: "yourAccessToken" }}};
}); });
describe("map", function() {
context("with location provided", function() {
beforeEach(function(){
this.post.set({location : factory.location()});
spec.content().html(this.view.render().el);
gon.appConfig = { map: {mapbox: {enabled: false }}};
});
it("initializes the leaflet map", function() {
spyOn(L, "map").and.callThrough();
this.view.map();
expect(L.map).toHaveBeenCalled();
});
});
context("without location provided", function() {
beforeEach(function(){
spec.content().html(this.view.render().el);
});
it("doesn't initialize the leaflet map", function() {
spyOn(L, "map");
this.view.map();
expect(L.map).not.toHaveBeenCalled();
});
});
});
describe("toggleMap", function() { describe("toggleMap", function() {
context("with location provided", function() { context("with location provided", function() {
beforeEach(function(){ beforeEach(function(){