Merge tag 'v3.1' into fiksgatami-devfiksgatami-dev

1 files changed, 4 insertions, 22 deletions

diff --git a/web/cobrands/bexley/assets.js b/web/cobrands/bexley/assets.js
index 541d47ea4..db2384195 100644
--- a/web/cobrands/bexley/assets.js
+++ b/web/cobrands/bexley/assets.js
@@ -21,18 +21,10 @@ var defaults = {
     strategy_class: OpenLayers.Strategy.FixMyStreet
 };
 
-var streetlight_select = $.extend({
-    label: "${Unit_No}",
-    labelOutlineColor: "white",
-    labelOutlineWidth: 3,
-    labelYOffset: 65,
-    fontSize: '15px',
-    fontWeight: 'bold'
-}, fixmystreet.assets.style_default_select.defaultStyle);
-
 var streetlight_stylemap = new OpenLayers.StyleMap({
   'default': fixmystreet.assets.style_default,
-  'select': new OpenLayers.Style(streetlight_select)
+  'hover': fixmystreet.assets.style_default_hover,
+  'select': fixmystreet.assets.construct_named_select_style("${Unit_No}")
 });
 
 var labeled_defaults = $.extend(true, {}, defaults, {
@@ -45,18 +37,8 @@ var labeled_defaults = $.extend(true, {}, defaults, {
         UnitID: 'Unit_ID'
     },
     actions: {
-        asset_found: function(asset) {
-          var id = asset.attributes[this.fixmystreet.feature_code] || '';
-          if (id !== '') {
-              var asset_name = this.fixmystreet.asset_item;
-              $('.category_meta_message').html('You have selected ' + asset_name + ' <b>' + id + '</b>');
-          } else {
-              $('.category_meta_message').html(this.fixmystreet.asset_item_message);
-          }
-        },
-        asset_not_found: function() {
-           $('.category_meta_message').html(this.fixmystreet.asset_item_message);
-        }
+        asset_found: fixmystreet.assets.named_select_action_found,
+        asset_not_found: fixmystreet.assets.named_select_action_not_found
     }
 });