OpenEcoLab-LasAlpujarras
/
farmOS
mirror of https://github.com/farmOS/farmOS.git
3
0
Fork 0
Code Wiki

Openlayers: Pin commit to 7.x-3.0-beta8+6, remove popup positioning patch, update OL library to 3.12.1.

This commit is contained in:
Michael Stenta 2015-12-28 09:36:05 -05:00
parent 460787aadc
commit 6c00f0e03a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drupal-org.make
View File

@ -90,15 +90,16 @@ projects[navbar][subdir] = "contrib"
projects[navbar][version] = "1.7"
projects[openlayers][subdir] = "contrib"
projects[openlayers][version] = "3.0-beta5"
projects[openlayers][download][type] = "git"
projects[openlayers][download][url] = "http://git.drupal.org/project/openlayers.git"
projects[openlayers][download][branch] = "7.x-3.x"
projects[openlayers][download][revision] = "f25f13501b95ccae4037280f0e37edb236a7a0a4"
; Fix GoogleMaps in Geofield context.
projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_googlemaps_postbuild-2538168-5.patch"
; Remove base layer assignment code.
projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_base_layer_mechanism-2543130-4.patch"
; Move Elements dependency to Openlayers Examples.
projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_examples_elements_dependency-2620098-2.patch"
; Fix popup positioning bug.
projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_popup_position-2629008-7.x-3.x-beta5.patch"
projects[openlayers_geolocate_button][subdir] = "contrib"
projects[openlayers_geolocate_button][version] = "3.1"

9
farm.install
View File

@ -33,7 +33,7 @@ function farm_install() {
variable_set('logintoboggan_site_403_user_login_block', TRUE);
// Load Openlayers 3.10.1 from CDNJS.
\Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:3.10.1');
\Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:3.12.1');
}
/**
@ -275,6 +275,13 @@ function farm_update_7011(&$sandbox) {
\Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:3.10.1');
}
/**
* Load Openlayers 3.12.1 from CDNJS.
*/
function farm_update_7012(&$sandbox) {
\Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:3.12.1');
}
/**
* Helper function: enable modules.
*/