Browse Source

fix loading

pull/1/head
wes 7 years ago
parent
commit
58196e79cb
  1. 7
      riotblog.min.js
  2. 36
      src/scripts/app.tag
  3. 4
      src/scripts/bbutton.tag
  4. 1
      src/scripts/editor.js
  5. 20
      src/scripts/post.tag
  6. 11
      src/scripts/riotblog.js

7
riotblog.min.js

File diff suppressed because one or more lines are too long

36
src/scripts/app.tag

@ -124,11 +124,11 @@ RiotControl.on("postswitch",
);
self.state = {
"_id" : self.opts.postid.slice(-hashLength),
"author" : self.opts.author,
"title" : self.opts.title,
"loaded" : false,
"initial" : decodeURIComponent(self.opts.initial_post)
"_id" : self.opts.postid.slice(-hashLength),
"author" : self.opts.author,
"title" : self.opts.title,
"loaded" : false,
"initial" : decodeURIComponent(self.opts.initial_post)
};
self.active = lens.actives({
@ -197,19 +197,6 @@ to(name) {
}).bind(this);
}
self.route.base('/blog/')
self.route("/", () => { self.route(`/posts/${self.state._id}`); });
self.route("/posts", () => { self.route(`/posts/${self.state._id}`); });
self.route("posts/*", posts);
self.route("posts", (() => {posts(self.state._id)}));
self.route("projects", projects);
self.route("about", about);
self.route("links", links);
self.one("updated", () => {
route.start(true);
});
function getcategories() {
window.cached("/blog/categories")
.then((resp) => resp.json())
@ -219,10 +206,17 @@ function getcategories() {
});
}
self.on("mount", getcategories);
self.on("mount", () => {
console.log(decodeURIComponent(self.opts.initial_post));
self.route.base('/blog/')
self.route("/", () => { self.route(`/posts/${self.state._id}`); });
self.route("/posts", () => { self.route(`/posts/${self.state._id}`); });
self.route("posts/*", posts);
self.route("posts", (() => {posts(self.state._id)}));
self.route("projects", projects);
self.route("about", about);
self.route("links", links);
route.start(true);
getcategories();
});
</script>

4
src/scripts/bbutton.tag

@ -1,4 +0,0 @@
<bbutton>
<button class="btn rounded-button">
</button>
</bbutton>

1
src/scripts/editor.js

@ -1,6 +1,5 @@
import riot from 'riot';
import { default as RiotControl } from 'riotcontrol';
import './bbutton.tag';
import { default as promise } from 'es6-promise';
import { default as smooth } from 'smoothscroll-polyfill';
import 'element-closest';

20
src/scripts/post.tag

@ -17,13 +17,13 @@
<social
show={!loading}
ref="social"
title={opts.state.title}
postid={opts.state._id}
title={title}
postid={_id}
>
</social>
<p class="post-content centered text-break">
<raw
content="{ converter.makeHtml(content) }"
content="{ window.converter.makeHtml(content) }"
>
</raw>
</p>
@ -44,20 +44,18 @@
<script>
import './raw.tag';
import './social.tag';
import { default as showdown } from 'showdown';
import './postcontrols.tag';
import route from 'riot-route';
this.converter = new showdown.Converter();
var self = this;
const hashLength = 8;
self.route = route;
self.loading = false;
self.category = "programming";
self._id = self.opts.state._id.slice(-hashLength);
self.author = self.opts.state.author;
self.title = self.opts.state.title;
@ -71,7 +69,6 @@ self.end = false;
RiotControl.on("filtercategory",
(ev) => {
let category = ev.category.toLowerCase();
console.log(category);
});
prev(ev) {
@ -172,12 +169,5 @@ prevPost(_id) {
self.updatePost(JSON.parse(resp))
})
}
self.on("mount", () => {
self.update({
"loading" : false
});
});
</script>
</post>

11
src/scripts/riotblog.js

@ -1,18 +1,18 @@
import riot from 'riot';
import { default as RiotControl } from 'riotcontrol';
import './bbutton.tag';
import './post.tag';
import './posts.tag';
import './projects.tag';
import './app.tag';
import './grid.js';
import { default as promise } from 'es6-promise';
import { default as showdown } from 'showdown';
import { default as smooth } from 'smoothscroll-polyfill';
import 'element-closest';
import fetchCached from 'fetch-cached';
import 'whatwg-fetch';
window.converter = new showdown.Converter();
window.cache = {};
window.cached = fetchCached({
@ -36,11 +36,4 @@ window.addEventListener("load", () => {
RiotControl.addStore(new riot.observable());
riot.mount("app");
riot.mount("post",
{
"creator" : "author"
});
riot.mount("bbutton");
riot.mount("projects");
});

Loading…
Cancel
Save