From cf4c09f41fce0141d84bd75e76ab17f33897e8cd Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 23 Mar 2016 14:12:57 +0100
Subject: [PATCH] When click on item in variation quick switcher - change
 context in header

---
 .../editor/umbeditorheader.directive.js       | 23 ++++++++++++++++++-
 .../components/editor/umb-editor-header.html  | 16 ++++++-------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
index 74e80569b8..04dc25ab3b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
@@ -36,9 +36,30 @@
                 scope.showVariationsQuickSwitch = false;
             };
 
-            scope.toggleSubItems = function(item) {
+            scope.toggleSubItems = function(item, $event) {
                 item.showSubItems = !item.showSubItems;
+                $event.preventDefault();
+                $event.stopPropagation();
+
             };
+
+            scope.selectItem = function(language, variation) {
+
+                if(language) {
+                    scope.language = language.language;
+                } else {
+                    scope.language = "";
+                }
+
+                if(variation) {
+                    scope.variation = variation.name;
+                } else {
+                    scope.variation = "";
+                }
+                
+                scope.showVariationsQuickSwitch = false;
+            };
+
         }
 
         var directive = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
index 18d80b1f44..3f888a5285 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
@@ -32,16 +32,16 @@
                         umb-auto-focus
                         required />
 
-                        <div class="umb-editor-header__selected-variations">
+                        <div class="umb-editor-header__selected-variations" ng-if="language || variation">
 
-                            <div class="umb-editor-header__selected-variation">
+                            <div class="umb-editor-header__selected-variation" ng-if="language">
                                 <i class="umb-editor-header__selected-variation-icon icon-umb-translation"></i>
-                                <div>English (United States)</div>
+                                <div>{{ language }}</div>
                             </div>
 
-                            <div class="umb-editor-header__selected-variation">
+                            <div class="umb-editor-header__selected-variation" ng-if="variation">
                                 <i class="umb-editor-header__selected-variation-icon icon-documents"></i>
-                                <div>Mobile</div>
+                                <div>{{ variation }}</div>
                             </div>
 
                         </div>
@@ -59,16 +59,16 @@
 
                        <li ng-repeat="variation in variations" ng-class="{'-active' : variation.showSubItems}">
 
-                           <a class="umb-variations-quick-switcher__variation" href="">
+                           <a class="umb-variations-quick-switcher__variation" href ng-click="selectItem(variation)">
                                <span class="umb-variations-quick-switcher__variation-published-state" ng-class="{'-published': variation.published}"></span>
                                <i class="umb-variations-quick-switcher__variation-icon icon-umb-translation"></i>
                                <span class="umb-variations-quick-switcher__variation-name">{{variation.language}}</span>
-                               <span class="umb-variations-quick-switcher__variation-toggle" ng-if="variation.variations" ng-click="toggleSubItems(variation)">variations &dtrif;</span>
+                               <span class="umb-variations-quick-switcher__variation-toggle" ng-if="variation.variations" ng-click="toggleSubItems(variation, $event)">variations &dtrif;</span>
                            </a>
 
                            <ul class="umb-variations-quick-switcher__subnav" ng-if="variation.showSubItems">
                                <li ng-repeat="test in variation.variations">
-                                   <a class="umb-variations-quick-switcher__variation" href="">
+                                   <a class="umb-variations-quick-switcher__variation" href ng-click="selectItem(variation, test)">
                                        <span class="umb-variations-quick-switcher__variation-published-state" ng-class="{'-published': test.published}"></span>
                                        <i class="umb-variations-quick-switcher__variation-icon icon-documents"></i>
                                        <span class="umb-variations-quick-switcher__variation-name">{{ test.name }}</span>