diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-04-03 10:37:39 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-04-03 10:37:39 +0100 |
| commit | 592924059a07a5a30e8a09dfc4ca8dea56c5c77a (patch) | |
| tree | c99e86d3e3f780427bbf7a9ec0ae5187b697dfa5 /web/js/map-streetview.js | |
| parent | 65066d275557e16448aa99ecdfa4df62d4d79649 (diff) | |
| parent | d92bbef188eff6c14adf0f0c7b032846b1be85a6 (diff) | |
Merge remote-tracking branch 'origin/master' into send-report-rewrite
Conflicts:
bin/send-reports
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
Diffstat (limited to 'web/js/map-streetview.js')
| -rw-r--r-- | web/js/map-streetview.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/js/map-streetview.js b/web/js/map-streetview.js index 99fdca983..b1ba3664d 100644 --- a/web/js/map-streetview.js +++ b/web/js/map-streetview.js @@ -3,7 +3,7 @@ function set_map_config(perm) { new OpenLayers.Control.ArgParser(), //new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.Navigation(), - perm, + new OpenLayers.Control.Permalink(), new OpenLayers.Control.PanZoomFMS() ]; fixmystreet.map_type = OpenLayers.Layer.StreetView; @@ -32,7 +32,7 @@ OpenLayers.Util.OS.originalOnImageLoadError = OpenLayers.Util.onImageLoadError; * Function: onImageLoadError */ OpenLayers.Util.onImageLoadError = function() { - OpenLayers.Util.OS.originalOnImageLoadError; + OpenLayers.Util.OS.originalOnImageLoadError(); }; /** |