Skip to content

Commit e90f39c

Browse files
committed
Merge branch 'angular_refactor' of https://github.com/cloudspace/angular.crunchinator.com into angular_refactor
2 parents 08bf66d + a59a22b commit e90f39c

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

app/scripts/directives/leafCluster.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ angular.module('crunchinatorApp.directives').directive('leafCluster', function()
4343
});
4444
var geoJsonLayer = L.geoJson(data, {
4545
onEachFeature: function (feature, layer) {
46-
layer.bindPopup(feature.properties.address);
46+
layer.bindPopup(feature.properties.name);
4747
}
4848
});
4949
markers.addLayer(geoJsonLayer);

app/scripts/directives/listSelect.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,17 @@ angular.module('crunchinatorApp.directives').directive('listSelect', ['$rootScop
1313
scope.selectedItems = [];
1414

1515
scope.selectItem = function() {
16-
console.log(scope.selectedItem);
17-
1816
if(!_.contains(scope.selectedItems, scope.selectedItem)) {
1917
scope.selectedItems.push(scope.selectedItem);
2018
scope.selectedItem = '';
2119
}
2220

2321
scope.$parent[scope.selected] = scope.selectedItems;
2422
$rootScope.$broadcast('filterAction');
25-
26-
console.log(scope.selectedItems);
2723
};
2824

2925
scope.removeItem = function(item) {
30-
console.log('remove');
3126
scope.selectedItems = _.without(scope.selectedItems, item);
32-
console.log(scope.selectedItems);
3327
scope.$parent[scope.selected] = scope.selectedItems.slice(0);
3428
$rootScope.$broadcast('filterAction');
3529
};

app/scripts/services/company.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ angular.module('crunchinatorApp.models').service('Company', function(Model, API_
3131
this.applyFilters(exclusions);
3232

3333
this.dataForCompaniesList = this.companiesByName.bottom(Infinity);
34-
console.log(this.dataForCompaniesList);
3534
},
3635
'dataForTotalFunding': function() {
3736
this.resetAllDimensions();

app/scripts/services/componentData.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ angular.module('crunchinatorApp.services').service('ComponentData', function() {
1010
_.each(companies, function(company) {
1111
if(company.latitude && company.longitude) {
1212
geojson.features.push({
13-
'type': 'Feature',
14-
'geometry': {'type': 'Point', 'coordinates': [company.longitude, company.latitude]},
15-
'properties': 0
13+
type: 'Feature',
14+
geometry: {type: 'Point', coordinates: [company.longitude, company.latitude]},
15+
properties: {
16+
name: company.name
17+
}
1618
});
1719
}
1820

0 commit comments

Comments
 (0)