make create info window optional parameter

2012-05-06 16:06:04 +03:00
parent 4ae77a9f47
commit e0a4976e6a
3 changed files with 21 additions and 8 deletions
--- a/overviewer_core/data/js_src/views.js
+++ b/overviewer_core/data/js_src/views.js
@@ -458,8 +458,14 @@ overviewer.views.SignControlView = Backbone.View.extend({
                            'icon':     iconURL,
                            'visible':  false
                    }); 
-                    if (entity.createInfoWindow) {
-                        overviewer.util.createMarkerInfoWindow(marker);
+                    if(entity['createInfoWindow']) {
+		        if (entity.createInfoWindow) {
+                            overviewer.util.createMarkerInfoWindow(marker);
+                        } 
+                    } else {
+                        if(dataRoot[i].createInfoWindow) {
+                            overviewer.util.createMarkerInfoWindow(marker);
+                        }
                    }
                    jQuery.extend(entity, {markerObj: marker});
                }