Merge branch 'master' into saclay

Conflicts:
	chimere/static/chimere/js/jquery.chimere.js

1 files changed, 11 insertions, 11 deletions

diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index ff90f28..bb24d2e 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -447,7 +447,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                 }
                 settings.current_popup = feature.popup;
                 /* hide on click on the cloud */
-                settings.current_popup.groupDiv.onclick = helpers.hidePopup;
+                settings.current_popup.groupDiv.onclick = methods.hidePopup;
                 settings.permalink.updateLink();
             }
             var markerClick = function (evt) {
@@ -853,16 +853,6 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             var bounds = settings.layerVectors.getDataExtent();
             if (bounds) settings.map.zoomToExtent(bounds);
         },
-        saveExtent: function(){
-            var extent_key = 'MAP_EXTENT';
-            //if (area_name){ extent_key = extent_key + '_' + area_name; }
-            var extent = settings.map.getExtent().transform(EPSG_PROJECTION,
-                                                   EPSG_DISPLAY_PROJECTION);
-            document.cookie = extent_key + "=" + extent.toArray().join('_')
-                              + ';path="/"';
-        }
-    }; // End of public methods
-    var helpers = {
         hidePopup: function (evt) {
             if (settings.hide_popup_fx) {
                 settings.hide_popup_fx(evt, settings)
@@ -881,6 +871,16 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             }
             return false;
         },
+        saveExtent: function(){
+            var extent_key = 'MAP_EXTENT';
+            //if (area_name){ extent_key = extent_key + '_' + area_name; }
+            var extent = settings.map.getExtent().transform(EPSG_PROJECTION,
+                                                   EPSG_DISPLAY_PROJECTION);
+            document.cookie = extent_key + "=" + extent.toArray().join('_')
+                              + ';path="/"';
+        }
+    }; // End of public methods
+    var helpers = {
         getSubcategories: function (category_id) {
             if(settings.get_subcategories_fx) {
                 return settings.get_subcategories_fx(category_id, settings);