summaryrefslogtreecommitdiff
path: root/chimere/static
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-10-25 23:27:53 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-10-25 23:27:53 +0200
commitfda62e9b16ff53c20880bd2ebbe34ce55d633c2d (patch)
treedf1c1499049e1b76d172b097171ca38e265d17ba /chimere/static
parent11c2e905c242ba8360ebde9d0e3b7af47a43793a (diff)
downloadChimère-fda62e9b16ff53c20880bd2ebbe34ce55d633c2d.tar.bz2
Chimère-fda62e9b16ff53c20880bd2ebbe34ce55d633c2d.zip
Adapt template an JS lib for mobile
Diffstat (limited to 'chimere/static')
-rw-r--r--chimere/static/chimere/js/jquery.chimere.js24
1 files changed, 19 insertions, 5 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 39b3b61..274af85 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -82,10 +82,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
hide_popup_fx: null,
// if leave to false every click on the map hide the pop-up
explicit_popup_hide: false,
- controls:[new OpenLayers.Control.Navigation(),
- new OpenLayers.Control.PanPanel(),
- new OpenLayers.Control.ZoomPanel(),
- new OpenLayers.Control.ScaleLine()],
+ controls:null,
popupClass: OpenLayers.Popup.FramedCloud,
popupContentFull: false, // if true the detail is inside the popup
category_accordion: true, // category opening behave like an accordion
@@ -117,7 +114,8 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
marker_hover_offset: null,
icon_start: null,
icon_step: null,
- icon_end: null
+ icon_end: null,
+ mobile:false
};
var settings = {};
/*
@@ -156,6 +154,21 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
}
settings = $.extend({}, defaults);
if ( options ) $.extend(settings, options);
+ if (settings.controls == null){
+ if (settings.mobile){
+ settings.controls = [new OpenLayers.Control.TouchNavigation({
+ dragPanOptions: {
+ enableKinetic: true
+ }
+ }),
+ new OpenLayers.Control.Zoom()];
+ } else {
+ settings.controls = [new OpenLayers.Control.Navigation(),
+ new OpenLayers.Control.PanPanel(),
+ new OpenLayers.Control.ZoomPanel(),
+ new OpenLayers.Control.ScaleLine()];
+ }
+ }
var map_element = $(this).get(0);
var map_options = {
controls: settings.controls,
@@ -907,6 +920,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
OpenLayers.Event.stop(evt);
};
marker.events.register('click', feature, markerClick);
+ marker.events.register('touchstart', feature, markerClick);
marker.events.register('mouseover', feature, markerOver);
marker.events.register('mouseout', feature, markerOut);
settings.layerMarkers.addMarker(marker);