From 52fac5740e4e8a1192af85e6f4dcef3aaf36679f Mon Sep 17 00:00:00 2001 From: realtin Date: Thu, 10 Sep 2015 14:48:25 +0200 Subject: [PATCH] fix indentation & jshint predefines according to svbergerem's annotations --- app/assets/javascripts/app/views/location_stream.js | 4 ++-- .../single-post-viewer/single_post_content_view.js | 10 +++++----- config/.jshint.json | 3 ++- spec/javascripts/app/views/location_stream_spec.js | 2 +- .../app/views/single_post_content_view_spec.js | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/app/views/location_stream.js b/app/assets/javascripts/app/views/location_stream.js index eb140f054..d9f727347 100644 --- a/app/assets/javascripts/app/views/location_stream.js +++ b/app/assets/javascripts/app/views/location_stream.js @@ -23,7 +23,7 @@ app.views.LocationStream = app.views.Content.extend({ "rendering " + "GIScience Research Group @ Heidelberg University", maxZoom: 18, - }); + }); // 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) { @@ -46,7 +46,7 @@ app.views.LocationStream = app.views.Content.extend({ } } else { mapContainer.toggle(); - } + } } }); // @license-end diff --git a/app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js b/app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js index 6cfbb9528..0bfb35b2d 100644 --- a/app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js +++ b/app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js @@ -46,7 +46,7 @@ app.views.SinglePostContent = app.views.Base.extend({ "rendering " + "GIScience Research Group @ Heidelberg University", maxZoom: 18, - }); + }); // 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) { @@ -70,13 +70,13 @@ app.views.SinglePostContent = app.views.Base.extend({ // put marker on map var markerOnMap = L.marker(location).addTo(map); return map; - } + } }, toggleMap: function () { - $(".mapContainer").height($(".small-map")[0] ? 200 : 50); - $(".leaflet-control-zoom").css("display", $(".small-map")[0] ? "block" : "none"); - $(".mapContainer").toggleClass("small-map"); + $(".mapContainer").height($(".small-map")[0] ? 200 : 50); + $(".leaflet-control-zoom").css("display", $(".small-map")[0] ? "block" : "none"); + $(".mapContainer").toggleClass("small-map"); }, presenter : function() { diff --git a/config/.jshint.json b/config/.jshint.json index c56365620..cf93d1e6e 100644 --- a/config/.jshint.json +++ b/config/.jshint.json @@ -46,6 +46,7 @@ "HandlebarsTemplates", "ImagePaths", "jsxc", + "L", "MBP", "Routes", "OSM", @@ -53,7 +54,7 @@ "punycode", "qq", "blueimp", - "L", + "loginAs", "logout", "spec", diff --git a/spec/javascripts/app/views/location_stream_spec.js b/spec/javascripts/app/views/location_stream_spec.js index 54513b996..6f8683b2a 100644 --- a/spec/javascripts/app/views/location_stream_spec.js +++ b/spec/javascripts/app/views/location_stream_spec.js @@ -28,7 +28,7 @@ describe("app.views.LocationStream", function() { this.view.toggleMap(); expect($(".mapContainer")).toHaveCss({display: "none"}); }); - }), + }); context("without location provided", function() { beforeEach(function(){ diff --git a/spec/javascripts/app/views/single_post_content_view_spec.js b/spec/javascripts/app/views/single_post_content_view_spec.js index 688891f96..645e86a31 100644 --- a/spec/javascripts/app/views/single_post_content_view_spec.js +++ b/spec/javascripts/app/views/single_post_content_view_spec.js @@ -35,7 +35,7 @@ describe("app.views.SinglePostContent", function() { this.view.toggleMap(); expect($(".mapContainer").height() < 100).toBeTruthy(); }); - }), + }); context("without location provided", function() { beforeEach(function(){