Fix/app switcher

src/ui/public/chrome/api/angular.js

@@ -1,7 +1,7 @@
 var $ = require('jquery');
 var _ = require('lodash');
 
-require('../appSwitcher/appSwitcher.less');
+require('../appSwitcher');
 var modules = require('ui/modules');
 var ConfigTemplate = require('ui/ConfigTemplate');
 require('ui/directives/config');

src/ui/public/chrome/api/nav.js

@@ -25,6 +25,10 @@ module.exports = function (chrome, internals) {
     a.setAttribute('href', link.url);
     link.url = a.href;
     link.lastSubUrl = chrome.getLastSubUrlFor(link.url);
+
+    if (link.url === chrome.getAppUrl()) {
+      link.active = true;
+    }
   });
 
 };

src/ui/public/chrome/appSwitcher/appSwitcher.html

@@ -1,6 +1,12 @@
-<div class="app-links">
-  <div class="app-link" ng-repeat="app in chrome.getNavLinks() | orderBy:'title'">
-    <a ng-href="{{ app.lastSubUrl || app.url }}">
+<div app-switcher class="app-links">
+  <div
+    class="app-link"
+    ng-repeat="app in chrome.getNavLinks() | orderBy:'title'"
+    ng-class="{ active: app.active }">
+
+    <a
+      ng-click="switcher.ensureNavigation($event, app)"
+      ng-href="{{ app.active ? app.url : (app.lastSubUrl || app.url) }}">
 
       <div ng-if="app.icon" ng-style="{ 'background-image': 'url(../' + app.icon + ')' }" class="app-icon"></div>
       <div ng-if="!app.icon" class="app-icon app-icon-missing">{{app.title[0]}}</div>

src/ui/public/chrome/appSwitcher/appSwitcher.js

@@ -0,0 +1,33 @@
+var parse = require('url').parse;
+
+require('../appSwitcher/appSwitcher.less');
+
+require('ui/modules')
+.get('kibana')
+.directive('appSwitcher', function () {
+  return {
+    restrict: 'A',
+    controllerAs: 'switcher',
+    controller: function () {
+
+      // links don't cause full-navigation events in certain scenarios
+      // so we force them when needed
+      this.ensureNavigation = function (event, app) {
+        if (event.isDefaultPrevented() || event.altKey || event.metaKey || event.ctrlKey) {
+          return;
+        }
+
+        var toParsed = parse(app.url);
+        var fromParsed = parse(window.location.href);
+        var sameProto = toParsed.protocol === fromParsed.protocol;
+        var sameHost = toParsed.host === fromParsed.host;
+        var samePath = toParsed.path === fromParsed.path;
+
+        if (sameProto && sameHost && samePath) {
+          window.location.reload(true);
+        }
+      };
+
+    }
+  };
+});

src/ui/public/chrome/appSwitcher/appSwitcher.less

@@ -1,16 +1,19 @@
 @import (reference) "~ui/styles/variables";
 
 @app-icon-size: 48px;
+@app-icon-padding: 10px;
 
 .app-links {
   text-align: justify;
 
   .app-link {
     display: inline-block;
     vertical-align: top;
-    width: @app-icon-size;
-    margin: 0px 10px;
     text-align: left;
+    width: @app-icon-size + (@app-icon-padding * 2);
+    margin: 0px 10px;
+    padding: @app-icon-padding;
+    border-radius: @border-radius-base;
 
     .app-icon {
       display: block;
@@ -43,6 +46,13 @@
       text-decoration: underline;
     }
 
+    &.active {
+      background: @gray-lighter;
+      .app-title {
+        text-decoration: underline;
+      }
+    }
+
   }
 
 }