Skip to content
Snippets Groups Projects
Commit 476c8df5 authored by Brandon Bergren's avatar Brandon Bergren
Browse files

Fix thirdparty file inclusion issues on D7.

parent facee1fe
No related branches found
No related tags found
No related merge requests found
...@@ -257,7 +257,6 @@ function _gmap_base_js() { ...@@ -257,7 +257,6 @@ function _gmap_base_js() {
$ret[$path . '/js/gmap.js'] = array('weight' => 1); $ret[$path . '/js/gmap.js'] = array('weight' => 1);
$ret[$path . '/js/icon.js'] = array('weight' => 2); $ret[$path . '/js/icon.js'] = array('weight' => 2);
$mm = variable_get('gmap_mm_type', 'gmap');
/* /*
$mms = variable_get('gmap_markermanager', array()); $mms = variable_get('gmap_markermanager', array());
if (empty($mms[$mm])) { if (empty($mms[$mm])) {
...@@ -279,7 +278,15 @@ function _gmap_base_js() { ...@@ -279,7 +278,15 @@ function _gmap_base_js() {
$ret[$path . '/js/marker.js'] = array('weight' => 2); $ret[$path . '/js/marker.js'] = array('weight' => 2);
$ret[$path . '/js/highlight.js'] = array('weight' => 2); $ret[$path . '/js/highlight.js'] = array('weight' => 2);
// Add the markermanager.
// @@@TODO Need to allow multiple inclusion and have marker manager set at the map level.
$mm = variable_get('gmap_mm_type', 'gmap');
$mms = variable_get('gmap_markermanager', array());
$ret[$path . '/js/' . $mm . '_marker.js'] = array('weight' => 3); $ret[$path . '/js/' . $mm . '_marker.js'] = array('weight' => 3);
if (isset($mms[$mm]['filename'])) {
$ret[$path . '/thirdparty/' . $mms[$mm]['filename']] = array('weight' => 4);
}
/* /*
drupal_add_js(array('gmap_markermanager' => $mms[$mm]), 'setting'); drupal_add_js(array('gmap_markermanager' => $mms[$mm]), 'setting');
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment