From bcb5883230b3fc1c17aff27bd8a2b1e128545e2f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 8 Jul 2015 11:16:46 +0200
Subject: [PATCH] Fixes: U4-3514 Add dropdown list of tabs, if more then 6 tabs

Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
---
 src/Umbraco.Web.UI.Client/bower.json          | 53 ++++++++++---------
 src/Umbraco.Web.UI.Client/gruntFile.js        |  3 ++
 .../directives/html/umbheader.directive.js    |  2 +
 src/Umbraco.Web.UI.Client/src/loader.js       | 22 ++++----
 src/Umbraco.Web/UI/JavaScript/JsInitialize.js |  1 +
 5 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index e8ad94653f..2c4b4d8d86 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -1,28 +1,29 @@
 {
-    "name": "Umbraco",
-    "version": "7",
-    "homepage": "https://github.com/umbraco/Umbraco-CMS",
-    "authors": [
-        "Shannon <sdeminick@umbraco.com>"
-    ],
-    "description": "Umbraco CMS",
-    "license": "MIT",
-    "private": true,
-    "ignore": [
-        "**/.*",
-        "node_modules",
-        "bower_components",
-        "test",
-        "tests"
-    ],
-    "dependencies": {
-        "typeahead.js": "~0.10.5",
-        "underscore": "~1.7.0",
-        "rgrove-lazyload": "*",
-        "jquery": "2.0.3",
-        "jquery-file-upload": "~9.4.0",
-        "jquery-ui": "1.10.3",
-        "angular-dynamic-locale":  "~0.1.27"
+  "name": "Umbraco",
+  "version": "7",
+  "homepage": "https://github.com/umbraco/Umbraco-CMS",
+  "authors": [
+    "Shannon <sdeminick@umbraco.com>"
+  ],
+  "description": "Umbraco CMS",
+  "license": "MIT",
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "typeahead.js": "~0.10.5",
+    "underscore": "~1.7.0",
+    "rgrove-lazyload": "*",
+    "jquery": "2.0.3",
+    "jquery-file-upload": "~9.4.0",
+    "jquery-ui": "1.10.3",
+        "angular-dynamic-locale":  "~0.1.27",
+    "bootstrap-tabdrop": "~1.0.0"
     },
     "exportsOverride": {
         "rgrove-lazyload": {
@@ -57,5 +58,5 @@
         "blueimp-canvas-to-blob": {
             "ignore": "*.ignore"
         }
-    }
-}
\ No newline at end of file
+  }
+}
diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js
index ef636d2ada..03b6c6ccbf 100644
--- a/src/Umbraco.Web.UI.Client/gruntFile.js
+++ b/src/Umbraco.Web.UI.Client/gruntFile.js
@@ -419,6 +419,9 @@ module.exports = function (grunt) {
                         // folders with '.' in them since the grunt copy task does not like that
                         var componentWithoutPeriod = component.replace(".", "-");
                         return path.join(componentWithoutPeriod, type);
+                        },
+                        'bootstrap-tabdrop': {
+                            keepExpandedHierarchy: false
                     }
                 }
             }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbheader.directive.js
index b1cca01d44..15a1a09c05 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbheader.directive.js
@@ -40,6 +40,8 @@ angular.module("umbraco.directives")
                     }
 
                 });
+
+                $('.nav-pills, .nav-tabs').tabdrop();
             }
 
             scope.showTabs = iAttrs.tabs ? true : false;
diff --git a/src/Umbraco.Web.UI.Client/src/loader.js b/src/Umbraco.Web.UI.Client/src/loader.js
index 32def61618..9cbb8f233d 100644
--- a/src/Umbraco.Web.UI.Client/src/loader.js
+++ b/src/Umbraco.Web.UI.Client/src/loader.js
@@ -1,28 +1,32 @@
 LazyLoad.js(
     [
         'lib/jquery/jquery.min.js',
-        'lib/jquery-ui/jquery-ui.min.js',
-        
-        /* 1.1.5 */
         'lib/angular/1.1.5/angular.min.js',
+        'lib/underscore/underscore-min.js',
+
+        'lib/jquery-ui/jquery-ui.min.js',
+
         'lib/angular/1.1.5/angular-cookies.min.js',
-        'lib/angular/1.1.5/angular-mobile.min.js',
-        'lib/angular/1.1.5/angular-mocks.js',
+        'lib/angular/1.1.5/angular-mobile.js',
         'lib/angular/1.1.5/angular-sanitize.min.js',
 
         'lib/angular/angular-ui-sortable.js',
 
         'lib/angular-dynamic-locale/tmhDynamicLocale.min.js',
 
-        /* App-wide file-upload helper */
+        'lib/blueimp-load-image/load-image.all.min.js',
         'lib/jquery-file-upload/jquery.fileupload.js',
         'lib/jquery-file-upload/jquery.fileupload-process.js',
+        'lib/jquery-file-upload/jquery.fileupload-image.js',
         'lib/jquery-file-upload/jquery.fileupload-angular.js',
-        
+
         'lib/bootstrap/js/bootstrap.2.3.2.min.js',
-        'lib/underscore/underscore-min.js',
-        'lib/umbraco/Extensions.js',
+        'lib/bootstrap-tabdrop/bootstrap-tabdrop.js',
+	    'lib/umbraco/Extensions.js',
+
         'lib/umbraco/NamespaceManager.js',
+        'lib/umbraco/LegacyUmbClientMgr.js',
+        'lib/umbraco/LegacySpeechBubble.js',
 
         'js/umbraco.servervariables.js',
         'js/app.dev.js',
diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
index 3ff9884ba7..51e19b388a 100644
--- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
+++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
@@ -20,6 +20,7 @@
     'lib/jquery-file-upload/jquery.fileupload-angular.js',
 
     'lib/bootstrap/js/bootstrap.2.3.2.min.js',
+    'lib/bootstrap-tabdrop/bootstrap-tabdrop.js',
 	'lib/umbraco/Extensions.js',
     
     'lib/umbraco/NamespaceManager.js',