From fadd07066365aee5095d1803ceb26b562cb3b081 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 6 Jun 2017 12:18:43 -0400
Subject: [PATCH] control sidebar adjustments

---
 .gitignore                            |  3 ++-
 gulpfile.js                           |  6 +++++-
 src/app/global/mainController.js      | 10 ----------
 src/app/global/topNavController.js    | 10 +++++++++-
 src/app/vault/vaultController.js      | 15 ++++++++++++---
 src/app/views/organizationLayout.html |  2 +-
 src/app/views/userLayout.html         |  2 +-
 src/index.html                        |  2 ++
 src/js/main.js                        |  5 +++++
 src/less/vault.less                   |  4 ++++
 10 files changed, 41 insertions(+), 18 deletions(-)
 create mode 100644 src/js/main.js

diff --git a/.gitignore b/.gitignore
index c91485a9f53..bb9a85711dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -199,4 +199,5 @@ FakesAssemblies/
 *.opt
 
 # Other
-project.lock.json
\ No newline at end of file
+project.lock.json
+src/js/*.min.js
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index f122a1444bb..c90e0460674 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -46,7 +46,7 @@ gulp.task('lint', function () {
 gulp.task('build', function (cb) {
     return runSequence(
         'clean',
-        ['browserify', 'lib', 'webpack', 'less', 'settings', 'lint'],
+        ['browserify', 'lib', 'webpack', 'less', 'settings', 'lint', 'min:js'],
         cb);
 });
 
@@ -305,6 +305,10 @@ gulp.task('dist:move', function () {
             src: paths.npmDir + 'node-forge/dist/prime.worker.*',
             dest: paths.dist + 'lib/forge'
         },
+        {
+            src: paths.webroot + 'js/bw.min.js',
+            dest: paths.dist + 'js'
+        },
         {
             src: [
                 paths.webroot + '**/app/**/*.html',
diff --git a/src/app/global/mainController.js b/src/app/global/mainController.js
index db6a15677f9..6feefa38a7b 100644
--- a/src/app/global/mainController.js
+++ b/src/app/global/mainController.js
@@ -26,16 +26,6 @@ angular
                 }
 
                 $document.off('click', '.sidebar li a');
-
-                $('#control-sidebar').on('click', function (e) {
-                    e.preventDefault();
-                    var bod = $('body');
-                    if (!bod.hasClass('control-sidebar-open')) {
-                        bod.addClass('control-sidebar-open');
-                    } else {
-                        bod.removeClass('control-sidebar-open');
-                    }
-                });
             }
         });
 
diff --git a/src/app/global/topNavController.js b/src/app/global/topNavController.js
index 2cdacba4e79..521f9b5d4e5 100644
--- a/src/app/global/topNavController.js
+++ b/src/app/global/topNavController.js
@@ -2,5 +2,13 @@ angular
     .module('bit.global')
 
     .controller('topNavController', function ($scope) {
-        
+        $scope.toggleControlSidebar = function () {
+            var bod = $('body');
+            if (!bod.hasClass('control-sidebar-open')) {
+                bod.addClass('control-sidebar-open');
+            }
+            else {
+                bod.removeClass('control-sidebar-open');
+            }
+        };
     });
diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
index cd24312c56e..e29e751fea3 100644
--- a/src/app/vault/vaultController.js
+++ b/src/app/vault/vaultController.js
@@ -284,13 +284,22 @@
 
         $scope.filterFolder = function (folder) {
             $scope.folderIdFilter = folder.id;
-            $timeout(function () {
-                $.AdminLTE.layout.fix();
-            }, 0);
+
+            if ($.AdminLTE && $.AdminLTE.layout) {
+                $timeout(function () {
+                    $.AdminLTE.layout.fix();
+                }, 0);
+            }
         };
 
         $scope.clearFilters = function () {
             $scope.folderIdFilter = undefined;
+
+            if ($.AdminLTE && $.AdminLTE.layout) {
+                $timeout(function () {
+                    $.AdminLTE.layout.fix();
+                }, 0);
+            }
         };
 
         $scope.folderFilter = function (folder) {
diff --git a/src/app/views/organizationLayout.html b/src/app/views/organizationLayout.html
index f27a92d05d3..3c1df042d03 100644
--- a/src/app/views/organizationLayout.html
+++ b/src/app/views/organizationLayout.html
@@ -14,7 +14,7 @@
             <ul class="nav navbar-nav">
                 <li><a ui-sref="frontend.logout">Log Out</a></li>
                 <li class="control-sidebar-show">
-                    <a href="#" id="control-sidebar"><i class="fa fa-bars"></i></a>
+                    <a href="#" ng-click="toggleControlSidebar()"><i class="fa fa-bars"></i></a>
                 </li>
             </ul>
         </div>
diff --git a/src/app/views/userLayout.html b/src/app/views/userLayout.html
index 8882b019c74..356b995a887 100644
--- a/src/app/views/userLayout.html
+++ b/src/app/views/userLayout.html
@@ -14,7 +14,7 @@
             <ul class="nav navbar-nav">
                 <li><a ui-sref="frontend.logout">Log Out</a></li>
                 <li class="control-sidebar-show">
-                    <a href="#" id="control-sidebar"><i class="fa fa-bars"></i></a>
+                    <a href="#" ng-click="toggleControlSidebar()"><i class="fa fa-bars"></i></a>
                 </li>
             </ul>
         </div>
diff --git a/src/index.html b/src/index.html
index f75962e9215..1533f33a831 100644
--- a/src/index.html
+++ b/src/index.html
@@ -42,6 +42,7 @@
     <script>(window.angular||document.write('<script src="lib\/angular\/angular.min.js?v=<!-- @echo cacheTag !>"><\/script>'));</script>
 
     <script src="js/lib.min.js?v=<!-- @echo cacheTag !>"></script>
+    <script src="js/bw.min.js?v=<!-- @echo cacheTag"></script>
     <script src="js/app.min.js?v=<!-- @echo cacheTag !>"></script>
 
     <script>
@@ -56,6 +57,7 @@
     <!-- @exclude -->
     <script src="lib/jquery/jquery.js"></script>
     <script src="lib/bootstrap/js/bootstrap.js"></script>
+    <script src="js/main.js"></script>
     <script src="lib/admin-lte/js/app.js"></script>
 
     <script src="lib/forge/forge.js"></script>
diff --git a/src/js/main.js b/src/js/main.js
new file mode 100644
index 00000000000..8ec1d136025
--- /dev/null
+++ b/src/js/main.js
@@ -0,0 +1,5 @@
+var AdminLTEOptions = {
+    controlSidebarOptions: {
+        selector: '#adminlte-fakeselector'
+    }
+};
diff --git a/src/less/vault.less b/src/less/vault.less
index 068ac404053..54ab184306a 100644
--- a/src/less/vault.less
+++ b/src/less/vault.less
@@ -134,6 +134,10 @@ h1, h2, h3, h4, h5, h6,
     overflow: hidden;
 }
 
+.content-wrapper, .control-sidebar, .main-sidebar, .main-header .logo, .main-header .navbar, .main-footer {
+    .transition(initial);
+}
+
 .main-footer {
     height: @footer-height;
 }