From 64b7f9987fe28cc30ecd4ffd4dcd87660c37f964 Mon Sep 17 00:00:00 2001 From: ballenjr Date: Wed, 31 Aug 2016 11:58:54 -0700 Subject: [PATCH 1/8] Nav Controller As discussed on Gitter --- src/js/components/navbars.js | 180 +++++++++++++++++++++++++---------- 1 file changed, 130 insertions(+), 50 deletions(-) diff --git a/src/js/components/navbars.js b/src/js/components/navbars.js index a5d83ab..f324285 100644 --- a/src/js/components/navbars.js +++ b/src/js/components/navbars.js @@ -1,83 +1,84 @@ -/** - * @module mobile-angular-ui.components.navbars +/** + * @module mobile-angular-ui.components.navbars * @description - * + * * Bootstrap default navbars are awesome for responsive websites, but are not the * best with a small screen. Also fixed positioning is yet not an option to create * navbars standing in top or bottom of the screen. - * + * * Mobile Angular Ui offers an alternative to bootstrap navbars that is more * suitable for mobile. - * + * * It uses scrollable areas to avoid scroll issues. In the following figure you can * see the difference between fixed navbars and navbars with absolute positioning. - * + * *
* *
- * + * * Here is the basic markup to achieve this. - * + * * ``` html *
*
* *
- * + * *
* *
- * + * *
* *
*
* ``` - * + * * As you can notice the base class is `.navbar-app` while the positioning is * obtained adding either `.navbar-absolute-top` or `.navbar-absolute-bottom` * class. - * + * * ### Mobile Navbar Layout - * + * * Top navbar in mobile design most of the times follows a clear pattern: a * centered title surrounded by one or two action buttons, the _back_ or the * _menu_ buttons are two common examples. - * + * * Twitter Bootstrap ships with a different arrangement of components for navbars * since they are supposed to host an horizontal navigation menu. - * + * * `.navbar-app` is specifically designed to support this different type of * `.interaction and arrangement. - * + * * Consider the following example: - * + * * ``` html *
- * + * *
* Navbar Brand *
- * + * *
*
* Left Action *
*
- * + * *
*
* Right Action *
*
*
+ * * ``` - * + * * `.navbar-brand-center` is a specialization of BS3's `.navbar-brand`. It will * render the title centered and below the two button groups. Note that `.navbar- * brand-center` will position the title with absolute positioning ensuring that * it will never cover the buttons, which would cause interaction problems. - * + * */ (function() { @@ -85,33 +86,60 @@ var module = angular.module('mobile-angular-ui.components.navbars', []); - /** - * @directive navbarAbsoluteTop - * @restrict C - * @description - * - * Setup absolute positioned top navbar. - * - * ``` html - *
- * - *
- * ``` - */ + var global; - /** - * @directive navbarAbsoluteBottom - * @restrict C - * @description - * - * Setup absolute positioned bottom navbar. - * - * ``` html - *
- * - *
- * ``` - */ + /** + * @directive navController + * @restrict C + * @description + * + * Directive to bind controller to navbar + * + * ``` html + *
+ * + *
+ * ``` + */ + module.directive("navController", function() { + return { + restrict: "A", + controller: function() { + this.registerController = function(name, ctrl) { + this[name] = ctrl; + } + }, + link: function(scope){} + } + }); + + /** + * @directive navbarAbsoluteTop + * @restrict C + * @description + * + * Setup absolute positioned top navbar. + * + * ``` html + *
+ * + *
+ * ``` + */ + + /** + * @directive navbarAbsoluteBottom + * @restrict C + * @description + * + * Setup absolute positioned bottom navbar. + * + * ``` html + *
+ * + *
+ * ``` + */ angular.forEach(['top', 'bottom'], function(side) { var directiveName = 'navbarAbsolute' + side.charAt(0).toUpperCase() + side.slice(1); module.directive(directiveName, [ @@ -119,14 +147,66 @@ function($rootElement) { return { restrict: 'C', - link: function(scope) { + require: "navController", + link: function(scope, elem, attr, ctrl) { $rootElement.addClass('has-navbar-' + side); - scope.$on('$destroy', function() { + scope.$on('$destroy', function(){ $rootElement.removeClass('has-navbar-' + side); }); + if (!global) global = ctrl; + global.registerController(side, new (function() { + this.hide = function() { + $rootElement.removeClass("has-navbar-" + side); + elem.addClass("ng-hide"); + }; + this.show = function() { + elem.removeClass("ng-hide"); + $rootElement.addClass("has-navbar-" + side); + }; + this.slideout = function() { + $rootElement.removeClass("has-navbar-" + side); + elem.addClass("ng-hide"); + }; + this.slidein = function() { + elem.removeClass("ng-hide"); + $rootElement.addClass("has-navbar-" + side); + }; + })()); } }; } ]); }); + + /** + * @directive [hide|show|slidein|slideout][Top|Bottom|Both][Nav] + * @restrict C + * @description + * + * Toggle each(or both) nabar(s) with or without animations + * + * ``` html + * + * + * + * ``` + */ + angular.forEach(['Top', 'Bottom', 'Both'], function(nav) { + angular.forEach(['hide', 'show', 'slidein', 'slideout'], function(method) { + var name = method + nav + "Nav"; + module.directive(name, function() { + return { + restrict: "C", + link: function(scope, elem, attr) { + if (global) + if (nav == 'Both') { + global['bottom'][method](); + global['top'][method](); + } else + global[nav.toLowerCase()][method](); + } + } + }); + }); + }); })(); From d35a584c2f0e3f23bb706f7e512f806a7c58d044 Mon Sep 17 00:00:00 2001 From: ballenjr Date: Wed, 31 Aug 2016 12:14:35 -0700 Subject: [PATCH 2/8] Formatting --- src/js/components/navbars.js | 88 ++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/src/js/components/navbars.js b/src/js/components/navbars.js index f324285..6c022e1 100644 --- a/src/js/components/navbars.js +++ b/src/js/components/navbars.js @@ -1,84 +1,84 @@ -/** - * @module mobile-angular-ui.components.navbars +/** + * @module mobile-angular-ui.components.navbars * @description - * + * * Bootstrap default navbars are awesome for responsive websites, but are not the * best with a small screen. Also fixed positioning is yet not an option to create * navbars standing in top or bottom of the screen. - * + * * Mobile Angular Ui offers an alternative to bootstrap navbars that is more * suitable for mobile. - * + * * It uses scrollable areas to avoid scroll issues. In the following figure you can * see the difference between fixed navbars and navbars with absolute positioning. - * + * *
* *
- * + * * Here is the basic markup to achieve this. - * + * * ``` html *
*
* *
- * + * *
* *
- * + * *
* *
*
* ``` - * + * * As you can notice the base class is `.navbar-app` while the positioning is * obtained adding either `.navbar-absolute-top` or `.navbar-absolute-bottom` * class. - * + * * ### Mobile Navbar Layout - * + * * Top navbar in mobile design most of the times follows a clear pattern: a * centered title surrounded by one or two action buttons, the _back_ or the * _menu_ buttons are two common examples. - * + * * Twitter Bootstrap ships with a different arrangement of components for navbars * since they are supposed to host an horizontal navigation menu. - * + * * `.navbar-app` is specifically designed to support this different type of * `.interaction and arrangement. - * + * * Consider the following example: - * + * * ``` html *
- * + * *
* Navbar Brand *
- * + * *
*
* Left Action *
*
- * + * *
*
* Right Action *
*
*
- * + * * ``` - * + * * `.navbar-brand-center` is a specialization of BS3's `.navbar-brand`. It will * render the title centered and below the two button groups. Note that `.navbar- * brand-center` will position the title with absolute positioning ensuring that * it will never cover the buttons, which would cause interaction problems. - * + * */ (function() { @@ -88,18 +88,18 @@ var global; - /** + /** * @directive navController * @restrict C * @description * * Directive to bind controller to navbar - * + * * ``` html *
* *
- * ``` + * ``` */ module.directive("navController", function() { return { @@ -107,38 +107,38 @@ controller: function() { this.registerController = function(name, ctrl) { this[name] = ctrl; - } + }; }, link: function(scope){} - } + }; }); - /** + /** * @directive navbarAbsoluteTop * @restrict C * @description * * Setup absolute positioned top navbar. - * + * * ``` html *
* *
- * ``` + * ``` */ - /** + /** * @directive navbarAbsoluteBottom * @restrict C * @description - * + * * Setup absolute positioned bottom navbar. - * + * * ``` html *
* *
- * ``` + * ``` */ angular.forEach(['top', 'bottom'], function(side) { var directiveName = 'navbarAbsolute' + side.charAt(0).toUpperCase() + side.slice(1); @@ -150,7 +150,7 @@ require: "navController", link: function(scope, elem, attr, ctrl) { $rootElement.addClass('has-navbar-' + side); - scope.$on('$destroy', function(){ + scope.$on('$destroy', function() { $rootElement.removeClass('has-navbar-' + side); }); if (!global) global = ctrl; @@ -178,18 +178,18 @@ ]); }); - /** + /** * @directive [hide|show|slidein|slideout][Top|Bottom|Both][Nav] * @restrict C * @description - * + * * Toggle each(or both) nabar(s) with or without animations - * + * * ``` html * * * - * ``` + * ``` */ angular.forEach(['Top', 'Bottom', 'Both'], function(nav) { angular.forEach(['hide', 'show', 'slidein', 'slideout'], function(method) { @@ -199,13 +199,13 @@ restrict: "C", link: function(scope, elem, attr) { if (global) - if (nav == 'Both') { - global['bottom'][method](); - global['top'][method](); + if (nav === 'Both') { + global.bottom[method](); + global.top[method](); } else global[nav.toLowerCase()][method](); } - } + }; }); }); }); From b207c092bcd3cd5a3f7d2abe09c750cf271c9951 Mon Sep 17 00:00:00 2001 From: ballenjr Date: Wed, 31 Aug 2016 12:24:54 -0700 Subject: [PATCH 3/8] Missed some formatting --- src/js/components/navbars.js | 60 ++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/js/components/navbars.js b/src/js/components/navbars.js index 6c022e1..f407d92 100644 --- a/src/js/components/navbars.js +++ b/src/js/components/navbars.js @@ -12,23 +12,23 @@ * It uses scrollable areas to avoid scroll issues. In the following figure you can * see the difference between fixed navbars and navbars with absolute positioning. * - *
- * + *
+ * *
* * Here is the basic markup to achieve this. * * ``` html - *
- *
+ *
+ *
* *
* - *
+ *
* *
* - *
+ *
* *
*
@@ -53,20 +53,20 @@ * Consider the following example: * * ``` html - *
+ *
* - *
+ *
* Navbar Brand *
* - *
- *
+ *
+ *
* Left Action *
*
* - *
- *
+ *
+ *
* Right Action *
*
@@ -96,20 +96,20 @@ * Directive to bind controller to navbar * * ``` html - *
+ *
* *
* ``` */ - module.directive("navController", function() { + module.directive('navController', function() { return { - restrict: "A", + restrict: 'A', controller: function() { this.registerController = function(name, ctrl) { this[name] = ctrl; }; }, - link: function(scope){} + link: function(scope) {} }; }); @@ -121,7 +121,7 @@ * Setup absolute positioned top navbar. * * ``` html - *
+ *
* *
* ``` @@ -135,7 +135,7 @@ * Setup absolute positioned bottom navbar. * * ``` html - *
+ *
* *
* ``` @@ -147,7 +147,7 @@ function($rootElement) { return { restrict: 'C', - require: "navController", + require: 'navController', link: function(scope, elem, attr, ctrl) { $rootElement.addClass('has-navbar-' + side); scope.$on('$destroy', function() { @@ -156,20 +156,20 @@ if (!global) global = ctrl; global.registerController(side, new (function() { this.hide = function() { - $rootElement.removeClass("has-navbar-" + side); - elem.addClass("ng-hide"); + $rootElement.removeClass('has-navbar-' + side); + elem.addClass('ng-hide'); }; this.show = function() { - elem.removeClass("ng-hide"); - $rootElement.addClass("has-navbar-" + side); + elem.removeClass('ng-hide'); + $rootElement.addClass('has-navbar-' + side); }; this.slideout = function() { - $rootElement.removeClass("has-navbar-" + side); - elem.addClass("ng-hide"); + $rootElement.removeClass('has-navbar-' + side); + elem.addClass('ng-hide'); }; this.slidein = function() { - elem.removeClass("ng-hide"); - $rootElement.addClass("has-navbar-" + side); + elem.removeClass('ng-hide'); + $rootElement.addClass('has-navbar-' + side); }; })()); } @@ -186,17 +186,17 @@ * Toggle each(or both) nabar(s) with or without animations * * ``` html - * + * * * * ``` */ angular.forEach(['Top', 'Bottom', 'Both'], function(nav) { angular.forEach(['hide', 'show', 'slidein', 'slideout'], function(method) { - var name = method + nav + "Nav"; + var name = method + nav + 'Nav'; module.directive(name, function() { return { - restrict: "C", + restrict: 'C', link: function(scope, elem, attr) { if (global) if (nav === 'Both') { From 1586f52ab8dde56e8b390675dc07a8b1bfb577d9 Mon Sep 17 00:00:00 2001 From: ballenjr Date: Wed, 31 Aug 2016 13:10:01 -0700 Subject: [PATCH 4/8] Bind NavController --- test/unit/components/navbars.spec.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unit/components/navbars.spec.js b/test/unit/components/navbars.spec.js index 747dd17..7d56587 100644 --- a/test/unit/components/navbars.spec.js +++ b/test/unit/components/navbars.spec.js @@ -21,7 +21,7 @@ describe('components', function() { describe('navbarAbsoluteTop', function() { it('adds class has-navbar-top if navbarAbsoluteTop is present', function() { - let elem = angular.element('
'); + let elem = angular.element('
'); compile(elem)(scope); scope.$digest(); @@ -29,7 +29,7 @@ describe('components', function() { }); it('removes class has-navbar-top if navbarAbsoluteTop is destroyed', function() { - let elem = angular.element('
'); + let elem = angular.element('
'); compile(elem)(scope); scope.$digest(); scope.$destroy(); @@ -39,7 +39,7 @@ describe('components', function() { describe('navbarAbsoluteBottom', function() { it('adds class has-navbar-bottom if navbarAbsoluteBottom is present', function() { - let elem = angular.element('
'); + let elem = angular.element('
'); compile(elem)(scope); scope.$digest(); @@ -47,7 +47,7 @@ describe('components', function() { }); it('removes class has-navbar-bottom if navbarAbsoluteBottom is destroyed', function() { - let elem = angular.element('
'); + let elem = angular.element('
'); compile(elem)(scope); scope.$digest(); scope.$destroy(); From 566d4cf67231b5edb8965e5a69c3ac319efe92fc Mon Sep 17 00:00:00 2001 From: ballenjr Date: Wed, 31 Aug 2016 13:44:12 -0700 Subject: [PATCH 5/8] Add some coverage --- test/unit/components/navbars.spec.js | 71 ++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/test/unit/components/navbars.spec.js b/test/unit/components/navbars.spec.js index 7d56587..eb97d56 100644 --- a/test/unit/components/navbars.spec.js +++ b/test/unit/components/navbars.spec.js @@ -54,5 +54,76 @@ describe('components', function() { expect($rootElement.attr('class')).not.toContain('has-navbar-bottom'); }); }); + + describe('hideTopNav', function() { + it('hides the navbarAbsoluteTop when present within the nested view', function() { + let elem = angular.element('
'); + compile(elem)(scope); + scope.$digest(); + + expect($rootElement.attr('class')).not.toContain('has-navbar-top'); + expect(elem.find('.navbar-absolute-top').attr('class')).toContain('ng-hide'); + }); + }); + + describe('hideBottomNav', function() { + it('hides the navbarAbsoluteBottom when present within the nested view', function() { + let elem = angular.element('
'); + compile(elem)(scope); + scope.$digest(); + + expect($rootElement.attr('class')).not.toContain('has-navbar-bottom'); + expect(elem.find('.navbar-absolute-bottom').attr('class')).toContain('ng-hide'); + }); + }); + + describe('slideoutBottomNav', function() { + it('hides the navbarAbsoluteBottom when present within the nested view', function() { + let elem = angular.element('
'); + compile(elem)(scope); + scope.$digest(); + + expect($rootElement.attr('class')).not.toContain('has-navbar-bottom'); + expect(elem.find('.navbar-absolute-bottom').attr('class')).toContain('ng-hide'); + }); + }); + + describe('slideoutTopNav', function() { + it('hides the navbarAbsoluteTop when present within the nested view', function() { + let elem = angular.element('
'); + compile(elem)(scope); + scope.$digest(); + + expect($rootElement.attr('class')).not.toContain('has-navbar-top'); + expect(elem.find('.navbar-absolute-top').attr('class')).toContain('ng-hide'); + }); + }); + + describe('hideBothNav', function() { + it('hides both navbarAbsoluteTop && navbarAbsoluteBottom when present within the nested view', function() { + let elem = angular.element('
'); + compile(elem)(scope); + scope.$digest(); + + expect($rootElement.attr('class')).not.toContain('has-navbar-bottom'); + expect($rootElement.attr('class')).not.toContain('has-navbar-top'); + expect(elem.find('.navbar-absolute-bottom').attr('class')).toContain('ng-hide'); + expect(elem.find('.navbar-absolute-top').attr('class')).toContain('ng-hide'); + }); + }); + + describe('slideoutBothNav', function() { + it('hides both navbarAbsoluteTop && navbarAbsoluteBottom when present within the nested view', function() { + let elem = angular.element('
'); + compile(elem)(scope); + scope.$digest(); + + expect($rootElement.attr('class')).not.toContain('has-navbar-bottom'); + expect($rootElement.attr('class')).not.toContain('has-navbar-top'); + expect(elem.find('.navbar-absolute-bottom').attr('class')).toContain('ng-hide'); + expect(elem.find('.navbar-absolute-top').attr('class')).toContain('ng-hide'); + }); + }); + }); }); From 1ed79890f6215c8eb2d5c2a5fbb5274a95e88e6b Mon Sep 17 00:00:00 2001 From: ballenjr Date: Wed, 31 Aug 2016 14:05:39 -0700 Subject: [PATCH 6/8] Formatting --- test/unit/components/navbars.spec.js | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/test/unit/components/navbars.spec.js b/test/unit/components/navbars.spec.js index eb97d56..581bee7 100644 --- a/test/unit/components/navbars.spec.js +++ b/test/unit/components/navbars.spec.js @@ -57,7 +57,9 @@ describe('components', function() { describe('hideTopNav', function() { it('hides the navbarAbsoluteTop when present within the nested view', function() { - let elem = angular.element('
'); + let value = '
'; + value += '
'; + let elem = angular.element(value); compile(elem)(scope); scope.$digest(); @@ -68,7 +70,9 @@ describe('components', function() { describe('hideBottomNav', function() { it('hides the navbarAbsoluteBottom when present within the nested view', function() { - let elem = angular.element('
'); + let value = '
'; + value += '
'; + let elem = angular.element(value); compile(elem)(scope); scope.$digest(); @@ -79,7 +83,9 @@ describe('components', function() { describe('slideoutBottomNav', function() { it('hides the navbarAbsoluteBottom when present within the nested view', function() { - let elem = angular.element('
'); + let value = '
'; + value += '
'; + let elem = angular.element(value); compile(elem)(scope); scope.$digest(); @@ -90,7 +96,9 @@ describe('components', function() { describe('slideoutTopNav', function() { it('hides the navbarAbsoluteTop when present within the nested view', function() { - let elem = angular.element('
'); + let value = '
'; + value += '
'; + let elem = angular.element(value); compile(elem)(scope); scope.$digest(); @@ -101,7 +109,10 @@ describe('components', function() { describe('hideBothNav', function() { it('hides both navbarAbsoluteTop && navbarAbsoluteBottom when present within the nested view', function() { - let elem = angular.element('
'); + let value = '
'; + value += '
'; + value += '
'; + let elem = angular.element(value); compile(elem)(scope); scope.$digest(); @@ -114,7 +125,10 @@ describe('components', function() { describe('slideoutBothNav', function() { it('hides both navbarAbsoluteTop && navbarAbsoluteBottom when present within the nested view', function() { - let elem = angular.element('
'); + let value = '
'; + value += '
'; + value += '
'; + let elem = angular.element(value); compile(elem)(scope); scope.$digest(); From ccdae045247c4f5e44c42d1cbd5319eb3fcb252f Mon Sep 17 00:00:00 2001 From: ballenjr Date: Wed, 31 Aug 2016 14:19:24 -0700 Subject: [PATCH 7/8] Nuance --- test/unit/components/navbars.spec.js | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/test/unit/components/navbars.spec.js b/test/unit/components/navbars.spec.js index 581bee7..8019de9 100644 --- a/test/unit/components/navbars.spec.js +++ b/test/unit/components/navbars.spec.js @@ -57,60 +57,60 @@ describe('components', function() { describe('hideTopNav', function() { it('hides the navbarAbsoluteTop when present within the nested view', function() { - let value = '
'; + let value = '
'; value += '
'; let elem = angular.element(value); compile(elem)(scope); scope.$digest(); expect($rootElement.attr('class')).not.toContain('has-navbar-top'); - expect(elem.find('.navbar-absolute-top').attr('class')).toContain('ng-hide'); + expect(elem.find('top').attr('class')).toContain('ng-hide'); }); }); describe('hideBottomNav', function() { it('hides the navbarAbsoluteBottom when present within the nested view', function() { - let value = '
'; + let value = '
'; value += '
'; let elem = angular.element(value); compile(elem)(scope); scope.$digest(); expect($rootElement.attr('class')).not.toContain('has-navbar-bottom'); - expect(elem.find('.navbar-absolute-bottom').attr('class')).toContain('ng-hide'); + expect(elem.find('bottom').attr('class')).toContain('ng-hide'); }); }); describe('slideoutBottomNav', function() { it('hides the navbarAbsoluteBottom when present within the nested view', function() { - let value = '
'; + let value = '
'; value += '
'; let elem = angular.element(value); compile(elem)(scope); scope.$digest(); expect($rootElement.attr('class')).not.toContain('has-navbar-bottom'); - expect(elem.find('.navbar-absolute-bottom').attr('class')).toContain('ng-hide'); + expect(elem.find('bottom').attr('class')).toContain('ng-hide'); }); }); describe('slideoutTopNav', function() { it('hides the navbarAbsoluteTop when present within the nested view', function() { - let value = '
'; + let value = '
'; value += '
'; let elem = angular.element(value); compile(elem)(scope); scope.$digest(); expect($rootElement.attr('class')).not.toContain('has-navbar-top'); - expect(elem.find('.navbar-absolute-top').attr('class')).toContain('ng-hide'); + expect(elem.find('top').attr('class')).toContain('ng-hide'); }); }); describe('hideBothNav', function() { it('hides both navbarAbsoluteTop && navbarAbsoluteBottom when present within the nested view', function() { - let value = '
'; - value += '
'; + let value = '
'; + value += ''; value += '
'; let elem = angular.element(value); compile(elem)(scope); @@ -118,15 +118,15 @@ describe('components', function() { expect($rootElement.attr('class')).not.toContain('has-navbar-bottom'); expect($rootElement.attr('class')).not.toContain('has-navbar-top'); - expect(elem.find('.navbar-absolute-bottom').attr('class')).toContain('ng-hide'); - expect(elem.find('.navbar-absolute-top').attr('class')).toContain('ng-hide'); + expect(elem.find('bottom').attr('class')).toContain('ng-hide'); + expect(elem.find('top').attr('class')).toContain('ng-hide'); }); }); describe('slideoutBothNav', function() { it('hides both navbarAbsoluteTop && navbarAbsoluteBottom when present within the nested view', function() { - let value = '
'; - value += '
'; + let value = '
'; + value += ''; value += '
'; let elem = angular.element(value); compile(elem)(scope); @@ -134,8 +134,8 @@ describe('components', function() { expect($rootElement.attr('class')).not.toContain('has-navbar-bottom'); expect($rootElement.attr('class')).not.toContain('has-navbar-top'); - expect(elem.find('.navbar-absolute-bottom').attr('class')).toContain('ng-hide'); - expect(elem.find('.navbar-absolute-top').attr('class')).toContain('ng-hide'); + expect(elem.find('bottom').attr('class')).toContain('ng-hide'); + expect(elem.find('top').attr('class')).toContain('ng-hide'); }); }); From 29f5b113a5e005d3df47505f564ac8f067d5095a Mon Sep 17 00:00:00 2001 From: Brent Date: Mon, 7 Nov 2016 10:27:48 -0800 Subject: [PATCH 8/8] simpler bind --- src/js/components/navbars.js | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/src/js/components/navbars.js b/src/js/components/navbars.js index f407d92..e03c419 100644 --- a/src/js/components/navbars.js +++ b/src/js/components/navbars.js @@ -88,31 +88,6 @@ var global; - /** - * @directive navController - * @restrict C - * @description - * - * Directive to bind controller to navbar - * - * ``` html - *
- * - *
- * ``` - */ - module.directive('navController', function() { - return { - restrict: 'A', - controller: function() { - this.registerController = function(name, ctrl) { - this[name] = ctrl; - }; - }, - link: function(scope) {} - }; - }); - /** * @directive navbarAbsoluteTop * @restrict C @@ -147,7 +122,11 @@ function($rootElement) { return { restrict: 'C', - require: 'navController', + controller: function() { + this.registerController = function(name, ctrl) { + this[name] = ctrl; + }; + }, link: function(scope, elem, attr, ctrl) { $rootElement.addClass('has-navbar-' + side); scope.$on('$destroy', function() {