diff --git a/app/assets/js/scripts.js b/app/assets/js/scripts.js index c6ef0d2..1c66fef 100644 --- a/app/assets/js/scripts.js +++ b/app/assets/js/scripts.js @@ -23,22 +23,3 @@ var SFLfront = (function() { mquery: mquery }; })(); - -// //var mqDesktop = 'only screen and (min-width: 60em)'; -// //var mqTablet = 'only screen and (min-width: 30.063em) and (max-width: 59.938em)'; -// //var mqPhone = 'only screen and (min-width: 20em) and (max-width: 30em)'; - -// $(function () { -// // ON LOAD -// console.log($('li'), '!!!!'); - -// $('a').on('click', function(e) { -// e.preventDefault(); -// console.log($('!!!')); -// }); - -// // ON RESIZE -// }); - - -// })(jQuery, window, document); diff --git a/app/topbar/topbar_test.js b/app/topbar/topbar_test.js deleted file mode 100644 index d71e7c8..0000000 --- a/app/topbar/topbar_test.js +++ /dev/null @@ -1,43 +0,0 @@ -'use strict'; - -describe('Topbar module', function () { - var $compile, - $rootScope, - $controller, - $httpBackend; - - beforeEach(module('adagios.topbar')); - - beforeEach(inject(function (_$compile_, _$rootScope_, _$controller_, _$httpBackend_) { - $compile = _$compile_; - $rootScope = _$rootScope_; - $controller = _$controller_; - $httpBackend = _$httpBackend_; - - $httpBackend.expectGET('topbar/topbar.html').respond('{{ notifications }}'); - })); - - describe('TopBarCtrl', function () { - - it('should be defined', function () { - var scope = $rootScope.$new(), - topbar = $controller('TopBarCtrl', { $scope : scopeĀ }); - - expect(topbar).toBeDefined(); - }); - - }); - - describe('Topbar directive', function () { - - it('should insert the number of warnings', function () { - var element = $compile('')($rootScope); - $httpBackend.flush(); - $rootScope.notifications = 44; - $rootScope.$digest(); - - expect(element.text()).toBe('44'); - }); - - }); -});