diff --git a/src/client/app.js b/src/client/app.js index 0e020831..73bd4f02 100644 --- a/src/client/app.js +++ b/src/client/app.js @@ -2,6 +2,7 @@ * Created by tmshv on 04/11/14. **/ +import MainMenu from './components/MainMenu'; import Document from './components/Document'; import Award from './components/Award'; import GalleryItem from './components/GalleryItem'; @@ -91,7 +92,6 @@ app.run(($location, $rootScope, $http) => { api, IOService, MenuService, - require('./directives/mainMenu'), require('./directives/backgroundPicture'), require('./ui/breadcrumbs'), require('./ui/timeline'), @@ -103,6 +103,7 @@ app.run(($location, $rootScope, $http) => { require('./pages/gallery'), require('./controllers/ContactsController'), require('./controllers/CopyrightController'), + MainMenu, Document, Award, GalleryItem, diff --git a/src/client/components/MainMenu.js b/src/client/components/MainMenu.js new file mode 100644 index 00000000..0b4920c9 --- /dev/null +++ b/src/client/components/MainMenu.js @@ -0,0 +1,14 @@ +import template from '../../templates/components/main-menu.html'; + +export default function (app) { + app.component('mainMenu', { + bindings: { + menu: '=items' + }, + controller: function(menu){ + this.isActive = item => menu.current ? item.url == menu.current.url : false; + this.isValid = item => 'url' in item; + }, + template: template + }); +}; \ No newline at end of file diff --git a/src/client/directives/mainMenu.js b/src/client/directives/mainMenu.js deleted file mode 100644 index 9238d67b..00000000 --- a/src/client/directives/mainMenu.js +++ /dev/null @@ -1,24 +0,0 @@ -module.exports = function (app) { - app.directive('mainMenu', function (menu) { - return { - restrict: 'E', - templateUrl: '/views/menu.html', - scope: { - menu: '=items' - }, - link: function(scope, element){ - scope.isActive = function (item) { - if (menu.current) { - return item.url == menu.current.url; - } else { - return false; - } - }; - - scope.isValid = function (item) { - return 'url' in item; - }; - } - } - }); -}; \ No newline at end of file diff --git a/src/templates/components/main-menu.html b/src/templates/components/main-menu.html new file mode 100644 index 00000000..1a8dbfa6 --- /dev/null +++ b/src/templates/components/main-menu.html @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/src/templates/views/menu.html b/src/templates/views/menu.html deleted file mode 100644 index 53c1d274..00000000 --- a/src/templates/views/menu.html +++ /dev/null @@ -1,6 +0,0 @@ - \ No newline at end of file