fixed many bugs

This commit is contained in:
didier amyot committed 2016-04-30 11:06:30 -04:00
1 parent 7e54032605
commit 61f32a74da
10 files changed
+8402 -22

No files matched your search

+9 -9
View File
@@ -32,9 +32,8 @@ define(['m', '_', 'util'], function (m, _, util) {
var class_ = topNavBar._isActive(item.path) ? 'uk-active' : '';
var url = topNavBar._getUrlForId(item.path);
return m("li", {class: class_},
m("a.uk-navbar-nav-subtitle", {href: url},
topNavBar._getItemIcon(item),
m('div', item.name)
m("a", {href: url},
m('div', topNavBar._getItemIcon(item), ' ', item.name)
)
);
};
@@ -52,9 +51,10 @@ define(['m', '_', 'util'], function (m, _, util) {
topNavBar._getSmallItem = function(item){
var class_ = topNavBar._isActive(item.path) ? 'uk-active' : '';
var url = topNavBar._getUrlForId(item.path);
return m("li.uk-align-left", {class: class_},
topNavBar._getItemIcon(item), ' ',
return m("li", {class: class_},
m("a", {href: url},
topNavBar._getItemIcon(item),
' ',
item.name
)
);
@@ -69,16 +69,16 @@ define(['m', '_', 'util'], function (m, _, util) {
topNavBar.mediumTopNav = function(){
return [
m('li.uk-parent', util.facebookLink()),
m('li.uk-parent', m('div.uk-navbar-brand', util.facebookLink())),
_.map(topNavBar._urlMapping, topNavBar._getMediumItem)
];
};
topNavBar.dropdown = function(){
return m('div.uk-dropdown',
m('ul.uk-nav.uk-nav-navbar.uk-dropdown-navbar'),
m('ul.uk-nav.uk-nav-navbar.uk-dropdown-navbar',
_.map(topNavBar._urlMapping, topNavBar._getSmallItem)
);
));
};
topNavBar.toggleDropdown = function(model){
@@ -106,7 +106,7 @@ define(['m', '_', 'util'], function (m, _, util) {
var class_ = model.openDropdown ? 'uk-open' : '';
var attrs = {class: class_, onclick: topNavBar.toggleDropdown(model)};
var ret = [
m('li.uk-parent', util.facebookLink()),
m('li.uk-parent', m('div.uk-navbar-brand', util.facebookLink())),
m('li.uk-parent[data-uk-dropdown][aria-expanded]', attrs, m('a', m('i.fa.fa-bars'), ' Menu'), topNavBar.dropdown()),
];
if(model.openDropdown){