grassrootseconomics/ethstats-server
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed map resize

Browse Source
This commit is contained in:
Marian Oancea 2015-02-08 17:20:43 +02:00
parent dad7b8f2ba
commit 409e83d3ed
2 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
public/js/directives.js
View File

@ -16,33 +16,45 @@ angular.module('netStatsApp.directives', []).
data: '=' data: '='
}, },
link: function(scope, element, attrs) { link: function(scope, element, attrs) {
element.empty(); scope.init = function() {
element.empty();
scope.map = new Datamap({ scope.map = new Datamap({
element: element[0], element: element[0],
scope: 'world', scope: 'world',
responsive: true, responsive: true,
fills: { fills: {
success: '#7bcc3a', success: '#7bcc3a',
info: '#10a0de', info: '#10a0de',
warning: '#FFD162', warning: '#FFD162',
danger: '#F74B4B', danger: '#F74B4B',
defaultFill: '#282828' defaultFill: '#282828'
}, },
geographyConfig: { geographyConfig: {
borderWidth: 0, borderWidth: 0,
borderColor: '#000', borderColor: '#000',
highlightOnHover: false, highlightOnHover: false,
popupOnHover: false popupOnHover: false
}, },
bubblesConfig: { bubblesConfig: {
borderWidth: 0,
popupOnHover: false,
highlightOnHover: false
}
});
scope.map.bubbles(scope.data, {
borderWidth: 0, borderWidth: 0,
popupOnHover: false, popupOnHover: false,
highlightOnHover: false highlightOnHover: false
} });
}); }
scope.map.bubbles(scope.data); scope.init();
window.onresize = function() {
scope.$apply();
};
scope.$watch('data', function() { scope.$watch('data', function() {
scope.map.bubbles(scope.data, { scope.map.bubbles(scope.data, {
@ -51,6 +63,12 @@ angular.module('netStatsApp.directives', []).
highlightOnHover: false highlightOnHover: false
}); });
}, true); }, true);
scope.$watch(function() {
return angular.element(window)[0].innerWidth;
}, function() {
scope.init();
});
} }
}; };
}]); }]);

20
public/js/script.js
View File

@ -1,24 +1,4 @@
(function() { (function() {
var mapHolder = document.getElementById('mapHolder');
mapHolder.clientHeight = mapHolder.clientWidth/2;
Datamap.prototype.resize = function () {
var self = this;
var options = self.options;
if (options.responsive) {
var prefix = '-webkit-transform' in document.body.style ? '-webkit-' : '-moz-transform' in document.body.style ? '-moz-' : '-ms-transform' in document.body.style ? '-ms-' : '',
newsize = options.element.clientWidth,
oldsize = d3.select(options.element).select('svg').attr('data-width');
d3.select(options.element).select('svg').selectAll('g').style(prefix + 'transform', 'scale(' + (newsize / oldsize) + ')');
}
}
d3.select(mapHolder).select('svg').attr('data-width', mapHolder.clientWidth);
// window.addEventListener("resize", function (event) {
// map.resize();
// });
var socket = io.connect(); var socket = io.connect();
socket.on('init', function(data){ socket.on('init', function(data){