2 files changed, 136 insertions, 141 deletions
diff --git a/server/sonar-web/src/main/js/apps/measures/app.js b/server/sonar-web/src/main/js/apps/measures/app.js
index deaf13a6472..6492108fa92 100644
--- a/server/sonar-web/src/main/js/apps/measures/app.js
+++ b/server/sonar-web/src/main/js/apps/measures/app.js
@@ -30,146 +30,141 @@ import StringFilterView from '../../components/navigator/filters/string-filters'
 import MetricFilterView from '../../components/navigator/filters/metric-filters';
 import { translate } from '../../helpers/l10n';
 
-var NavigatorApp = new Marionette.Application(),
-
-    newLastAnalysisFilter = function () {
-      return new BaseFilters.Filter({
-        name: translate('measure_filter.criteria.last_analysis'),
-        propertyFrom: 'ageMinDays',
-        propertyTo: 'ageMaxDays',
-        type: RangeFilters.RangeFilterView,
-        placeholder: translate('measure_filter.criteria.age.days'),
-        enabled: false,
-        optional: true
-      });
-    },
-
-    newMetricFilter = function (property) {
-      return new BaseFilters.Filter({
-        name: translate('measure_filter.criteria.metric'),
-        property: property,
-        type: MetricFilterView,
-        metrics: window.SS.metrics,
-        periods: window.SS.metricPeriods,
-        operations: { 'eq': '=', 'lt': '<', 'lte': '≤', 'gt': '>', 'gte': '≥' },
-        enabled: false,
-        optional: true
-      });
-    },
-
-    newNameFilter = function () {
-      return new BaseFilters.Filter({
-        name: translate('measure_filter.name_contains'),
-        property: 'nameSearch',
-        type: StringFilterView,
-        enabled: false,
-        optional: true
-      });
-    },
-
-    newAlertFilter = function () {
-      return new BaseFilters.Filter({
-        name: translate('measure_filter.criteria.alert'),
-        property: 'alertLevels[]',
-        type: ChoiceFilters.ChoiceFilterView,
-        enabled: false,
-        optional: true,
-        choices: {
-          'error': translate('measure_filter.criteria.alert.error'),
-          'warn': translate('measure_filter.criteria.alert.warn'),
-          'ok': translate('measure_filter.criteria.alert.ok')
-        }
-      });
-    },
-
-    init = function () {
-      NavigatorApp.addRegions({ filtersRegion: '.navigator-filters' });
-
-      this.filters = new BaseFilters.Filters();
-
-      if (_.isObject(window.SS.favorites)) {
-        this.filters.add([
-          new BaseFilters.Filter({
-            type: FavoriteFilters.FavoriteFilterView,
-            enabled: true,
-            optional: false,
-            choices: window.SS.favorites,
-            favoriteUrl: '/measures/filter',
-            manageUrl: '/measures/manage'
-          })
-        ]);
-      }
-
-      this.filters.add([
-        new BaseFilters.Filter({
-          name: translate('measure_filter.criteria.components'),
-          property: 'qualifiers[]',
-          type: ChoiceFilters.ChoiceFilterView,
-          enabled: true,
-          optional: false,
-          choices: window.SS.qualifiers,
-          defaultValue: translate('any')
-        }),
-
-        new BaseFilters.Filter({
-          name: translate('measure_filter.criteria.components_of'),
-          property: 'base',
-          type: AjaxSelectFilters.ComponentFilterView,
-          multiple: false,
-          enabled: false,
-          optional: true
-        }),
-
-        new BaseFilters.Filter({
-          name: translate('measure_filter.criteria.only_favorites'),
-          property: 'onFavourites',
-          type: CheckboxFilterView,
-          enabled: false,
-          optional: true
-        }),
-
-        new BaseFilters.Filter({
-          name: translate('measure_filter.criteria.date'),
-          propertyFrom: 'fromDate',
-          propertyTo: 'toDate',
-          type: RangeFilters.DateRangeFilterView,
-          enabled: false,
-          optional: true
-        }),
-
-        new BaseFilters.Filter({
-          name: translate('measure_filter.criteria.key_contains'),
-          property: 'keySearch',
-          type: StringFilterView,
-          enabled: false,
-          optional: true
-        })
-      ]);
-
-      this.filters.add([
-        newLastAnalysisFilter(),
-        newMetricFilter('c3'),
-        newMetricFilter('c2'),
-        newMetricFilter('c1'),
-        newNameFilter(),
-        newAlertFilter()
-      ]);
-
-      this.filterBarView = new FilterBar({
-        collection: this.filters,
-        extra: {
-          sort: '',
-          asc: false
-        }
-      });
-
-      this.filtersRegion.show(this.filterBarView);
-
-      if (window.queryParams) {
-        NavigatorApp.filterBarView.restoreFromQuery(window.queryParams);
-      }
-      key.setScope('list');
-    };
+const NavigatorApp = new Marionette.Application();
+const newLastAnalysisFilter = function () {
+  return new BaseFilters.Filter({
+    name: translate('measure_filter.criteria.last_analysis'),
+    propertyFrom: 'ageMinDays',
+    propertyTo: 'ageMaxDays',
+    type: RangeFilters.RangeFilterView,
+    placeholder: translate('measure_filter.criteria.age.days'),
+    enabled: false,
+    optional: true
+  });
+};
+const newMetricFilter = function (property) {
+  return new BaseFilters.Filter({
+    name: translate('measure_filter.criteria.metric'),
+    property,
+    type: MetricFilterView,
+    metrics: window.SS.metrics,
+    periods: window.SS.metricPeriods,
+    operations: { 'eq': '=', 'lt': '<', 'lte': '≤', 'gt': '>', 'gte': '≥' },
+    enabled: false,
+    optional: true
+  });
+};
+const newNameFilter = function () {
+  return new BaseFilters.Filter({
+    name: translate('measure_filter.name_contains'),
+    property: 'nameSearch',
+    type: StringFilterView,
+    enabled: false,
+    optional: true
+  });
+};
+const newAlertFilter = function () {
+  return new BaseFilters.Filter({
+    name: translate('measure_filter.criteria.alert'),
+    property: 'alertLevels[]',
+    type: ChoiceFilters.ChoiceFilterView,
+    enabled: false,
+    optional: true,
+    choices: {
+      'error': translate('measure_filter.criteria.alert.error'),
+      'warn': translate('measure_filter.criteria.alert.warn'),
+      'ok': translate('measure_filter.criteria.alert.ok')
+    }
+  });
+};
+const init = function () {
+  NavigatorApp.addRegions({ filtersRegion: '.navigator-filters' });
+
+  this.filters = new BaseFilters.Filters();
+
+  if (_.isObject(window.SS.favorites)) {
+    this.filters.add([
+      new BaseFilters.Filter({
+        type: FavoriteFilters.FavoriteFilterView,
+        enabled: true,
+        optional: false,
+        choices: window.SS.favorites,
+        favoriteUrl: '/measures/filter',
+        manageUrl: '/measures/manage'
+      })
+    ]);
+  }
+
+  this.filters.add([
+    new BaseFilters.Filter({
+      name: translate('measure_filter.criteria.components'),
+      property: 'qualifiers[]',
+      type: ChoiceFilters.ChoiceFilterView,
+      enabled: true,
+      optional: false,
+      choices: window.SS.qualifiers,
+      defaultValue: translate('any')
+    }),
+
+    new BaseFilters.Filter({
+      name: translate('measure_filter.criteria.components_of'),
+      property: 'base',
+      type: AjaxSelectFilters.ComponentFilterView,
+      multiple: false,
+      enabled: false,
+      optional: true
+    }),
+
+    new BaseFilters.Filter({
+      name: translate('measure_filter.criteria.only_favorites'),
+      property: 'onFavourites',
+      type: CheckboxFilterView,
+      enabled: false,
+      optional: true
+    }),
+
+    new BaseFilters.Filter({
+      name: translate('measure_filter.criteria.date'),
+      propertyFrom: 'fromDate',
+      propertyTo: 'toDate',
+      type: RangeFilters.DateRangeFilterView,
+      enabled: false,
+      optional: true
+    }),
+
+    new BaseFilters.Filter({
+      name: translate('measure_filter.criteria.key_contains'),
+      property: 'keySearch',
+      type: StringFilterView,
+      enabled: false,
+      optional: true
+    })
+  ]);
+
+  this.filters.add([
+    newLastAnalysisFilter(),
+    newMetricFilter('c3'),
+    newMetricFilter('c2'),
+    newMetricFilter('c1'),
+    newNameFilter(),
+    newAlertFilter()
+  ]);
+
+  this.filterBarView = new FilterBar({
+    collection: this.filters,
+    extra: {
+      sort: '',
+      asc: false
+    }
+  });
+
+  this.filtersRegion.show(this.filterBarView);
+
+  if (window.queryParams) {
+    NavigatorApp.filterBarView.restoreFromQuery(window.queryParams);
+  }
+  key.setScope('list');
+};
 
 NavigatorApp.on('start', function () {
   init.call(NavigatorApp);
diff --git a/server/sonar-web/src/main/js/apps/measures/measures-filter-bar.js b/server/sonar-web/src/main/js/apps/measures/measures-filter-bar.js
index db813fd607d..bec20727db8 100644
--- a/server/sonar-web/src/main/js/apps/measures/measures-filter-bar.js
+++ b/server/sonar-web/src/main/js/apps/measures/measures-filter-bar.js
@@ -21,7 +21,7 @@ import $ from 'jquery';
 import FilterBarView from '../../components/navigator/filters/filter-bar';
 
 export default FilterBarView.extend({
-  template: function () {
+  template () {
     return $('#filter-bar-template').html();
   }
 });