nicd/Laine
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Blog name in header and support for hidden pages

Browse source
This commit is contained in:
Mikko Ahlroth 2014-11-16 19:06:31 +02:00
parent 860d3b6146
commit b8b86fb4b9
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/db/db.js
View file

@ -131,9 +131,13 @@ define(['knockout', '../transfer/transfer', 'moment'], function(ko, transfer, mo
self.parsePageData = function(matched) {
var slug = matched[1];
var isHidden = _.isUndefined(matched[2]);
var linkText = isHidden? '' : matched[2];
var page = ko.observable({
slug: ko.observable(slug),
linkText: ko.observable(matched[2]),
isHidden: ko.observable(isHidden),
linkText: ko.observable(linkText),
synced: ko.observable(false),
title: ko.observable(null),
@ -151,7 +155,7 @@ define(['knockout', '../transfer/transfer', 'moment'], function(ko, transfer, mo
*/
self.parseIndex = function(posts, pages, indexStr) {
var post_data_regex = /^(\d{4}-\d{2}-\d{2}) ([a-z0-9\-]+)(\s([^,]+?,?)*)?$/;
var page_data_regex = /^([a-z0-9\-]+) (.*)$/;
var page_data_regex = /^([a-z0-9\-]+)(?: (.*))?$/;
var lines = indexStr.split('\n');
var line_no = 1;

2
src/components/nav-bar/nav-bar.html
View file

@ -7,7 +7,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#!">Laine</a>
<a class="navbar-brand" href="#!" data-bind="text: blogName"></a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav" data-bind="foreach: { data: pages, as: 'page' }">

9
src/components/nav-bar/nav-bar.js
View file

@ -1,13 +1,16 @@
define(['knockout', 'text!./nav-bar.html', '../db/db', '../address-service/address-service'],
function(ko, template, DB, addressService) {
define(['knockout', 'text!./nav-bar.html', '../db/db', '../address-service/address-service', '../config-service/config-service'],
function(ko, template, DB, addressService, configService) {
function NavBarViewModel(params) {
var self = this;
self.AS = addressService;
self.blogName = configService.blogName;
self.route = params.route;
self.pages = ko.pureComputed(function() {
return DB.pages();
return _.filter(DB.pages(), function(page) {
return !page().isHidden();
});
});
}