Skip to content

fix run dev #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix run dev #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee4bc2b
fix run dev
cryptix Dec 22, 2018
2046fb9
fix timeago format
cryptix Dec 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"scripts": {
"watch-parcel": "parcel watch index.html --out-dir debug --no-hmr",
"watch-firefox": "web-ext run --source-dir ./debug/ --firefox=firefoxdeveloperedition --browser-console",
"watch-firefox": "web-ext run --source-dir ./debug/ --firefox=firefox-devedition --browser-console",
"watch-static": "watch \"npm run copy-files\" ./static",
"copy-files": "copyfiles -a -u 1 \"./static/**/*\" ./debug",
"build": "parcel build index.html",
Expand All @@ -31,7 +31,7 @@
"bugs": {
"url": "https://github.com/soapdog/patchfox/issues"
},
"browserlist": [
"browserslist": [
"Firefox ESR"
],
"homepage": "https://github.com/soapdog/patchfox#readme",
Expand Down Expand Up @@ -60,6 +60,7 @@
"copyfiles": "^2.1.0",
"parcel-bundler": "^1.11.0",
"sass": "^1.14.1",
"watch": "^1.0.2"
"watch": "^1.0.2",
"web-ext": "^2.9.3"
}
}
6 changes: 2 additions & 4 deletions src/packages/feedViewer/public.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import m from "mithril";
import stream from "mithril/stream";
import pull from "pull-stream";
import md from "ssb-markdown";
import timeago from "timeago.js";
import { format } from "timeago.js";
import common from "../common";

var thread = stream([]);
Expand Down Expand Up @@ -61,8 +61,6 @@ const Public = {
}
},
publicView: () => {
console.log(thread());
const timeagoInstance = timeago();
const threads = thread();
return threads.map(t => {
if (t.hasOwnProperty("messages")) {
Expand All @@ -72,7 +70,7 @@ const Public = {
m("div.message-header", [
m("div.message-author", Public.avatar(message.value.author)),
m("div.space", ""),
m("div.message-date", timeagoInstance.format(message.value.timestamp))
m("div.message-date", format(message.value.timestamp))
]),
m("div.message-body", Public.mdown(message.value.content.text)),
m("div.message-footer", [
Expand Down
6 changes: 2 additions & 4 deletions src/packages/feedViewer/thread.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import m from "mithril";
import stream from "mithril/stream";
import pull from "pull-stream";
import md from "ssb-markdown";
import timeago from "timeago.js";
import { format } from "timeago.js";
import common from "../common";

var thread = stream([]);
Expand Down Expand Up @@ -62,8 +62,6 @@ const Thread = {
}
},
threadView: () => {
console.log(thread());
const timeagoInstance = timeago();
const threads = thread();
return threads.map(t => {
if (t.hasOwnProperty("messages")) {
Expand All @@ -73,7 +71,7 @@ const Thread = {
m("div.message-header", [
m("div.message-author", Thread.avatar(message.value.author)),
m("div.space", ""),
m("div.message-date", timeagoInstance.format(message.value.timestamp))
m("div.message-date", format(message.value.timestamp))
]),
m("div.message-body", Thread.mdown(message.value.content.text)),
m("div.message-footer", [
Expand Down