fix indentation & jshint predefines

according to svbergerem's annotations
This commit is contained in:
realtin 2015-09-10 14:48:25 +02:00
parent 263dc6f119
commit 52fac5740e
5 changed files with 11 additions and 10 deletions

View file

@ -23,7 +23,7 @@ app.views.LocationStream = app.views.Content.extend({
"rendering <a href='http://giscience.uni-hd.de/'>" + "rendering <a href='http://giscience.uni-hd.de/'>" +
"GIScience Research Group @ Heidelberg University</a>", "GIScience Research Group @ Heidelberg University</a>",
maxZoom: 18, maxZoom: 18,
}); });
// If the mapbox option is enabled in the diaspora.yml, the mapbox tiles with the podmin's credentials are used. // If the mapbox option is enabled in the diaspora.yml, the mapbox tiles with the podmin's credentials are used.
if (gon.appConfig.map.mapbox.enabled) { if (gon.appConfig.map.mapbox.enabled) {
@ -46,7 +46,7 @@ app.views.LocationStream = app.views.Content.extend({
} }
} else { } else {
mapContainer.toggle(); mapContainer.toggle();
} }
} }
}); });
// @license-end // @license-end

View file

@ -46,7 +46,7 @@ app.views.SinglePostContent = app.views.Base.extend({
"rendering <a href='http://giscience.uni-hd.de/'>" + "rendering <a href='http://giscience.uni-hd.de/'>" +
"GIScience Research Group @ Heidelberg University</a>", "GIScience Research Group @ Heidelberg University</a>",
maxZoom: 18, maxZoom: 18,
}); });
// If the mapbox option is enabled in the diaspora.yml, the mapbox tiles with the podmin's credentials are used. // If the mapbox option is enabled in the diaspora.yml, the mapbox tiles with the podmin's credentials are used.
if (gon.appConfig.map.mapbox.enabled) { if (gon.appConfig.map.mapbox.enabled) {
@ -70,13 +70,13 @@ app.views.SinglePostContent = app.views.Base.extend({
// put marker on map // put marker on map
var markerOnMap = L.marker(location).addTo(map); var markerOnMap = L.marker(location).addTo(map);
return map; return map;
} }
}, },
toggleMap: function () { toggleMap: function () {
$(".mapContainer").height($(".small-map")[0] ? 200 : 50); $(".mapContainer").height($(".small-map")[0] ? 200 : 50);
$(".leaflet-control-zoom").css("display", $(".small-map")[0] ? "block" : "none"); $(".leaflet-control-zoom").css("display", $(".small-map")[0] ? "block" : "none");
$(".mapContainer").toggleClass("small-map"); $(".mapContainer").toggleClass("small-map");
}, },
presenter : function() { presenter : function() {

View file

@ -46,6 +46,7 @@
"HandlebarsTemplates", "HandlebarsTemplates",
"ImagePaths", "ImagePaths",
"jsxc", "jsxc",
"L",
"MBP", "MBP",
"Routes", "Routes",
"OSM", "OSM",
@ -53,7 +54,7 @@
"punycode", "punycode",
"qq", "qq",
"blueimp", "blueimp",
"L",
"loginAs", "loginAs",
"logout", "logout",
"spec", "spec",

View file

@ -28,7 +28,7 @@ describe("app.views.LocationStream", function() {
this.view.toggleMap(); this.view.toggleMap();
expect($(".mapContainer")).toHaveCss({display: "none"}); expect($(".mapContainer")).toHaveCss({display: "none"});
}); });
}), });
context("without location provided", function() { context("without location provided", function() {
beforeEach(function(){ beforeEach(function(){

View file

@ -35,7 +35,7 @@ describe("app.views.SinglePostContent", function() {
this.view.toggleMap(); this.view.toggleMap();
expect($(".mapContainer").height() < 100).toBeTruthy(); expect($(".mapContainer").height() < 100).toBeTruthy();
}); });
}), });
context("without location provided", function() { context("without location provided", function() {
beforeEach(function(){ beforeEach(function(){