Merge branch 'layerChooser' of https://github.com/hastarin/ingress-intel-total-conversion into hastarin-layerChooser

This commit is contained in:
Jon Atkins
2013-05-08 21:39:29 +01:00
6 changed files with 29 additions and 23 deletions

View File

@ -24,6 +24,6 @@ window.setupGeosearch = function() {
e.preventDefault();
});
$('#geosearchwrapper img').click(function(){
map.locate({setView : true});;
map.locate({setView : true, maxZoom: 13});;
});
}

View File

@ -33,7 +33,7 @@ window.portalHighlighterControl = function() {
});
$("#portal_highlight_select").val(_current_highlighter);
$("#portal_highlight_select").change(function(){ changePortalHighlights($(this).val());});
$(".leaflet-top.leaflet-left").css('padding-top','25px');
$(".leaflet-top.leaflet-left").css('padding-top', '20px');
$(".leaflet-control-scale-line").css('margin-top','25px');
}
}
@ -61,4 +61,4 @@ window.resetHighlightedPortals = function() {
}
catch(e) {}
});
}
}

View File

@ -77,8 +77,6 @@ window.runOnSmartphonesAfterBoot = function() {
// disable img full view
$('#portaldetails').off('click', '**');
$('.leaflet-right').addClass('leaflet-left').removeClass('leaflet-right');
// make buttons in action bar flexible
var l = $('#chatcontrols a:visible');
l.css('width', 100/l.length + '%');

View File

@ -1,6 +1,7 @@
// created to start cleaning up "window" interaction
//
window.show = function(id) {
window.hideall();
switch(id) {
case 'full':
window.chat.show('full');
@ -19,6 +20,7 @@ window.show = function(id) {
break;
case 'map':
window.smartphone.mapButton.click();
$('#portal_highlight_select').show();
break;
case 'info':
window.smartphone.sideButton.click();
@ -28,3 +30,8 @@ window.show = function(id) {
break;
}
}
window.hideall = function() {
$('#chatcontrols, #chat, #chatinput, #sidebartoggle, #scrollwrapper, #updatestatus, #portal_highlight_select').hide();
$('#map').css('visibility', 'hidden');
}