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

Forgot to mention in the last commit: fix an unguarded for in.

JSLint part 2: == -> === changes, dot notation changes.
parent f69c8b33
No related branches found
No related tags found
No related merge requests found
...@@ -116,12 +116,12 @@ Drupal.gmap.map = function (v) { ...@@ -116,12 +116,12 @@ Drupal.gmap.map = function (v) {
var c; var c;
if (_bindings[name]) { if (_bindings[name]) {
for (c = 0; c < _bindings[name].length; c++) { for (c = 0; c < _bindings[name].length; c++) {
if (c != id) { if (c !== id) {
_bindings[name][c](userdata); _bindings[name][c](userdata);
} }
} }
} }
if (name != 'all') { if (name !== 'all') {
this.change('all', -1, name, userdata); this.change('all', -1, name, userdata);
} }
}; };
...@@ -162,7 +162,7 @@ Drupal.gmap.addHandler('gmap', function (elem) { ...@@ -162,7 +162,7 @@ Drupal.gmap.addHandler('gmap', function (elem) {
_ib.mtc = obj.bind("maptypechange", function () { _ib.mtc = obj.bind("maptypechange", function () {
var i; var i;
for (i = 0; i < obj.opts.mapTypeNames.length; i++) { for (i = 0; i < obj.opts.mapTypeNames.length; i++) {
if (obj.opts.mapTypeNames[i] == obj.vars.maptype) { if (obj.opts.mapTypeNames[i] === obj.vars.maptype) {
obj.map.setMapType(obj.opts.mapTypes[i]); obj.map.setMapType(obj.opts.mapTypes[i]);
break; break;
} }
...@@ -189,13 +189,13 @@ Drupal.gmap.addHandler('gmap', function (elem) { ...@@ -189,13 +189,13 @@ Drupal.gmap.addHandler('gmap', function (elem) {
if (obj.currentcontrol) { if (obj.currentcontrol) {
obj.map.removeControl(obj.currentcontrol); obj.map.removeControl(obj.currentcontrol);
} }
if (obj.vars.controltype == 'Micro') { if (obj.vars.controltype === 'Micro') {
obj.map.addControl(obj.currentcontrol = new GSmallZoomControl()); obj.map.addControl(obj.currentcontrol = new GSmallZoomControl());
} }
else if (obj.vars.controltype == 'Small') { else if (obj.vars.controltype === 'Small') {
obj.map.addControl(obj.currentcontrol = new GSmallMapControl()); obj.map.addControl(obj.currentcontrol = new GSmallMapControl());
} }
else if (obj.vars.controltype == 'Large') { else if (obj.vars.controltype === 'Large') {
obj.map.addControl(obj.currentcontrol = new GLargeMapControl()); obj.map.addControl(obj.currentcontrol = new GLargeMapControl());
} }
}); });
...@@ -212,19 +212,19 @@ Drupal.gmap.addHandler('gmap', function (elem) { ...@@ -212,19 +212,19 @@ Drupal.gmap.addHandler('gmap', function (elem) {
opts.mapTypeNames = []; opts.mapTypeNames = [];
// Load google map types. // Load google map types.
if (obj.vars.baselayers['Map']) { if (obj.vars.baselayers.Map) {
opts.mapTypes.push(G_NORMAL_MAP); opts.mapTypes.push(G_NORMAL_MAP);
opts.mapTypeNames.push('Map'); opts.mapTypeNames.push('Map');
} }
if (obj.vars.baselayers['Satellite']) { if (obj.vars.baselayers.Satellite) {
opts.mapTypes.push(G_SATELLITE_MAP); opts.mapTypes.push(G_SATELLITE_MAP);
opts.mapTypeNames.push('Satellite'); opts.mapTypeNames.push('Satellite');
} }
if (obj.vars.baselayers['Hybrid']) { if (obj.vars.baselayers.Hybrid) {
opts.mapTypes.push(G_HYBRID_MAP); opts.mapTypes.push(G_HYBRID_MAP);
opts.mapTypeNames.push('Hybrid'); opts.mapTypeNames.push('Hybrid');
} }
if (obj.vars.baselayers['Physical']) { if (obj.vars.baselayers.Physical) {
opts.mapTypes.push(G_PHYSICAL_MAP); opts.mapTypes.push(G_PHYSICAL_MAP);
opts.mapTypeNames.push('Physical'); opts.mapTypeNames.push('Physical');
} }
...@@ -239,13 +239,13 @@ Drupal.gmap.addHandler('gmap', function (elem) { ...@@ -239,13 +239,13 @@ Drupal.gmap.addHandler('gmap', function (elem) {
var map = obj.map; var map = obj.map;
// Map type control // Map type control
if (obj.vars.mtc == 'standard') { if (obj.vars.mtc === 'standard') {
map.addControl(new GMapTypeControl()); map.addControl(new GMapTypeControl());
} }
else if (obj.vars.mtc == 'hier') { else if (obj.vars.mtc === 'hier') {
map.addControl(new GHierarchicalMapTypeControl()); map.addControl(new GHierarchicalMapTypeControl());
} }
else if (obj.vars.mtc == 'menu') { else if (obj.vars.mtc === 'menu') {
map.addControl(new GMenuMapTypeControl()); map.addControl(new GMenuMapTypeControl());
} }
...@@ -313,7 +313,7 @@ Drupal.gmap.addHandler('gmap', function (elem) { ...@@ -313,7 +313,7 @@ Drupal.gmap.addHandler('gmap', function (elem) {
var type = map.getCurrentMapType(); var type = map.getCurrentMapType();
var i; var i;
for (i = 0; i < obj.opts.mapTypes.length; i++) { for (i = 0; i < obj.opts.mapTypes.length; i++) {
if (obj.opts.mapTypes[i] == type) { if (obj.opts.mapTypes[i] === type) {
obj.vars.maptype = obj.opts.mapTypeNames[i]; obj.vars.maptype = obj.opts.mapTypeNames[i];
} }
} }
......
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