diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js
index 5c715cc2..6c569c1e 100644
--- a/webpackBaseConfig.js
+++ b/webpackBaseConfig.js
@@ -338,7 +338,7 @@ module.exports = {
path.resolve(__dirname, 'src'),
path.resolve(__dirname, 'node_modules')
],
- extensions: ["", ".js"],
+ extensions: ["", ".js", ".vue"],
alias: {
codemirror: path.join(__dirname, 'node_modules/codemirror/codemirror.min.js'),
inlineAttachment: path.join(__dirname, 'public/vendor/inlineAttachment/inline-attachment.js'),
@@ -372,6 +372,12 @@ module.exports = {
loaders: [{
test: /\.json$/,
loader: 'json-loader'
+ }, {
+ test: /\.vue$/,
+ loader: 'vue',
+ options: {
+ // vue-loader options go here
+ }
}, {
test: /\.js$/,
loader: 'babel',
--
cgit v1.2.3
From 78c51e5e88bcd4a3d53a87a53f8dc85d9a5a2df4 Mon Sep 17 00:00:00 2001
From: bananaappletw
Date: Wed, 4 Jan 2017 14:27:38 +0800
Subject: Revert "Rename npm script"
This reverts commit ed83dfc862768572eab0c2aed629b1700ac9e224.
---
README.md | 2 +-
bin/heroku | 2 +-
package.json | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index a2980ee4..cc05872d 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ Get started
2. Enter the directory and type `bin/setup`, which will install npm dependencies and create configs. The setup script is written in Bash, you would need bash as a prerequisite.
3. Setup the configs, see more below
4. Setup environment variables which will overwrite the configs
-5. Build front-end bundle by `npm run build:prod` (use `npm run build:dev` if you are in development)
+5. Build front-end bundle by `npm run build` (use `npm run dev` if you are in development)
6. Run the server as you like (node, forever, pm2)
Upgrade guide
diff --git a/bin/heroku b/bin/heroku
index 6ee7fa41..e8010038 100755
--- a/bin/heroku
+++ b/bin/heroku
@@ -31,5 +31,5 @@ EOF
cp public/js/config.js.example public/js/config.js
# build app
- npm run build:prod
+ npm run build
fi
diff --git a/package.json b/package.json
index edf03649..dde6328b 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
"main": "app.js",
"license": "MIT",
"scripts": {
- "build:dev": "webpack --config webpack.config.js --progress --colors --watch",
- "build:prod": "webpack --config webpack.production.js --progress --colors",
+ "dev": "webpack --config webpack.config.js --progress --colors --watch",
+ "build": "webpack --config webpack.production.js --progress --colors",
"postinstall": "bin/heroku",
"start": "node app.js"
},
--
cgit v1.2.3
From 781f495f3e04b863be58226b5af8e6ab94d9355a Mon Sep 17 00:00:00 2001
From: Yukai Huang
Date: Wed, 4 Jan 2017 23:01:44 +0800
Subject: Convert synscroll to es6
---
public/js/index.js | 12 ++--
public/js/syncscroll.js | 169 ++++++++++++++++++++++--------------------------
2 files changed, 85 insertions(+), 96 deletions(-)
diff --git a/public/js/index.js b/public/js/index.js
index 8921eda3..46dfffd9 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -51,11 +51,12 @@ var parseMeta = extra.parseMeta;
var exportToHTML = extra.exportToHTML;
var exportToRawHTML = extra.exportToRawHTML;
-var syncScroll = require('./syncscroll');
-var setupSyncAreas = syncScroll.setupSyncAreas;
-var clearMap = syncScroll.clearMap;
-var syncScrollToEdit = syncScroll.syncScrollToEdit;
-var syncScrollToView = syncScroll.syncScrollToView;
+import {
+ clearMap,
+ setupSyncAreas,
+ syncScrollToEdit,
+ syncScrollToView
+} from './syncscroll';
var historyModule = require('./history');
var writeHistory = historyModule.writeHistory;
@@ -3693,6 +3694,7 @@ function checkCursorMenuInner() {
var offsetLeft = 0;
var offsetTop = defaultTextHeight;
// set up side down
+ window.upSideDown = false;
var lastUpSideDown = upSideDown = false;
// only do when have width and height
if (width > 0 && height > 0) {
diff --git a/public/js/syncscroll.js b/public/js/syncscroll.js
index 47d0e1c4..c9693176 100644
--- a/public/js/syncscroll.js
+++ b/public/js/syncscroll.js
@@ -1,12 +1,13 @@
// Inject line numbers for sync scroll.
-var extra = require('./extra');
-var md = extra.md;
+import markdownitContainer from 'markdown-it-container';
+
+import { md } from './extra';
function addPart(tokens, idx) {
if (tokens[idx].map && tokens[idx].level === 0) {
- var startline = tokens[idx].map[0] + 1;
- var endline = tokens[idx].map[1];
+ const startline = tokens[idx].map[0] + 1;
+ const endline = tokens[idx].map[1];
tokens[idx].attrJoin('class', 'part');
tokens[idx].attrJoin('data-startline', startline);
tokens[idx].attrJoin('data-endline', endline);
@@ -16,48 +17,48 @@ function addPart(tokens, idx) {
md.renderer.rules.blockquote_open = function (tokens, idx, options, env, self) {
tokens[idx].attrJoin('class', 'raw');
addPart(tokens, idx);
- return self.renderToken.apply(self, arguments);
+ return self.renderToken(...arguments);
};
md.renderer.rules.table_open = function (tokens, idx, options, env, self) {
addPart(tokens, idx);
- return self.renderToken.apply(self, arguments);
+ return self.renderToken(...arguments);
};
md.renderer.rules.bullet_list_open = function (tokens, idx, options, env, self) {
addPart(tokens, idx);
- return self.renderToken.apply(self, arguments);
+ return self.renderToken(...arguments);
};
md.renderer.rules.list_item_open = function (tokens, idx, options, env, self) {
tokens[idx].attrJoin('class', 'raw');
if (tokens[idx].map) {
- var startline = tokens[idx].map[0] + 1;
- var endline = tokens[idx].map[1];
+ const startline = tokens[idx].map[0] + 1;
+ const endline = tokens[idx].map[1];
tokens[idx].attrJoin('data-startline', startline);
tokens[idx].attrJoin('data-endline', endline);
}
- return self.renderToken.apply(self, arguments);
+ return self.renderToken(...arguments);
};
md.renderer.rules.ordered_list_open = function (tokens, idx, options, env, self) {
addPart(tokens, idx);
- return self.renderToken.apply(self, arguments);
+ return self.renderToken(...arguments);
};
md.renderer.rules.link_open = function (tokens, idx, options, env, self) {
addPart(tokens, idx);
- return self.renderToken.apply(self, arguments);
+ return self.renderToken(...arguments);
};
md.renderer.rules.paragraph_open = function (tokens, idx, options, env, self) {
addPart(tokens, idx);
- return self.renderToken.apply(self, arguments);
+ return self.renderToken(...arguments);
};
md.renderer.rules.heading_open = function (tokens, idx, options, env, self) {
tokens[idx].attrJoin('class', 'raw');
addPart(tokens, idx);
- return self.renderToken.apply(self, arguments);
+ return self.renderToken(...arguments);
};
-md.renderer.rules.fence = function (tokens, idx, options, env, self) {
- var token = tokens[idx],
- info = token.info ? md.utils.unescapeAll(token.info).trim() : '',
- langName = '',
- highlighted;
+md.renderer.rules.fence = (tokens, idx, options, env, self) => {
+ const token = tokens[idx];
+ const info = token.info ? md.utils.unescapeAll(token.info).trim() : '';
+ let langName = '';
+ let highlighted;
if (info) {
langName = info.split(/\s+/g)[0];
@@ -74,38 +75,33 @@ md.renderer.rules.fence = function (tokens, idx, options, env, self) {
}
if (highlighted.indexOf('
'
- + highlighted
- + '\n';
+ const startline = tokens[idx].map[0] + 1;
+ const endline = tokens[idx].map[1];
+ return `${highlighted}
\n`;
}
- return ''
- + highlighted
- + '
\n';
+ return `${highlighted}
\n`;
};
-md.renderer.rules.code_block = function (tokens, idx, options, env, self) {
+md.renderer.rules.code_block = (tokens, idx, options, env, self) => {
if (tokens[idx].map && tokens[idx].level === 0) {
- var startline = tokens[idx].map[0] + 1;
- var endline = tokens[idx].map[1];
- return '' + md.utils.escapeHtml(tokens[idx].content) + '
\n';
+ const startline = tokens[idx].map[0] + 1;
+ const endline = tokens[idx].map[1];
+ return `${md.utils.escapeHtml(tokens[idx].content)}
\n`;
}
- return '' + md.utils.escapeHtml(tokens[idx].content) + '
\n';
+ return `${md.utils.escapeHtml(tokens[idx].content)}
\n`;
};
function renderContainer(tokens, idx, options, env, self) {
tokens[idx].attrJoin('role', 'alert');
tokens[idx].attrJoin('class', 'alert');
- tokens[idx].attrJoin('class', 'alert-' + tokens[idx].info.trim());
+ tokens[idx].attrJoin('class', `alert-${tokens[idx].info.trim()}`);
addPart(tokens, idx);
- return self.renderToken.apply(self, arguments);
+ return self.renderToken(...arguments);
}
-var markdownitContainer = require('markdown-it-container');
md.use(markdownitContainer, 'success', { render: renderContainer });
md.use(markdownitContainer, 'info', { render: renderContainer });
md.use(markdownitContainer, 'warning', { render: renderContainer });
@@ -117,18 +113,18 @@ window.syncscroll = true;
window.preventSyncScrollToEdit = false;
window.preventSyncScrollToView = false;
-var editScrollThrottle = 5;
-var viewScrollThrottle = 5;
-var buildMapThrottle = 100;
+const editScrollThrottle = 5;
+const viewScrollThrottle = 5;
+const buildMapThrottle = 100;
-var viewScrolling = false;
-var editScrolling = false;
+let viewScrolling = false;
+let editScrolling = false;
-var editArea = null;
-var viewArea = null;
-var markdownArea = null;
+let editArea = null;
+let viewArea = null;
+let markdownArea = null;
-function setupSyncAreas(edit, view, markdown) {
+export function setupSyncAreas(edit, view, markdown) {
editArea = edit;
viewArea = view;
markdownArea = markdown;
@@ -136,26 +132,24 @@ function setupSyncAreas(edit, view, markdown) {
viewArea.on('scroll', _.throttle(syncScrollToEdit, viewScrollThrottle));
}
-var scrollMap, lineHeightMap, viewTop, viewBottom;
-
-window.viewAjaxCallback = clearMap;
+let scrollMap, lineHeightMap, viewTop, viewBottom;
-function clearMap() {
+export function clearMap() {
scrollMap = null;
lineHeightMap = null;
viewTop = null;
viewBottom = null;
}
+window.viewAjaxCallback = clearMap;
-var buildMap = _.throttle(buildMapInner, buildMapThrottle);
+const buildMap = _.throttle(buildMapInner, buildMapThrottle);
// Build offsets for each line (lines can be wrapped)
// That's a bit dirty to process each line everytime, but ok for demo.
// Optimizations are required only for big texts.
function buildMapInner(callback) {
if (!viewArea || !markdownArea) return;
- var i, offset, nonEmptyList, pos, a, b, _lineHeightMap, linesCount,
- acc, _scrollMap;
+ let i, offset, nonEmptyList, pos, a, b, _lineHeightMap, linesCount, acc, _scrollMap;
offset = viewArea.scrollTop() - viewArea.offset().top;
_scrollMap = [];
@@ -165,10 +159,10 @@ function buildMapInner(callback) {
viewBottom = viewArea[0].scrollHeight - viewArea.height();
acc = 0;
- var lines = editor.getValue().split('\n');
- var lineHeight = editor.defaultTextHeight();
+ const lines = editor.getValue().split('\n');
+ const lineHeight = editor.defaultTextHeight();
for (i = 0; i < lines.length; i++) {
- var str = lines[i];
+ const str = lines[i];
_lineHeightMap.push(acc);
@@ -177,7 +171,7 @@ function buildMapInner(callback) {
continue;
}
- var h = editor.heightAtLine(i + 1) - editor.heightAtLine(i);
+ const h = editor.heightAtLine(i + 1) - editor.heightAtLine(i);
acc += Math.round(h / lineHeight);
}
_lineHeightMap.push(acc);
@@ -191,10 +185,10 @@ function buildMapInner(callback) {
// make the first line go top
_scrollMap[0] = viewTop;
- var parts = markdownArea.find('.part').toArray();
+ const parts = markdownArea.find('.part').toArray();
for (i = 0; i < parts.length; i++) {
- var $el = $(parts[i]),
- t = $el.attr('data-startline') - 1;
+ const $el = $(parts[i]);
+ let t = $el.attr('data-startline') - 1;
if (t === '') {
return;
}
@@ -229,9 +223,9 @@ function buildMapInner(callback) {
}
// sync view scroll progress to edit
-var viewScrollingTimer = null;
+let viewScrollingTimer = null;
-function syncScrollToEdit(event, preventAnimate) {
+export function syncScrollToEdit(event, preventAnimate) {
if (currentMode != modeType.both || !syncscroll || !editArea) return;
if (preventSyncScrollToEdit) {
if (typeof preventSyncScrollToEdit === 'number') {
@@ -242,15 +236,15 @@ function syncScrollToEdit(event, preventAnimate) {
return;
}
if (!scrollMap || !lineHeightMap) {
- buildMap(function () {
+ buildMap(() => {
syncScrollToEdit(event, preventAnimate);
});
return;
}
if (editScrolling) return;
- var scrollTop = viewArea[0].scrollTop;
- var lineIndex = 0;
+ const scrollTop = viewArea[0].scrollTop;
+ let lineIndex = 0;
for (var i = 0, l = scrollMap.length; i < l; i++) {
if (scrollMap[i] > scrollTop) {
break;
@@ -258,8 +252,8 @@ function syncScrollToEdit(event, preventAnimate) {
lineIndex = i;
}
}
- var lineNo = 0;
- var lineDiff = 0;
+ let lineNo = 0;
+ let lineDiff = 0;
for (var i = 0, l = lineHeightMap.length; i < l; i++) {
if (lineHeightMap[i] > lineIndex) {
break;
@@ -269,14 +263,14 @@ function syncScrollToEdit(event, preventAnimate) {
}
}
- var posTo = 0;
- var topDiffPercent = 0;
- var posToNextDiff = 0;
- var scrollInfo = editor.getScrollInfo();
- var textHeight = editor.defaultTextHeight();
- var preLastLineHeight = scrollInfo.height - scrollInfo.clientHeight - textHeight;
- var preLastLineNo = Math.round(preLastLineHeight / textHeight);
- var preLastLinePos = scrollMap[preLastLineNo];
+ let posTo = 0;
+ let topDiffPercent = 0;
+ let posToNextDiff = 0;
+ const scrollInfo = editor.getScrollInfo();
+ const textHeight = editor.defaultTextHeight();
+ const preLastLineHeight = scrollInfo.height - scrollInfo.clientHeight - textHeight;
+ const preLastLineNo = Math.round(preLastLineHeight / textHeight);
+ const preLastLinePos = scrollMap[preLastLineNo];
if (scrollInfo.height > scrollInfo.clientHeight && scrollTop >= preLastLinePos) {
posTo = preLastLineHeight;
@@ -293,7 +287,7 @@ function syncScrollToEdit(event, preventAnimate) {
if (preventAnimate) {
editArea.scrollTop(posTo);
} else {
- var posDiff = Math.abs(scrollInfo.top - posTo);
+ const posDiff = Math.abs(scrollInfo.top - posTo);
var duration = posDiff / 50;
duration = duration >= 100 ? duration : 100;
editArea.stop(true, true).animate({
@@ -311,9 +305,9 @@ function viewScrollingTimeoutInner() {
}
// sync edit scroll progress to view
-var editScrollingTimer = null;
+let editScrollingTimer = null;
-function syncScrollToView(event, preventAnimate) {
+export function syncScrollToView(event, preventAnimate) {
if (currentMode != modeType.both || !syncscroll || !viewArea) return;
if (preventSyncScrollToView) {
if (typeof preventSyncScrollToView === 'number') {
@@ -324,20 +318,20 @@ function syncScrollToView(event, preventAnimate) {
return;
}
if (!scrollMap || !lineHeightMap) {
- buildMap(function () {
+ buildMap(() => {
syncScrollToView(event, preventAnimate);
});
return;
}
if (viewScrolling) return;
- var lineNo, posTo;
- var topDiffPercent, posToNextDiff;
- var scrollInfo = editor.getScrollInfo();
- var textHeight = editor.defaultTextHeight();
+ let lineNo, posTo;
+ let topDiffPercent, posToNextDiff;
+ const scrollInfo = editor.getScrollInfo();
+ const textHeight = editor.defaultTextHeight();
lineNo = Math.floor(scrollInfo.top / textHeight);
// if reach the last line, will start lerp to the bottom
- var diffToBottom = (scrollInfo.top + scrollInfo.clientHeight) - (scrollInfo.height - textHeight);
+ const diffToBottom = (scrollInfo.top + scrollInfo.clientHeight) - (scrollInfo.height - textHeight);
if (scrollInfo.height > scrollInfo.clientHeight && diffToBottom > 0) {
topDiffPercent = diffToBottom / textHeight;
posTo = scrollMap[lineNo + 1];
@@ -353,7 +347,7 @@ function syncScrollToView(event, preventAnimate) {
if (preventAnimate) {
viewArea.scrollTop(posTo);
} else {
- var posDiff = Math.abs(viewArea.scrollTop() - posTo);
+ const posDiff = Math.abs(viewArea.scrollTop() - posTo);
var duration = posDiff / 50;
duration = duration >= 100 ? duration : 100;
viewArea.stop(true, true).animate({
@@ -369,10 +363,3 @@ function syncScrollToView(event, preventAnimate) {
function editScrollingTimeoutInner() {
editScrolling = false;
}
-
-module.exports = {
- setupSyncAreas: setupSyncAreas,
- clearMap: clearMap,
- syncScrollToEdit: syncScrollToEdit,
- syncScrollToView: syncScrollToView
-};
--
cgit v1.2.3
From eb5e7ba0d10cf559d73335102513b4c5783e239b Mon Sep 17 00:00:00 2001
From: Yukai Huang
Date: Thu, 5 Jan 2017 16:17:28 +0800
Subject: Convert slide.js to es6
---
public/js/slide.js | 64 ++++++++++++++++++++++++++----------------------------
1 file changed, 31 insertions(+), 33 deletions(-)
diff --git a/public/js/slide.js b/public/js/slide.js
index 1ff388a5..63cf64c6 100644
--- a/public/js/slide.js
+++ b/public/js/slide.js
@@ -1,67 +1,65 @@
require('../css/extra.css');
require('../css/site.css');
-var extraModule = require('./extra');
-var md = extraModule.md;
-var updateLastChange = extraModule.updateLastChange;
-var finishView = extraModule.finishView;
+import { md, updateLastChange, finishView } from './extra';
-var preventXSS = require('./render').preventXSS;
+import { preventXSS } from './render';
-var body = $(".slides").text();
+const body = $(".slides").text();
createtime = lastchangeui.time.attr('data-createtime');
lastchangetime = lastchangeui.time.attr('data-updatetime');
updateLastChange();
-var url = window.location.pathname;
-$('.ui-edit').attr('href', url + '/edit');
+const url = window.location.pathname;
+$('.ui-edit').attr('href', `${url}/edit`);
-$(document).ready(function () {
+$(document).ready(() => {
//tooltip
$('[data-toggle="tooltip"]').tooltip();
});
function extend() {
- var target = {};
- for (var i = 0; i < arguments.length; i++) {
- var source = arguments[i];
- for (var key in source) {
+ const target = {};
+
+ for (const source of arguments) {
+ for (const key in source) {
if (source.hasOwnProperty(key)) {
target[key] = source[key];
}
}
}
+
return target;
}
// Optional libraries used to extend on reveal.js
-var deps = [{
- src: serverurl + '/build/reveal.js/lib/js/classList.js',
- condition: function() {
+const deps = [{
+ src: `${serverurl}/build/reveal.js/lib/js/classList.js`,
+ condition() {
return !document.body.classList;
}
}, {
- src: serverurl + '/js/reveal-markdown.js',
- callback: function () {
- var slideOptions = {
+ src: `${serverurl}/js/reveal-markdown.js`,
+ callback() {
+ const slideOptions = {
separator: '^(\r\n?|\n)---(\r\n?|\n)$',
verticalSeparator: '^(\r\n?|\n)----(\r\n?|\n)$'
};
- var slides = RevealMarkdown.slidify(body, slideOptions);
+ const slides = RevealMarkdown.slidify(body, slideOptions);
$(".slides").html(slides);
RevealMarkdown.initialize();
$(".slides").show();
}
}, {
- src: serverurl + '/build/reveal.js/plugin/notes/notes.js',
+ src: `${serverurl}/build/reveal.js/plugin/notes/notes.js`,
async: true,
- condition: function() {
+ condition() {
return !!document.body.classList;
}
}];
// default options to init reveal.js
-var defaultOptions = {
+const defaultOptions = {
controls: true,
progress: true,
slideNumber: true,
@@ -72,10 +70,10 @@ var defaultOptions = {
};
// options from yaml meta
-var meta = JSON.parse($("#meta").text());
+const meta = JSON.parse($("#meta").text());
var options = meta.slideOptions || {};
-var view = $('.reveal');
+const view = $('.reveal');
//text language
if (meta.lang && typeof meta.lang == "string") {
@@ -97,24 +95,24 @@ if (typeof meta.breaks === 'boolean' && !meta.breaks) {
}
// options from URL query string
-var queryOptions = Reveal.getQueryHash() || {};
+const queryOptions = Reveal.getQueryHash() || {};
var options = extend(defaultOptions, options, queryOptions);
Reveal.initialize(options);
-window.viewAjaxCallback = function () {
+window.viewAjaxCallback = () => {
Reveal.layout();
};
function renderSlide(event) {
if (window.location.search.match( /print-pdf/gi )) {
- var slides = $('.slides');
+ const slides = $('.slides');
var title = document.title;
finishView(slides);
document.title = title;
Reveal.layout();
} else {
- var markdown = $(event.currentSlide);
+ const markdown = $(event.currentSlide);
if (!markdown.attr('data-rendered')) {
var title = document.title;
finishView(markdown);
@@ -125,16 +123,16 @@ function renderSlide(event) {
}
}
-Reveal.addEventListener('ready', function (event) {
+Reveal.addEventListener('ready', event => {
renderSlide(event);
- var markdown = $(event.currentSlide);
+ const markdown = $(event.currentSlide);
// force browser redraw
- setTimeout(function () {
+ setTimeout(() => {
markdown.hide().show(0);
}, 0);
});
Reveal.addEventListener('slidechanged', renderSlide);
-var isMacLike = navigator.platform.match(/(Mac|iPhone|iPod|iPad)/i) ? true : false;
+const isMacLike = navigator.platform.match(/(Mac|iPhone|iPod|iPad)/i) ? true : false;
if (!isMacLike) $('.container').addClass('hidescrollbar');
--
cgit v1.2.3
From 45c202172ed293564925d10782ea65d415cb513c Mon Sep 17 00:00:00 2001
From: Yukai Huang
Date: Thu, 5 Jan 2017 16:19:13 +0800
Subject: Convert pretty.js to es6
---
public/js/pretty.js | 87 ++++++++++++++++++++++++++---------------------------
1 file changed, 43 insertions(+), 44 deletions(-)
diff --git a/public/js/pretty.js b/public/js/pretty.js
index c1a471a1..64d41c43 100644
--- a/public/js/pretty.js
+++ b/public/js/pretty.js
@@ -4,31 +4,33 @@ require('../css/site.css');
require('highlight.js/styles/github-gist.css');
-var extra = require('./extra');
-var md = extra.md;
-var finishView = extra.finishView;
-var autoLinkify = extra.autoLinkify;
-var deduplicatedHeaderId = extra.deduplicatedHeaderId;
-var renderTOC = extra.renderTOC;
-var generateToc = extra.generateToc;
-var smoothHashScroll = extra.smoothHashScroll;
-var postProcess = extra.postProcess;
-var updateLastChange = extra.updateLastChange;
-var parseMeta = extra.parseMeta;
-var scrollToHash = extra.scrollToHash;
-var preventXSS = require('./render').preventXSS;
+import {
+ autoLinkify,
+ deduplicatedHeaderId,
+ finishView,
+ generateToc,
+ md,
+ parseMeta,
+ postProcess,
+ renderTOC,
+ scrollToHash,
+ smoothHashScroll,
+ updateLastChange
+} from './extra';
-var markdown = $("#doc.markdown-body");
-var text = markdown.text();
-var lastMeta = md.meta;
+import { preventXSS } from './render';
+
+const markdown = $("#doc.markdown-body");
+const text = markdown.text();
+const lastMeta = md.meta;
md.meta = {};
-var rendered = md.render(text);
+let rendered = md.render(text);
if (md.meta.type && md.meta.type === 'slide') {
- var slideOptions = {
+ const slideOptions = {
separator: '^(\r\n?|\n)---(\r\n?|\n)$',
verticalSeparator: '^(\r\n?|\n)----(\r\n?|\n)$'
};
- var slides = RevealMarkdown.slidify(text, slideOptions);
+ const slides = RevealMarkdown.slidify(text, slideOptions);
markdown.html(slides);
RevealMarkdown.initialize();
// prevent XSS
@@ -46,10 +48,11 @@ if (md.meta.type && md.meta.type === 'slide') {
}
// prevent XSS
rendered = preventXSS(rendered);
- var result = postProcess(rendered);
+ const result = postProcess(rendered);
markdown.html(result.html());
}
$(document.body).show();
+
finishView(markdown);
autoLinkify(markdown);
deduplicatedHeaderId(markdown);
@@ -60,17 +63,18 @@ smoothHashScroll();
createtime = lastchangeui.time.attr('data-createtime');
lastchangetime = lastchangeui.time.attr('data-updatetime');
updateLastChange();
-var url = window.location.pathname;
-$('.ui-edit').attr('href', url + '/edit');
-var toc = $('.ui-toc');
-var tocAffix = $('.ui-affix-toc');
-var tocDropdown = $('.ui-toc-dropdown');
+
+const url = window.location.pathname;
+$('.ui-edit').attr('href', `${url}/edit`);
+const toc = $('.ui-toc');
+const tocAffix = $('.ui-affix-toc');
+const tocDropdown = $('.ui-toc-dropdown');
//toc
-tocDropdown.click(function (e) {
+tocDropdown.click(e => {
e.stopPropagation();
});
-var enoughForAffixToc = true;
+let enoughForAffixToc = true;
function generateScrollspy() {
$(document.body).scrollspy({
@@ -89,18 +93,18 @@ function generateScrollspy() {
function windowResize() {
//toc right
- var paddingRight = parseFloat(markdown.css('padding-right'));
- var right = ($(window).width() - (markdown.offset().left + markdown.outerWidth() - paddingRight));
- toc.css('right', right + 'px');
+ const paddingRight = parseFloat(markdown.css('padding-right'));
+ const right = ($(window).width() - (markdown.offset().left + markdown.outerWidth() - paddingRight));
+ toc.css('right', `${right}px`);
//affix toc left
- var newbool;
- var rightMargin = (markdown.parent().outerWidth() - markdown.outerWidth()) / 2;
+ let newbool;
+ const rightMargin = (markdown.parent().outerWidth() - markdown.outerWidth()) / 2;
//for ipad or wider device
if (rightMargin >= 133) {
newbool = true;
- var affixLeftMargin = (tocAffix.outerWidth() - tocAffix.width()) / 2;
- var left = markdown.offset().left + markdown.outerWidth() - affixLeftMargin;
- tocAffix.css('left', left + 'px');
+ const affixLeftMargin = (tocAffix.outerWidth() - tocAffix.width()) / 2;
+ const left = markdown.offset().left + markdown.outerWidth() - affixLeftMargin;
+ tocAffix.css('left', `${left}px`);
} else {
newbool = false;
}
@@ -109,10 +113,10 @@ function windowResize() {
generateScrollspy();
}
}
-$(window).resize(function () {
+$(window).resize(() => {
windowResize();
});
-$(document).ready(function () {
+$(document).ready(() => {
windowResize();
generateScrollspy();
setTimeout(scrollToHash, 0);
@@ -120,13 +124,13 @@ $(document).ready(function () {
$('[data-toggle="tooltip"]').tooltip();
});
-function scrollToTop() {
+export function scrollToTop() {
$('body, html').stop(true, true).animate({
scrollTop: 0
}, 100, "linear");
}
-function scrollToBottom() {
+export function scrollToBottom() {
$('body, html').stop(true, true).animate({
scrollTop: $(document.body)[0].scrollHeight
}, 100, "linear");
@@ -134,8 +138,3 @@ function scrollToBottom() {
window.scrollToTop = scrollToTop;
window.scrollToBottom = scrollToBottom;
-
-module.exports = {
- scrollToBottom: scrollToBottom,
- scrollToTop: scrollToTop
-}
--
cgit v1.2.3
From 6a06c0bb9fea6d499d7fd2f7e6a65e16099cfb05 Mon Sep 17 00:00:00 2001
From: Yukai Huang
Date: Thu, 5 Jan 2017 16:48:23 +0800
Subject: Convert common.js to es6
---
public/js/common.js | 107 +++++++++++++++++++++++++---------------------------
public/js/index.js | 28 +++++++-------
2 files changed, 65 insertions(+), 70 deletions(-)
diff --git a/public/js/common.js b/public/js/common.js
index f5bfc8ec..6d54b450 100644
--- a/public/js/common.js
+++ b/public/js/common.js
@@ -1,30 +1,37 @@
-var config = require('./config');
-var domain = config.domain; // domain name
-var urlpath = config.urlpath; // sub url path, like: www.example.com/
-var debug = config.debug;
-var GOOGLE_API_KEY = config.GOOGLE_API_KEY;
-var GOOGLE_CLIENT_ID = config.GOOGLE_CLIENT_ID;
-var DROPBOX_APP_KEY = config.DROPBOX_APP_KEY;
+// import config from './config';
+
+import {
+ domain, // domain name
+ urlpath, // sub url path, like: www.example.com/
+ debug,
+ GOOGLE_API_KEY,
+ GOOGLE_CLIENT_ID,
+ DROPBOX_APP_KEY
+} from './config';
//common
-var port = window.location.port;
-window.serverurl = window.location.protocol + '//' + (domain ? domain : window.location.hostname) + (port ? ':' + port : '') + (urlpath ? '/' + urlpath : '');
-var noteid = urlpath ? window.location.pathname.slice(urlpath.length + 1, window.location.pathname.length).split('/')[1] : window.location.pathname.split('/')[1];
-var noteurl = serverurl + '/' + noteid;
+export const port = window.location.port;
+window.serverurl = `${window.location.protocol}//${domain ? domain : window.location.hostname}${port ? ':' + port : ''}${urlpath ? '/' + urlpath : ''}`;
+export const noteid = urlpath ? window.location.pathname.slice(urlpath.length + 1, window.location.pathname.length).split('/')[1] : window.location.pathname.split('/')[1];
+export const noteurl = `${serverurl}/${noteid}`;
+
+export const version = '0.5.0';
-var version = '0.5.0';
+let checkAuth = false;
+let profile = null;
+let lastLoginState = getLoginState();
+let lastUserId = getUserId();
+let loginStateChangeEvent = null;
-var checkAuth = false;
-var profile = null;
-var lastLoginState = getLoginState();
-var lastUserId = getUserId();
-var loginStateChangeEvent = null;
+export function setloginStateChangeEvent(func) {
+ loginStateChangeEvent = func;
+}
-function resetCheckAuth() {
+export function resetCheckAuth() {
checkAuth = false;
}
-function setLoginState(bool, id) {
+export function setLoginState(bool, id) {
Cookies.set('loginstate', bool, {
expires: 365
});
@@ -40,36 +47,37 @@ function setLoginState(bool, id) {
checkLoginStateChanged();
}
-function checkLoginStateChanged() {
+export function checkLoginStateChanged() {
if (getLoginState() != lastLoginState || getUserId() != lastUserId) {
- if(loginStateChangeEvent)
+ if(loginStateChangeEvent) {
loginStateChangeEvent();
+ }
return true;
} else {
return false;
}
}
-function getLoginState() {
- var state = Cookies.get('loginstate');
+export function getLoginState() {
+ const state = Cookies.get('loginstate');
return state === "true" || state === true;
}
-function getUserId() {
+export function getUserId() {
return Cookies.get('userid');
}
-function clearLoginState() {
+export function clearLoginState() {
Cookies.remove('loginstate');
}
-function checkIfAuth(yesCallback, noCallback) {
- var cookieLoginState = getLoginState();
+export function checkIfAuth(yesCallback, noCallback) {
+ const cookieLoginState = getLoginState();
if (checkLoginStateChanged())
checkAuth = false;
if (!checkAuth || typeof cookieLoginState == 'undefined') {
- $.get(serverurl + '/me')
- .done(function (data) {
+ $.get(`${serverurl}/me`)
+ .done(data => {
if (data && data.status == 'ok') {
profile = data;
yesCallback(profile);
@@ -79,10 +87,10 @@ function checkIfAuth(yesCallback, noCallback) {
setLoginState(false);
}
})
- .fail(function () {
+ .fail(() => {
noCallback();
})
- .always(function () {
+ .always(() => {
checkAuth = true;
});
} else if (cookieLoginState) {
@@ -92,29 +100,16 @@ function checkIfAuth(yesCallback, noCallback) {
}
}
-module.exports = {
- domain: domain,
- urlpath: urlpath,
- debug: debug,
- GOOGLE_API_KEY: GOOGLE_API_KEY,
- GOOGLE_CLIENT_ID: GOOGLE_CLIENT_ID,
- DROPBOX_APP_KEY: DROPBOX_APP_KEY,
- port: port,
- noteid: noteid,
- noteurl: noteurl,
- version: version,
- checkAuth: checkAuth,
- profile: profile,
- lastLoginState: lastLoginState,
- lastUserId: lastUserId,
- loginStateChangeEvent: loginStateChangeEvent,
-
- /* export functions */
- resetCheckAuth: resetCheckAuth,
- setLoginState: setLoginState,
- checkLoginStateChanged: checkLoginStateChanged,
- getLoginState: getLoginState,
- getUserId: getUserId,
- clearLoginState: clearLoginState,
- checkIfAuth: checkIfAuth
+export default {
+ domain,
+ urlpath,
+ debug,
+ GOOGLE_API_KEY,
+ GOOGLE_CLIENT_ID,
+ DROPBOX_APP_KEY,
+ checkAuth,
+ profile,
+ lastLoginState,
+ lastUserId,
+ loginStateChangeEvent
};
diff --git a/public/js/index.js b/public/js/index.js
index 46dfffd9..381f051e 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -17,18 +17,18 @@ var _ = require("lodash");
var List = require('list.js');
-var common = require('./common.js');
-var urlpath = common.urlpath;
-var noteid = common.noteid;
-var debug = common.debug;
-var version = common.version;
-var GOOGLE_API_KEY = common.GOOGLE_API_KEY;
-var GOOGLE_CLIENT_ID = common.GOOGLE_CLIENT_ID;
-var DROPBOX_APP_KEY = common.DROPBOX_APP_KEY;
-var noteurl = common.noteurl;
-
-var checkLoginStateChanged = common.checkLoginStateChanged;
-var loginStateChangeEvent = common.loginStateChangeEvent;
+import {
+ checkLoginStateChanged,
+ setloginStateChangeEvent,
+ debug,
+ DROPBOX_APP_KEY,
+ GOOGLE_API_KEY,
+ GOOGLE_CLIENT_ID,
+ noteid,
+ noteurl,
+ urlpath,
+ version
+} from './common';
var extra = require('./extra');
var md = extra.md;
@@ -963,10 +963,10 @@ function setNeedRefresh() {
showStatus(statusType.offline);
}
-loginStateChangeEvent = function () {
+setloginStateChangeEvent(function () {
setRefreshModal('user-state-changed');
setNeedRefresh();
-};
+});
//visibility
var wasFocus = false;
--
cgit v1.2.3
From 47d7ff25617ba60790dd2018df56778eaa9bffdb Mon Sep 17 00:00:00 2001
From: Yukai Huang
Date: Thu, 5 Jan 2017 17:52:32 +0800
Subject: Convert extra.js to es6
---
public/js/extra.js | 637 +++++++++++++++++++++++++----------------------------
public/js/index.js | 41 ++--
2 files changed, 326 insertions(+), 352 deletions(-)
diff --git a/public/js/extra.js b/public/js/extra.js
index ba61a669..f1681b2e 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -1,15 +1,17 @@
require('prismjs/themes/prism.css');
-
-var Prism = require('prismjs');
require('prismjs/components/prism-wiki');
require('prismjs/components/prism-haskell');
require('prismjs/components/prism-go');
require('prismjs/components/prism-typescript');
require('prismjs/components/prism-jsx');
-var hljs = require('highlight.js');
-var PDFObject = require('pdfobject');
-var S = require('string');
-var saveAs = require('file-saver').saveAs;
+
+import Prism from 'prismjs';
+import hljs from 'highlight.js';
+import PDFObject from 'pdfobject';
+import S from 'string';
+import { saveAs } from 'file-saver';
+
+require('./common');
require('../vendor/md-toc');
//auto update last change
@@ -21,9 +23,10 @@ window.lastchangeui = {
user: $(".ui-lastchangeuser"),
nouser: $(".ui-no-lastchangeuser")
}
-var ownerui = $(".ui-owner");
-function updateLastChange() {
+const ownerui = $(".ui-owner");
+
+export function updateLastChange() {
if (!lastchangeui) return;
if (createtime) {
if (createtime && !lastchangetime) {
@@ -31,7 +34,7 @@ function updateLastChange() {
} else {
lastchangeui.status.text('changed');
}
- var time = lastchangetime || createtime;
+ const time = lastchangetime || createtime;
lastchangeui.time.html(moment(time).fromNow());
lastchangeui.time.attr('title', moment(time).format('llll'));
}
@@ -40,13 +43,14 @@ setInterval(updateLastChange, 60000);
window.lastchangeuser = null;
window.lastchangeuserprofile = null;
-function updateLastChangeUser() {
+
+export function updateLastChangeUser() {
if (lastchangeui) {
if (lastchangeuser && lastchangeuserprofile) {
- var icon = lastchangeui.user.children('i');
+ const icon = lastchangeui.user.children('i');
icon.attr('title', lastchangeuserprofile.name).tooltip('fixTitle');
if (lastchangeuserprofile.photo)
- icon.attr('style', 'background-image:url(' + lastchangeuserprofile.photo + ')');
+ icon.attr('style', `background-image:url(${lastchangeuserprofile.photo})`);
lastchangeui.user.show();
lastchangeui.nouser.hide();
} else {
@@ -58,12 +62,13 @@ function updateLastChangeUser() {
window.owner = null;
window.ownerprofile = null;
-function updateOwner() {
+
+export function updateOwner() {
if (ownerui) {
if (owner && ownerprofile && owner !== lastchangeuser) {
- var icon = ownerui.children('i');
+ const icon = ownerui.children('i');
icon.attr('title', ownerprofile.name).tooltip('fixTitle');
- var styleString = 'background-image:url(' + ownerprofile.photo + ')';
+ const styleString = `background-image:url(${ownerprofile.photo})`;
if (ownerprofile.photo && icon.attr('style') !== styleString)
icon.attr('style', styleString);
ownerui.show();
@@ -75,11 +80,11 @@ function updateOwner() {
//get title
function getTitle(view) {
- var title = "";
+ let title = "";
if (md && md.meta && md.meta.title && (typeof md.meta.title == "string" || typeof md.meta.title == "number")) {
title = md.meta.title;
} else {
- var h1s = view.find("h1");
+ const h1s = view.find("h1");
if (h1s.length > 0) {
title = h1s.first().text();
} else {
@@ -90,8 +95,8 @@ function getTitle(view) {
}
//render title
-function renderTitle(view) {
- var title = getTitle(view);
+export function renderTitle(view) {
+ let title = getTitle(view);
if (title) {
title += ' - HackMD';
} else {
@@ -101,8 +106,8 @@ function renderTitle(view) {
}
//render filename
-function renderFilename(view) {
- var filename = getTitle(view);
+export function renderFilename(view) {
+ let filename = getTitle(view);
if (!filename) {
filename = 'Untitled';
}
@@ -110,29 +115,29 @@ function renderFilename(view) {
}
// render tags
-function renderTags(view) {
- var tags = [];
- var rawtags = [];
+export function renderTags(view) {
+ const tags = [];
+ const rawtags = [];
if (md && md.meta && md.meta.tags && (typeof md.meta.tags == "string" || typeof md.meta.tags == "number")) {
- var metaTags = ('' + md.meta.tags).split(',');
+ const metaTags = (`${md.meta.tags}`).split(',');
for (var i = 0; i < metaTags.length; i++) {
- var text = metaTags[i].trim();
+ const text = metaTags[i].trim();
if (text) rawtags.push(text);
}
} else {
- view.find('h6').each(function (key, value) {
+ view.find('h6').each((key, value) => {
if (/^tags/gmi.test($(value).text())) {
- var codes = $(value).find("code");
- for (var i = 0; i < codes.length; i++) {
- var text = codes[i].innerHTML.trim();
+ const codes = $(value).find("code");
+ for (let i = 0; i < codes.length; i++) {
+ const text = codes[i].innerHTML.trim();
if (text) rawtags.push(text);
}
}
});
}
for (var i = 0; i < rawtags.length; i++) {
- var found = false;
- for (var j = 0; j < tags.length; j++) {
+ let found = false;
+ for (let j = 0; j < tags.length; j++) {
if (tags[j] == rawtags[i]) {
found = true;
break;
@@ -145,13 +150,13 @@ function renderTags(view) {
}
function slugifyWithUTF8(text) {
- var newText = S(text.toLowerCase()).trim().stripTags().dasherize().s;
+ let newText = S(text.toLowerCase()).trim().stripTags().dasherize().s;
newText = newText.replace(/([\!\"\#\$\%\&\'\(\)\*\+\,\.\/\:\;\<\=\>\?\@\[\\\]\^\`\{\|\}\~])/g, '');
return newText;
}
-function isValidURL(str) {
- var pattern = new RegExp('^(https?:\\/\\/)?' + // protocol
+export function isValidURL(str) {
+ const pattern = new RegExp('^(https?:\\/\\/)?' + // protocol
'((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
'((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
'(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
@@ -165,12 +170,12 @@ function isValidURL(str) {
}
//parse meta
-function parseMeta(md, edit, view, toc, tocAffix) {
- var lang = null;
- var dir = null;
- var breaks = true;
+export function parseMeta(md, edit, view, toc, tocAffix) {
+ let lang = null;
+ let dir = null;
+ let breaks = true;
if (md && md.meta) {
- var meta = md.meta;
+ const meta = md.meta;
lang = meta.lang;
dir = meta.dir;
breaks = meta.breaks;
@@ -210,13 +215,13 @@ function parseMeta(md, edit, view, toc, tocAffix) {
window.viewAjaxCallback = null;
//regex for extra tags
-var spaceregex = /\s*/;
-var notinhtmltagregex = /(?![^<]*>|[^<>]*<\/)/;
-var coloregex = /\[color=([#|\(|\)|\s|\,|\w]*?)\]/;
+const spaceregex = /\s*/;
+const notinhtmltagregex = /(?![^<]*>|[^<>]*<\/)/;
+let coloregex = /\[color=([#|\(|\)|\s|\,|\w]*?)\]/;
coloregex = new RegExp(coloregex.source + notinhtmltagregex.source, "g");
-var nameregex = /\[name=(.*?)\]/;
-var timeregex = /\[time=([:|,|+|-|\(|\)|\s|\w]*?)\]/;
-var nameandtimeregex = new RegExp(nameregex.source + spaceregex.source + timeregex.source + notinhtmltagregex.source, "g");
+let nameregex = /\[name=(.*?)\]/;
+let timeregex = /\[time=([:|,|+|-|\(|\)|\s|\w]*?)\]/;
+const nameandtimeregex = new RegExp(nameregex.source + spaceregex.source + timeregex.source + notinhtmltagregex.source, "g");
nameregex = new RegExp(nameregex.source + notinhtmltagregex.source, "g");
timeregex = new RegExp(timeregex.source + notinhtmltagregex.source, "g");
@@ -231,35 +236,36 @@ function replaceExtraTags(html) {
if (typeof mermaid !== 'undefined' && mermaid) mermaid.startOnLoad = false;
//dynamic event or object binding here
-function finishView(view) {
+export function finishView(view) {
//todo list
- var lis = view.find('li.raw').removeClass("raw").sortByDepth().toArray();
- for (var i = 0; i < lis.length; i++) {
- var li = lis[i];
- var html = $(li).clone()[0].innerHTML;
- var p = $(li).children('p');
+ const lis = view.find('li.raw').removeClass("raw").sortByDepth().toArray();
+
+ for (let li of lis) {
+ let html = $(li).clone()[0].innerHTML;
+ const p = $(li).children('p');
if (p.length == 1) {
html = p.html();
li = p[0];
}
html = replaceExtraTags(html);
li.innerHTML = html;
- var disabled = 'disabled';
+ let disabled = 'disabled';
if(typeof editor !== 'undefined' && havePermission())
disabled = '';
if (/^\s*\[[x ]\]\s*/.test(html)) {
- li.innerHTML = html.replace(/^\s*\[ \]\s*/, '')
- .replace(/^\s*\[x\]\s*/, '');
- lis[i].setAttribute('class', 'task-list-item');
+ li.innerHTML = html.replace(/^\s*\[ \]\s*/, ``)
+ .replace(/^\s*\[x\]\s*/, ``);
+ li.setAttribute('class', 'task-list-item');
}
if (typeof editor !== 'undefined' && havePermission())
$(li).find('input').change(toggleTodoEvent);
//color tag in list will convert it to tag icon with color
- var tag_color = $(li).closest('ul').find(".color");
- tag_color.each(function (key, value) {
+ const tag_color = $(li).closest('ul').find(".color");
+ tag_color.each((key, value) => {
$(value).addClass('fa fa-tag').css('color', $(value).attr('data-color'));
});
}
+
//youtube
view.find("div.youtube.raw").removeClass("raw")
.click(function () {
@@ -270,41 +276,41 @@ function finishView(view) {
.click(function () {
imgPlayiframe(this, '//player.vimeo.com/video/');
})
- .each(function (key, value) {
+ .each((key, value) => {
$.ajax({
type: 'GET',
- url: '//vimeo.com/api/v2/video/' + $(value).attr('data-videoid') + '.json',
+ url: `//vimeo.com/api/v2/video/${$(value).attr('data-videoid')}.json`,
jsonp: 'callback',
dataType: 'jsonp',
- success: function (data) {
- var thumbnail_src = data[0].thumbnail_large;
- var image = '
';
+ success(data) {
+ const thumbnail_src = data[0].thumbnail_large;
+ const image = `
`;
$(value).prepend(image);
if(viewAjaxCallback) viewAjaxCallback();
}
});
});
//gist
- view.find("code[data-gist-id]").each(function (key, value) {
+ view.find("code[data-gist-id]").each((key, value) => {
if ($(value).children().length == 0)
$(value).gist(viewAjaxCallback);
});
//sequence diagram
- var sequences = view.find("div.sequence-diagram.raw").removeClass("raw");
- sequences.each(function (key, value) {
+ const sequences = view.find("div.sequence-diagram.raw").removeClass("raw");
+ sequences.each((key, value) => {
try {
var $value = $(value);
- var $ele = $(value).parent().parent();
+ const $ele = $(value).parent().parent();
- var sequence = $value;
+ const sequence = $value;
sequence.sequenceDiagram({
theme: 'simple'
});
$ele.addClass('sequence-diagram');
$value.children().unwrap().unwrap();
- var svg = $ele.find('> svg');
- svg[0].setAttribute('viewBox', '0 0 ' + svg.attr('width') + ' ' + svg.attr('height'));
+ const svg = $ele.find('> svg');
+ svg[0].setAttribute('viewBox', `0 0 ${svg.attr('width')} ${svg.attr('height')}`);
svg[0].setAttribute('preserveAspectRatio', 'xMidYMid meet');
} catch (err) {
$value.unwrap();
@@ -312,13 +318,13 @@ function finishView(view) {
}
});
//flowchart
- var flow = view.find("div.flow-chart.raw").removeClass("raw");
- flow.each(function (key, value) {
+ const flow = view.find("div.flow-chart.raw").removeClass("raw");
+ flow.each((key, value) => {
try {
var $value = $(value);
- var $ele = $(value).parent().parent();
+ const $ele = $(value).parent().parent();
- var chart = flowchart.parse($value.text());
+ const chart = flowchart.parse($value.text());
$value.html('');
chart.drawSVG(value, {
'line-width': 2,
@@ -335,14 +341,14 @@ function finishView(view) {
}
});
//graphviz
- var Viz = require("viz.js");
- var graphvizs = view.find("div.graphviz.raw").removeClass("raw");
- graphvizs.each(function (key, value) {
+ const Viz = require("viz.js");
+ const graphvizs = view.find("div.graphviz.raw").removeClass("raw");
+ graphvizs.each((key, value) => {
try {
var $value = $(value);
- var $ele = $(value).parent().parent();
+ const $ele = $(value).parent().parent();
- var graphviz = Viz($value.text());
+ const graphviz = Viz($value.text());
if (!graphviz) throw Error('viz.js output empty graph');
$value.html(graphviz);
@@ -354,14 +360,14 @@ function finishView(view) {
}
});
//mermaid
- var mermaids = view.find("div.mermaid.raw").removeClass("raw");
- mermaids.each(function (key, value) {
+ const mermaids = view.find("div.mermaid.raw").removeClass("raw");
+ mermaids.each((key, value) => {
try {
var $value = $(value);
- var $ele = $(value).closest('pre');
+ const $ele = $(value).closest('pre');
- var mermaidError = null;
- mermaid.parseError = function (err, hash) {
+ let mermaidError = null;
+ mermaid.parseError = (err, hash) => {
mermaidError = err;
};
@@ -379,44 +385,44 @@ function finishView(view) {
}
});
//image href new window(emoji not included)
- var images = view.find("img.raw[src]").removeClass("raw");
- images.each(function (key, value) {
+ const images = view.find("img.raw[src]").removeClass("raw");
+ images.each((key, value) => {
// if it's already wrapped by link, then ignore
- var $value = $(value);
- $value[0].onload = function (e) {
+ const $value = $(value);
+ $value[0].onload = e => {
if(viewAjaxCallback) viewAjaxCallback();
};
});
//blockquote
- var blockquote = view.find("blockquote.raw").removeClass("raw");
- var blockquote_p = blockquote.find("p");
- blockquote_p.each(function (key, value) {
- var html = $(value).html();
+ const blockquote = view.find("blockquote.raw").removeClass("raw");
+ const blockquote_p = blockquote.find("p");
+ blockquote_p.each((key, value) => {
+ let html = $(value).html();
html = replaceExtraTags(html);
$(value).html(html);
});
//color tag in blockquote will change its left border color
- var blockquote_color = blockquote.find(".color");
- blockquote_color.each(function (key, value) {
+ const blockquote_color = blockquote.find(".color");
+ blockquote_color.each((key, value) => {
$(value).closest("blockquote").css('border-left-color', $(value).attr('data-color'));
});
//slideshare
view.find("div.slideshare.raw").removeClass("raw")
- .each(function (key, value) {
+ .each((key, value) => {
$.ajax({
type: 'GET',
- url: '//www.slideshare.net/api/oembed/2?url=http://www.slideshare.net/' + $(value).attr('data-slideshareid') + '&format=json',
+ url: `//www.slideshare.net/api/oembed/2?url=http://www.slideshare.net/${$(value).attr('data-slideshareid')}&format=json`,
jsonp: 'callback',
dataType: 'jsonp',
- success: function (data) {
- var $html = $(data.html);
- var iframe = $html.closest('iframe');
- var caption = $html.closest('div');
- var inner = $('').append(iframe);
- var height = iframe.attr('height');
- var width = iframe.attr('width');
- var ratio = (height / width) * 100;
- inner.css('padding-bottom', ratio + '%');
+ success(data) {
+ const $html = $(data.html);
+ const iframe = $html.closest('iframe');
+ const caption = $html.closest('div');
+ const inner = $('').append(iframe);
+ const height = iframe.attr('height');
+ const width = iframe.attr('width');
+ const ratio = (height / width) * 100;
+ inner.css('padding-bottom', `${ratio}%`);
$(value).html(inner).append(caption);
if(viewAjaxCallback) viewAjaxCallback();
}
@@ -424,31 +430,31 @@ function finishView(view) {
});
//speakerdeck
view.find("div.speakerdeck.raw").removeClass("raw")
- .each(function (key, value) {
- var url = 'https://speakerdeck.com/oembed.json?url=https%3A%2F%2Fspeakerdeck.com%2F' + encodeURIComponent($(value).attr('data-speakerdeckid'));
+ .each((key, value) => {
+ const url = `https://speakerdeck.com/oembed.json?url=https%3A%2F%2Fspeakerdeck.com%2F${encodeURIComponent($(value).attr('data-speakerdeckid'))}`;
//use yql because speakerdeck not support jsonp
$.ajax({
url: 'https://query.yahooapis.com/v1/public/yql',
data: {
- q: "select * from json where url ='" + url + "'",
+ q: `select * from json where url ='${url}'`,
format: "json"
},
dataType: "jsonp",
- success: function (data) {
+ success(data) {
if (!data.query || !data.query.results) return;
- var json = data.query.results.json;
- var html = json.html;
+ const json = data.query.results.json;
+ const html = json.html;
var ratio = json.height / json.width;
$(value).html(html);
- var iframe = $(value).children('iframe');
- var src = iframe.attr('src');
+ const iframe = $(value).children('iframe');
+ const src = iframe.attr('src');
if (src.indexOf('//') == 0)
- iframe.attr('src', 'https:' + src);
- var inner = $('').append(iframe);
- var height = iframe.attr('height');
- var width = iframe.attr('width');
+ iframe.attr('src', `https:${src}`);
+ const inner = $('').append(iframe);
+ const height = iframe.attr('height');
+ const width = iframe.attr('width');
var ratio = (height / width) * 100;
- inner.css('padding-bottom', ratio + '%');
+ inner.css('padding-bottom', `${ratio}%`);
$(value).html(inner);
if(viewAjaxCallback) viewAjaxCallback();
}
@@ -457,8 +463,8 @@ function finishView(view) {
//pdf
view.find("div.pdf.raw").removeClass("raw")
.each(function (key, value) {
- var url = $(value).attr('data-pdfurl');
- var inner = $('');
+ const url = $(value).attr('data-pdfurl');
+ const inner = $('');
$(this).append(inner);
PDFObject.embed(url, inner, {
height: '400px'
@@ -466,12 +472,12 @@ function finishView(view) {
});
//syntax highlighting
view.find("code.raw").removeClass("raw")
- .each(function (key, value) {
- var langDiv = $(value);
+ .each((key, value) => {
+ const langDiv = $(value);
if (langDiv.length > 0) {
- var reallang = langDiv[0].className.replace(/hljs|wrap/g, '').trim();
- var codeDiv = langDiv.find('.code');
- var code = "";
+ const reallang = langDiv[0].className.replace(/hljs|wrap/g, '').trim();
+ const codeDiv = langDiv.find('.code');
+ let code = "";
if (codeDiv.length > 0) code = codeDiv.html();
else code = langDiv.html();
if (!reallang) {
@@ -490,8 +496,8 @@ function finishView(view) {
};
} else {
code = S(code).unescapeHTML().s;
- var languages = hljs.listLanguages();
- if (languages.indexOf(reallang) == -1) {
+ const languages = hljs.listLanguages();
+ if (!languages.includes(reallang)) {
var result = hljs.highlightAuto(code);
} else {
var result = hljs.highlight(reallang, code);
@@ -502,7 +508,7 @@ function finishView(view) {
}
});
//mathjax
- var mathjaxdivs = view.find('span.mathjax.raw').removeClass("raw").toArray();
+ const mathjaxdivs = view.find('span.mathjax.raw').removeClass("raw").toArray();
try {
if (mathjaxdivs.length > 1) {
MathJax.Hub.Queue(["Typeset", MathJax.Hub, mathjaxdivs]);
@@ -519,16 +525,16 @@ function finishView(view) {
}
//only static transform should be here
-function postProcess(code) {
- var result = $('' + code + '
');
+export function postProcess(code) {
+ const result = $(`${code}
`);
//link should open in new window or tab
result.find('a:not([href^="#"]):not([target])').attr('target', '_blank');
//update continue line numbers
- var linenumberdivs = result.find('.gutter.linenumber').toArray();
- for (var i = 0; i < linenumberdivs.length; i++) {
+ const linenumberdivs = result.find('.gutter.linenumber').toArray();
+ for (let i = 0; i < linenumberdivs.length; i++) {
if ($(linenumberdivs[i]).hasClass('continue')) {
- var startnumber = linenumberdivs[i - 1] ? parseInt($(linenumberdivs[i - 1]).find('> span').last().attr('data-linenumber')) : 0;
- $(linenumberdivs[i]).find('> span').each(function(key, value) {
+ const startnumber = linenumberdivs[i - 1] ? parseInt($(linenumberdivs[i - 1]).find('> span').last().attr('data-linenumber')) : 0;
+ $(linenumberdivs[i]).find('> span').each((key, value) => {
$(value).attr('data-linenumber', startnumber + key + 1);
});
}
@@ -538,8 +544,8 @@ function postProcess(code) {
window.postProcess = postProcess;
function generateCleanHTML(view) {
- var src = view.clone();
- var eles = src.find('*');
+ const src = view.clone();
+ const eles = src.find('*');
//remove syncscroll parts
eles.removeClass('part');
src.find('*[class=""]').removeAttr('class');
@@ -550,24 +556,24 @@ function generateCleanHTML(view) {
//disable todo list
src.find("input.task-list-item-checkbox").attr('disabled', '');
//replace emoji image path
- src.find("img.emoji").each(function (key, value) {
- var name = $(value).attr('alt');
+ src.find("img.emoji").each((key, value) => {
+ let name = $(value).attr('alt');
name = name.substr(1);
name = name.slice(0, name.length - 1);
- $(value).attr('src', 'https://www.tortue.me/emoji/' + name + '.png');
+ $(value).attr('src', `https://www.tortue.me/emoji/${name}.png`);
});
//replace video to iframe
- src.find("div[data-videoid]").each(function (key, value) {
- var id = $(value).attr('data-videoid');
- var style = $(value).attr('style');
- var url = null;
+ src.find("div[data-videoid]").each((key, value) => {
+ const id = $(value).attr('data-videoid');
+ const style = $(value).attr('style');
+ let url = null;
if ($(value).hasClass('youtube')) {
url = 'https://www.youtube.com/embed/';
} else if ($(value).hasClass('vimeo')) {
url = 'https://player.vimeo.com/video/';
}
if (url) {
- var iframe = $('');
+ const iframe = $('');
iframe.attr('src', url + id);
iframe.attr('style', style);
$(value).html(iframe);
@@ -576,45 +582,44 @@ function generateCleanHTML(view) {
return src;
}
-function exportToRawHTML(view) {
- var filename = renderFilename(ui.area.markdown) + '.html';
- var src = generateCleanHTML(view);
+export function exportToRawHTML(view) {
+ const filename = `${renderFilename(ui.area.markdown)}.html`;
+ const src = generateCleanHTML(view);
$(src).find('a.anchor').remove();
- var html = src[0].outerHTML;
- var blob = new Blob([html], {
+ const html = src[0].outerHTML;
+ const blob = new Blob([html], {
type: "text/html;charset=utf-8"
});
saveAs(blob, filename);
}
-var common = require('./common.js');
//extract markdown body to html and compile to template
-function exportToHTML(view) {
- var title = renderTitle(ui.area.markdown);
- var filename = renderFilename(ui.area.markdown) + '.html';
- var src = generateCleanHTML(view);
+export function exportToHTML(view) {
+ const title = renderTitle(ui.area.markdown);
+ const filename = `${renderFilename(ui.area.markdown)}.html`;
+ const src = generateCleanHTML(view);
//generate toc
- var toc = $('#ui-toc').clone();
+ const toc = $('#ui-toc').clone();
toc.find('*').removeClass('active').find("a[href^='#'][smoothhashscroll]").removeAttr('smoothhashscroll');
- var tocAffix = $('#ui-toc-affix').clone();
+ const tocAffix = $('#ui-toc-affix').clone();
tocAffix.find('*').removeClass('active').find("a[href^='#'][smoothhashscroll]").removeAttr('smoothhashscroll');
//generate html via template
- $.get(serverurl + '/build/html.min.css', function (css) {
- $.get(serverurl + '/views/html.hbs', function (data) {
- var template = Handlebars.compile(data);
- var context = {
+ $.get(`${serverurl}/build/html.min.css`, css => {
+ $.get(`${serverurl}/views/html.hbs`, data => {
+ const template = Handlebars.compile(data);
+ const context = {
url: serverurl,
- title: title,
- css: css,
+ title,
+ css,
html: src[0].outerHTML,
'ui-toc': toc.html(),
'ui-toc-affix': tocAffix.html(),
- lang: (md && md.meta && md.meta.lang) ? 'lang="' + md.meta.lang + '"' : null,
- dir: (md && md.meta && md.meta.dir) ? 'dir="' + md.meta.dir + '"' : null
+ lang: (md && md.meta && md.meta.lang) ? `lang="${md.meta.lang}"` : null,
+ dir: (md && md.meta && md.meta.dir) ? `dir="${md.meta.dir}"` : null
};
- var html = template(context);
+ const html = template(context);
// console.log(html);
- var blob = new Blob([html], {
+ const blob = new Blob([html], {
type: "text/html;charset=utf-8"
});
saveAs(blob, filename);
@@ -624,17 +629,16 @@ function exportToHTML(view) {
//jQuery sortByDepth
$.fn.sortByDepth = function () {
- var ar = this.map(function () {
+ const ar = this.map(function () {
return {
length: $(this).parents().length,
elt: this
}
- }).get(),
- result = [],
- i = ar.length;
- ar.sort(function (a, b) {
- return a.length - b.length;
- });
+ }).get();
+
+ const result = [];
+ let i = ar.length;
+ ar.sort((a, b) => a.length - b.length);
while (i--) {
result.push(ar[i].elt);
}
@@ -642,16 +646,16 @@ $.fn.sortByDepth = function () {
};
function toggleTodoEvent(e) {
- var startline = $(this).closest('li').attr('data-startline') - 1;
- var line = editor.getLine(startline);
- var matches = line.match(/^[>\s]*[\-\+\*]\s\[([x ])\]/);
+ const startline = $(this).closest('li').attr('data-startline') - 1;
+ const line = editor.getLine(startline);
+ const matches = line.match(/^[>\s]*[\-\+\*]\s\[([x ])\]/);
if (matches && matches.length >= 2) {
- var checked = null;
+ let checked = null;
if (matches[1] == 'x')
checked = true;
else if (matches[1] == ' ')
checked = false;
- var replacements = matches[0].match(/(^[>\s]*[\-\+\*]\s\[)([x ])(\])/);
+ const replacements = matches[0].match(/(^[>\s]*[\-\+\*]\s\[)([x ])(\])/);
editor.replaceRange(checked ? ' ' : 'x', {
line: startline,
ch: replacements[1].length
@@ -667,11 +671,11 @@ function removeHash() {
history.pushState("", document.title, window.location.pathname + window.location.search);
}
-var tocExpand = false;
+let tocExpand = false;
function checkExpandToggle() {
- var toc = $('.ui-toc-dropdown .toc');
- var toggle = $('.expand-toggle');
+ const toc = $('.ui-toc-dropdown .toc');
+ const toggle = $('.expand-toggle');
if (!tocExpand) {
toc.removeClass('expand');
toggle.text('Expand all');
@@ -682,8 +686,8 @@ function checkExpandToggle() {
}
//toc
-function generateToc(id) {
- var target = $('#' + id);
+export function generateToc(id) {
+ const target = $(`#${id}`);
target.html('');
new Toc('doc', {
'level': 3,
@@ -695,25 +699,25 @@ function generateToc(id) {
});
if (target.text() == 'undefined')
target.html('');
- var tocMenu = $('