From 11be46ec2390cab61c718ccd7ca3dc7357f97f06 Mon Sep 17 00:00:00 2001
From: pichalite <pichalite.com@gmail.com>
Date: Mon, 29 Aug 2016 17:42:29 +0000
Subject: [PATCH 1/3] fixes #4992

---
 public/less/admin/general/navigation.less |  2 ++
 public/src/admin/general/navigation.js    | 23 ++++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/public/less/admin/general/navigation.less b/public/less/admin/general/navigation.less
index 86fd3cae62..3e10639b89 100644
--- a/public/less/admin/general/navigation.less
+++ b/public/less/admin/general/navigation.less
@@ -3,6 +3,8 @@
 		width: 100%;
 		min-height: 50px;
 		border: 1px solid #eee;
+		overflow: auto;
+		
 		.active {
 			background-color: #eee;
 		}
diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js
index 9ebdce555a..3c4a25f066 100644
--- a/public/src/admin/general/navigation.js
+++ b/public/src/admin/general/navigation.js
@@ -13,17 +13,22 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
 		});
 
 		translator.translate(translator.unescape($('#available').html()), function(html) {
-			$('#available').html(html)
-				.find('li .drag-item').draggable({
-					connectToSortable: '#active-navigation',
-					helper: 'clone',
-					distance: 10,
-					stop: drop
-				});
+			app.loadJQueryUI(function() {
+				$('#available').html(html)
+					.find('li .drag-item').draggable({
+						connectToSortable: '#active-navigation',
+						helper: 'clone',
+						distance: 10,
+						stop: drop
+					});
+			});
 		});
+		
+		app.loadJQueryUI(function() {
 
-		$('#active-navigation').sortable().droppable({
-			accept: $('#available li .drag-item')
+			$('#active-navigation').sortable().droppable({
+				accept: $('#available li .drag-item')
+			});
 		});
 
 		$('#enabled').on('click', '.iconPicker', function() {

From 3ef7c57a63c03d3e4adb1f44d79f776ee093924c Mon Sep 17 00:00:00 2001
From: pichalite <pichalite.com@gmail.com>
Date: Mon, 29 Aug 2016 21:53:12 +0000
Subject: [PATCH 2/3] make jquery ui a r.js module

---
 public/src/admin/general/navigation.js | 25 ++++++++++---------------
 public/src/admin/modules/selectable.js |  8 +++-----
 src/meta/js.js                         |  2 +-
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js
index 3c4a25f066..1837fc590f 100644
--- a/public/src/admin/general/navigation.js
+++ b/public/src/admin/general/navigation.js
@@ -1,7 +1,7 @@
 "use strict";
 /* global define, app, ajaxify, socket, templates */
 
-define('admin/general/navigation', ['translator', 'iconSelect'], function(translator, iconSelect) {
+define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], function(translator, iconSelect, jqueryui) {
 	var navigation = {},
 		available;
 
@@ -13,22 +13,17 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
 		});
 
 		translator.translate(translator.unescape($('#available').html()), function(html) {
-			app.loadJQueryUI(function() {
-				$('#available').html(html)
-					.find('li .drag-item').draggable({
-						connectToSortable: '#active-navigation',
-						helper: 'clone',
-						distance: 10,
-						stop: drop
-					});
-			});
+			$('#available').html(html)
+				.find('li .drag-item').draggable({
+					connectToSortable: '#active-navigation',
+					helper: 'clone',
+					distance: 10,
+					stop: drop
+				});
 		});
 		
-		app.loadJQueryUI(function() {
-
-			$('#active-navigation').sortable().droppable({
-				accept: $('#available li .drag-item')
-			});
+		$('#active-navigation').sortable().droppable({
+			accept: $('#available li .drag-item')
 		});
 
 		$('#enabled').on('click', '.iconPicker', function() {
diff --git a/public/src/admin/modules/selectable.js b/public/src/admin/modules/selectable.js
index 815fa26d0f..5e4bb5725f 100644
--- a/public/src/admin/modules/selectable.js
+++ b/public/src/admin/modules/selectable.js
@@ -2,14 +2,12 @@
 
 /*globals define*/
 
-define('admin/modules/selectable', function() {
+define('admin/modules/selectable', ['jqueryui'], function(jqueryui) {
 	var selectable = {};
 
 	selectable.enable = function(containerEl, targets) {
-		app.loadJQueryUI(function() {
-			$(containerEl).selectable({
-				filter: targets
-			});
+		$(containerEl).selectable({
+			filter: targets
 		});
 	};
 
diff --git a/src/meta/js.js b/src/meta/js.js
index 3367734019..3d85c7efb1 100644
--- a/src/meta/js.js
+++ b/src/meta/js.js
@@ -80,7 +80,7 @@ module.exports = function(Meta) {
 			modules: {
 				"Chart.js": './node_modules/chart.js/dist/Chart.min.js',
 				"mousetrap.js": './node_modules/mousetrap/mousetrap.js',
-
+				"jqueryui.js": 'public/vendor/jquery/js/jquery-ui.js',
 				"buzz.js": 'public/vendor/buzz/buzz.js'
 			}
 		}

From af32d0ad408e46c0753284c8a20013a75482c00c Mon Sep 17 00:00:00 2001
From: pichalite <pichalite.com@gmail.com>
Date: Tue, 30 Aug 2016 04:33:25 +0000
Subject: [PATCH 3/3] require jqueryui in admin/extend/widgets

---
 public/src/admin/extend/widgets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js
index 4ac3fdeaf0..799e3ae9bc 100644
--- a/public/src/admin/extend/widgets.js
+++ b/public/src/admin/extend/widgets.js
@@ -1,7 +1,7 @@
 "use strict";
 /* global define, app, socket */
 
-define('admin/extend/widgets', function() {
+define('admin/extend/widgets', ['jqueryui'], function(jqueryui) {
 	var Widgets = {};
 
 	Widgets.init = function() {