fix quality flaws

diff --git a/server/sonar-web/src/main/js/common/handlebars-extensions.js b/server/sonar-web/src/main/js/common/handlebars-extensions.js
index 5ac91cd9ea80693fe3fca61784e31f99b19e009f..86b4286efb46e4021633280c92de95dd8e6a6d22 100644 (file)
--- a/server/sonar-web/src/main/js/common/handlebars-extensions.js
+++ b/server/sonar-web/src/main/js/common/handlebars-extensions.js
@@ -28,6 +28,50 @@
     return METRICS.indexOf(metric) !== -1;
   }
 
+  function buildIssuesUrl (component, metric, periodDate) {
+    var url = baseUrl + '/component_issues/index?id=' + encodeURIComponent(component) + '#';
+    if (periodDate != null) {
+      url += 'createdAfter=' + encodeURIComponent(periodDate) + '|';
+    }
+    switch (metric) {
+      case 'blocker_violations':
+      case 'new_blocker_violations':
+        url += 'resolved=false|severities=BLOCKER';
+        break;
+      case 'critical_violations':
+      case 'new_critical_violations':
+        url += 'resolved=false|severities=CRITICAL';
+        break;
+      case 'major_violations':
+      case 'new_major_violations':
+        url += 'resolved=false|severities=MAJOR';
+        break;
+      case 'minor_violations':
+      case 'new_minor_violations':
+        url += 'resolved=false|severities=MINOR';
+        break;
+      case 'info_violations':
+      case 'new_info_violations':
+        url += 'resolved=false|severities=INFO';
+        break;
+      case 'open_issues':
+        url += 'resolved=false|statuses=OPEN';
+        break;
+      case 'reopened_issues':
+        url += 'resolved=false|statuses=REOPENED';
+        break;
+      case 'confirmed_issues':
+        url += 'resolved=false|statuses=CONFIRMED';
+        break;
+      case 'false_positive_issues':
+        url += 'resolutions=FALSE-POSITIVE';
+        break;
+      default:
+        url += 'resolved=false';
+    }
+    return url;
+  }
+
   Handlebars.registerHelper('log', function () {
     var args = Array.prototype.slice.call(arguments, 0, -1);
     console.log.apply(console, args);
@@ -526,51 +570,6 @@
   });
 
   Handlebars.registerHelper('urlForDrilldown', function (component, metric, period, periodDate) {
-
-    function buildIssuesUrl (component, metric, periodDate) {
-      var url = baseUrl + '/component_issues/index?id=' + encodeURIComponent(component) + '#';
-      if (periodDate != null) {
-        url += 'createdAfter=' + encodeURIComponent(periodDate) + '|';
-      }
-      switch (metric) {
-        case 'blocker_violations':
-        case 'new_blocker_violations':
-          url += 'resolved=false|severities=BLOCKER';
-          break;
-        case 'critical_violations':
-        case 'new_critical_violations':
-          url += 'resolved=false|severities=CRITICAL';
-          break;
-        case 'major_violations':
-        case 'new_major_violations':
-          url += 'resolved=false|severities=MAJOR';
-          break;
-        case 'minor_violations':
-        case 'new_minor_violations':
-          url += 'resolved=false|severities=MINOR';
-          break;
-        case 'info_violations':
-        case 'new_info_violations':
-          url += 'resolved=false|severities=INFO';
-          break;
-        case 'open_issues':
-          url += 'resolved=false|statuses=OPEN';
-          break;
-        case 'reopened_issues':
-          url += 'resolved=false|statuses=REOPENED';
-          break;
-        case 'confirmed_issues':
-          url += 'resolved=false|statuses=CONFIRMED';
-          break;
-        case 'false_positive_issues':
-          url += 'resolutions=FALSE-POSITIVE';
-          break;
-        default:
-          url += 'resolved=false';
-      }
-      return url;
-    }
-
     var url;
     if (isIssuesMetric(metric)) {
       url = buildIssuesUrl(component, metric, periodDate);

diff --git a/server/sonar-web/src/main/js/common/processes.js b/server/sonar-web/src/main/js/common/processes.js
index 1116a60e1340309203256ec71c205e3ab893e4c6..a437192044e408f220232eb1b48c1bf66df2bc16 100644 (file)
--- a/server/sonar-web/src/main/js/common/processes.js
+++ b/server/sonar-web/src/main/js/common/processes.js
@@ -19,7 +19,7 @@
  */
 (function ($) {
 
-  var options = {
+  var defaults = {
     queue: {},
     timeout: 300,
     fadeTimeout: 100
@@ -117,7 +117,7 @@
           id: uid,
           timer: setTimeout(function () {
             process.timeout();
-          }, options.timeout)
+          }, defaults.timeout)
         });
     processes.add(process);
     return uid;

diff --git a/server/sonar-web/src/main/js/workspace/main.js b/server/sonar-web/src/main/js/workspace/main.js
index 158089571b43eb943ebc318382c052c74ef65b56..a68efff25ba9c309bac277e4e34a870f3309085b 100644 (file)
--- a/server/sonar-web/src/main/js/workspace/main.js
+++ b/server/sonar-web/src/main/js/workspace/main.js
@@ -95,9 +95,9 @@ define([
           .on('viewerMinimize', function () {
             that.closeComponentViewer();
           })
-          .on('viewerClose', function (model) {
+          .on('viewerClose', function (m) {
             that.closeComponentViewer();
-            model.destroy();
+            m.destroy();
           });
       this.viewerView.render().$el.appendTo(document.body);
     },