Merge branch 'Yukai/#4-es6-module' into 'frontend-next'
導入 es6 語法 See merge request !4
This commit is contained in:
Wu, Cheng-Han
commit
e2694d7a62
8 changed files with 774 additions and 838 deletions
|
|
@ -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/<urlpath>
|
||||
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/<urlpath>
|
||||
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}`;
|
||||
|
||||
var version = '0.5.0';
|
||||
export const version = '0.5.0';
|
||||
|
||||
var checkAuth = false;
|
||||
var profile = null;
|
||||
var lastLoginState = getLoginState();
|
||||
var lastUserId = getUserId();
|
||||
var loginStateChangeEvent = null;
|
||||
let checkAuth = false;
|
||||
let profile = null;
|
||||
let lastLoginState = getLoginState();
|
||||
let lastUserId = getUserId();
|
||||
let loginStateChangeEvent = null;
|
||||
|
||||
function resetCheckAuth() {
|
||||
export function setloginStateChangeEvent(func) {
|
||||
loginStateChangeEvent = func;
|
||||
}
|
||||
|
||||
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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,30 +3,31 @@ require('./locale');
|
|||
require('../css/cover.css');
|
||||
require('../css/site.css');
|
||||
|
||||
var common = require('./common');
|
||||
var checkIfAuth = common.checkIfAuth;
|
||||
var urlpath = common.urlpath;
|
||||
var resetCheckAuth = common.resetCheckAuth;
|
||||
var getLoginState = common.getLoginState;
|
||||
var clearLoginState = common.clearLoginState;
|
||||
var loginStateChangeEvent = common.loginStateChangeEvent;
|
||||
import {
|
||||
checkIfAuth,
|
||||
clearLoginState,
|
||||
getLoginState,
|
||||
resetCheckAuth,
|
||||
setloginStateChangeEvent
|
||||
} from './common';
|
||||
|
||||
var historyModule = require('./history');
|
||||
var parseStorageToHistory = historyModule.parseStorageToHistory;
|
||||
var parseHistory = historyModule.parseHistory;
|
||||
var getStorageHistory = historyModule.getStorageHistory;
|
||||
var getHistory = historyModule.getHistory;
|
||||
var saveHistory = historyModule.saveHistory;
|
||||
var removeHistory = historyModule.removeHistory;
|
||||
var postHistoryToServer = historyModule.postHistoryToServer;
|
||||
var deleteServerHistory = historyModule.deleteServerHistory;
|
||||
var parseServerToHistory = historyModule.parseServerToHistory;
|
||||
var saveStorageHistoryToServer = historyModule.saveStorageHistoryToServer;
|
||||
var clearDuplicatedHistory = historyModule.clearDuplicatedHistory;
|
||||
import {
|
||||
clearDuplicatedHistory,
|
||||
deleteServerHistory,
|
||||
getHistory,
|
||||
getStorageHistory,
|
||||
parseHistory,
|
||||
parseServerToHistory,
|
||||
parseStorageToHistory,
|
||||
postHistoryToServer,
|
||||
removeHistory,
|
||||
saveHistory,
|
||||
saveStorageHistoryToServer
|
||||
} from './history';
|
||||
|
||||
var saveAs = require('file-saver').saveAs;
|
||||
var List = require('list.js');
|
||||
var S = require('string');
|
||||
import { saveAs } from 'file-saver';
|
||||
import List from 'list.js';
|
||||
import S from 'string';
|
||||
|
||||
import Cover from './views/Cover';
|
||||
import Vue from 'vue';
|
||||
|
|
@ -36,7 +37,7 @@ new Vue({
|
|||
render: (h) => h(Cover)
|
||||
})
|
||||
|
||||
var options = {
|
||||
const options = {
|
||||
valueNames: ['id', 'text', 'timestamp', 'fromNow', 'time', 'tags', 'pinned'],
|
||||
item: '<li class="col-xs-12 col-sm-6 col-md-6 col-lg-4">\
|
||||
<span class="id" style="display:none;"></span>\
|
||||
|
|
@ -64,15 +65,16 @@ var options = {
|
|||
})
|
||||
]
|
||||
};
|
||||
var historyList = new List('history', options);
|
||||
const historyList = new List('history', options);
|
||||
|
||||
migrateHistoryFromTempCallback = pageInit;
|
||||
loginStateChangeEvent = pageInit;
|
||||
setloginStateChangeEvent(pageInit);
|
||||
|
||||
pageInit();
|
||||
|
||||
function pageInit() {
|
||||
checkIfAuth(
|
||||
function (data) {
|
||||
data => {
|
||||
$('.ui-signin').hide();
|
||||
$('.ui-or').hide();
|
||||
$('.ui-welcome').show();
|
||||
|
|
@ -83,7 +85,7 @@ function pageInit() {
|
|||
$(".ui-history").click();
|
||||
parseServerToHistory(historyList, parseHistoryCallback);
|
||||
},
|
||||
function () {
|
||||
() => {
|
||||
$('.ui-signin').show();
|
||||
$('.ui-or').show();
|
||||
$('.ui-welcome').hide();
|
||||
|
|
@ -100,14 +102,14 @@ $(".masthead-nav li").click(function () {
|
|||
$(this).addClass("active");
|
||||
});
|
||||
|
||||
$(".ui-home").click(function () {
|
||||
$(".ui-home").click(() => {
|
||||
if (!$("#home").is(':visible')) {
|
||||
$(".section:visible").hide();
|
||||
$("#home").fadeIn();
|
||||
}
|
||||
});
|
||||
|
||||
$(".ui-history").click(function () {
|
||||
$(".ui-history").click(() => {
|
||||
if (!$("#history").is(':visible')) {
|
||||
$(".section:visible").hide();
|
||||
$("#history").fadeIn();
|
||||
|
|
@ -120,7 +122,7 @@ function checkHistoryList() {
|
|||
$(".ui-import-from-browser").hide();
|
||||
} else if ($("#history-list").children().length == 0) {
|
||||
$(".ui-nohistory").slideDown();
|
||||
getStorageHistory(function (data) {
|
||||
getStorageHistory(data => {
|
||||
if (data && data.length > 0 && getLoginState() && historyList.items.length == 0) {
|
||||
$(".ui-import-from-browser").slideDown();
|
||||
}
|
||||
|
|
@ -132,9 +134,9 @@ function parseHistoryCallback(list, notehistory) {
|
|||
checkHistoryList();
|
||||
//sort by pinned then timestamp
|
||||
list.sort('', {
|
||||
sortFunction: function (a, b) {
|
||||
var notea = a.values();
|
||||
var noteb = b.values();
|
||||
sortFunction(a, b) {
|
||||
const notea = a.values();
|
||||
const noteb = b.values();
|
||||
if (notea.pinned && !noteb.pinned) {
|
||||
return -1;
|
||||
} else if (!notea.pinned && noteb.pinned) {
|
||||
|
|
@ -151,14 +153,14 @@ function parseHistoryCallback(list, notehistory) {
|
|||
}
|
||||
});
|
||||
// parse filter tags
|
||||
var filtertags = [];
|
||||
for (var i = 0, l = list.items.length; i < l; i++) {
|
||||
var tags = list.items[i]._values.tags;
|
||||
const filtertags = [];
|
||||
for (let i = 0, l = list.items.length; i < l; i++) {
|
||||
const tags = list.items[i]._values.tags;
|
||||
if (tags && tags.length > 0) {
|
||||
for (var j = 0; j < tags.length; j++) {
|
||||
for (let j = 0; j < tags.length; j++) {
|
||||
//push info filtertags if not found
|
||||
var found = false;
|
||||
if (filtertags.indexOf(tags[j]) != -1)
|
||||
let found = false;
|
||||
if (filtertags.includes(tags[j]))
|
||||
found = true;
|
||||
if (!found)
|
||||
filtertags.push(tags[j]);
|
||||
|
|
@ -169,17 +171,17 @@ function parseHistoryCallback(list, notehistory) {
|
|||
}
|
||||
|
||||
// update items whenever list updated
|
||||
historyList.on('updated', function (e) {
|
||||
for (var i = 0, l = e.items.length; i < l; i++) {
|
||||
var item = e.items[i];
|
||||
historyList.on('updated', e => {
|
||||
for (let i = 0, l = e.items.length; i < l; i++) {
|
||||
const item = e.items[i];
|
||||
if (item.visible()) {
|
||||
var itemEl = $(item.elm);
|
||||
var values = item._values;
|
||||
var a = itemEl.find("a");
|
||||
var pin = itemEl.find(".ui-history-pin");
|
||||
var tagsEl = itemEl.find(".tags");
|
||||
const itemEl = $(item.elm);
|
||||
const values = item._values;
|
||||
const a = itemEl.find("a");
|
||||
const pin = itemEl.find(".ui-history-pin");
|
||||
const tagsEl = itemEl.find(".tags");
|
||||
//parse link to element a
|
||||
a.attr('href', serverurl + '/' + values.id);
|
||||
a.attr('href', `${serverurl}/${values.id}`);
|
||||
//parse pinned
|
||||
if (values.pinned) {
|
||||
pin.addClass('active');
|
||||
|
|
@ -187,12 +189,12 @@ historyList.on('updated', function (e) {
|
|||
pin.removeClass('active');
|
||||
}
|
||||
//parse tags
|
||||
var tags = values.tags;
|
||||
const tags = values.tags;
|
||||
if (tags && tags.length > 0 && tagsEl.children().length <= 0) {
|
||||
var labels = [];
|
||||
for (var j = 0; j < tags.length; j++) {
|
||||
const labels = [];
|
||||
for (let j = 0; j < tags.length; j++) {
|
||||
//push into the item label
|
||||
labels.push("<span class='label label-default'>" + tags[j] + "</span>");
|
||||
labels.push(`<span class='label label-default'>${tags[j]}</span>`);
|
||||
}
|
||||
tagsEl.html(labels.join(' '));
|
||||
}
|
||||
|
|
@ -206,21 +208,21 @@ historyList.on('updated', function (e) {
|
|||
|
||||
function historyCloseClick(e) {
|
||||
e.preventDefault();
|
||||
var id = $(this).closest("a").siblings("span").html();
|
||||
var value = historyList.get('id', id)[0]._values;
|
||||
const id = $(this).closest("a").siblings("span").html();
|
||||
const value = historyList.get('id', id)[0]._values;
|
||||
$('.ui-delete-modal-msg').text('Do you really want to delete below history?');
|
||||
$('.ui-delete-modal-item').html('<i class="fa fa-file-text"></i> ' + value.text + '<br><i class="fa fa-clock-o"></i> ' + value.time);
|
||||
$('.ui-delete-modal-item').html(`<i class="fa fa-file-text"></i> ${value.text}<br><i class="fa fa-clock-o"></i> ${value.time}`);
|
||||
clearHistory = false;
|
||||
deleteId = id;
|
||||
}
|
||||
|
||||
function historyPinClick(e) {
|
||||
e.preventDefault();
|
||||
var $this = $(this);
|
||||
var id = $this.closest("a").siblings("span").html();
|
||||
var item = historyList.get('id', id)[0];
|
||||
var values = item._values;
|
||||
var pinned = values.pinned;
|
||||
const $this = $(this);
|
||||
const id = $this.closest("a").siblings("span").html();
|
||||
const item = historyList.get('id', id)[0];
|
||||
const values = item._values;
|
||||
let pinned = values.pinned;
|
||||
if (!values.pinned) {
|
||||
pinned = true;
|
||||
item._values.pinned = true;
|
||||
|
|
@ -228,10 +230,10 @@ function historyPinClick(e) {
|
|||
pinned = false;
|
||||
item._values.pinned = false;
|
||||
}
|
||||
checkIfAuth(function () {
|
||||
checkIfAuth(() => {
|
||||
postHistoryToServer(id, {
|
||||
pinned: pinned
|
||||
}, function (err, result) {
|
||||
pinned
|
||||
}, (err, result) => {
|
||||
if (!err) {
|
||||
if (pinned)
|
||||
$this.addClass('active');
|
||||
|
|
@ -239,9 +241,9 @@ function historyPinClick(e) {
|
|||
$this.removeClass('active');
|
||||
}
|
||||
});
|
||||
}, function () {
|
||||
getHistory(function (notehistory) {
|
||||
for(var i = 0; i < notehistory.length; i++) {
|
||||
}, () => {
|
||||
getHistory(notehistory => {
|
||||
for(let i = 0; i < notehistory.length; i++) {
|
||||
if (notehistory[i].id == id) {
|
||||
notehistory[i].pinned = pinned;
|
||||
break;
|
||||
|
|
@ -260,10 +262,10 @@ function historyPinClick(e) {
|
|||
setInterval(updateItemFromNow, 60000);
|
||||
|
||||
function updateItemFromNow() {
|
||||
var items = $('.item').toArray();
|
||||
for (var i = 0; i < items.length; i++) {
|
||||
var item = $(items[i]);
|
||||
var timestamp = parseInt(item.find('.timestamp').text());
|
||||
const items = $('.item').toArray();
|
||||
for (let i = 0; i < items.length; i++) {
|
||||
const item = $(items[i]);
|
||||
const timestamp = parseInt(item.find('.timestamp').text());
|
||||
item.find('.fromNow').text(moment(timestamp).fromNow());
|
||||
}
|
||||
}
|
||||
|
|
@ -272,8 +274,8 @@ var clearHistory = false;
|
|||
var deleteId = null;
|
||||
|
||||
function deleteHistory() {
|
||||
checkIfAuth(function () {
|
||||
deleteServerHistory(deleteId, function (err, result) {
|
||||
checkIfAuth(() => {
|
||||
deleteServerHistory(deleteId, (err, result) => {
|
||||
if (!err) {
|
||||
if (clearHistory) {
|
||||
historyList.clear();
|
||||
|
|
@ -287,7 +289,7 @@ function deleteHistory() {
|
|||
deleteId = null;
|
||||
clearHistory = false;
|
||||
});
|
||||
}, function () {
|
||||
}, () => {
|
||||
if (clearHistory) {
|
||||
saveHistory([]);
|
||||
historyList.clear();
|
||||
|
|
@ -295,8 +297,8 @@ function deleteHistory() {
|
|||
deleteId = null;
|
||||
} else {
|
||||
if (!deleteId) return;
|
||||
getHistory(function (notehistory) {
|
||||
var newnotehistory = removeHistory(deleteId, notehistory);
|
||||
getHistory(notehistory => {
|
||||
const newnotehistory = removeHistory(deleteId, notehistory);
|
||||
saveHistory(newnotehistory);
|
||||
historyList.remove('id', deleteId);
|
||||
checkHistoryList();
|
||||
|
|
@ -308,36 +310,36 @@ function deleteHistory() {
|
|||
});
|
||||
}
|
||||
|
||||
$(".ui-delete-modal-confirm").click(function () {
|
||||
$(".ui-delete-modal-confirm").click(() => {
|
||||
deleteHistory();
|
||||
});
|
||||
|
||||
$(".ui-import-from-browser").click(function () {
|
||||
saveStorageHistoryToServer(function () {
|
||||
$(".ui-import-from-browser").click(() => {
|
||||
saveStorageHistoryToServer(() => {
|
||||
parseStorageToHistory(historyList, parseHistoryCallback);
|
||||
});
|
||||
});
|
||||
|
||||
$(".ui-save-history").click(function () {
|
||||
getHistory(function (data) {
|
||||
var history = JSON.stringify(data);
|
||||
var blob = new Blob([history], {
|
||||
$(".ui-save-history").click(() => {
|
||||
getHistory(data => {
|
||||
const history = JSON.stringify(data);
|
||||
const blob = new Blob([history], {
|
||||
type: "application/json;charset=utf-8"
|
||||
});
|
||||
saveAs(blob, 'hackmd_history_' + moment().format('YYYYMMDDHHmmss'));
|
||||
saveAs(blob, `hackmd_history_${moment().format('YYYYMMDDHHmmss')}`);
|
||||
});
|
||||
});
|
||||
|
||||
$(".ui-open-history").bind("change", function (e) {
|
||||
var files = e.target.files || e.dataTransfer.files;
|
||||
var file = files[0];
|
||||
var reader = new FileReader();
|
||||
reader.onload = function () {
|
||||
var notehistory = JSON.parse(reader.result);
|
||||
$(".ui-open-history").bind("change", e => {
|
||||
const files = e.target.files || e.dataTransfer.files;
|
||||
const file = files[0];
|
||||
const reader = new FileReader();
|
||||
reader.onload = () => {
|
||||
const notehistory = JSON.parse(reader.result);
|
||||
//console.log(notehistory);
|
||||
if (!reader.result) return;
|
||||
getHistory(function (data) {
|
||||
var mergedata = data.concat(notehistory);
|
||||
getHistory(data => {
|
||||
let mergedata = data.concat(notehistory);
|
||||
mergedata = clearDuplicatedHistory(mergedata);
|
||||
saveHistory(mergedata);
|
||||
parseHistory(historyList, parseHistoryCallback);
|
||||
|
|
@ -347,18 +349,18 @@ $(".ui-open-history").bind("change", function (e) {
|
|||
reader.readAsText(file);
|
||||
});
|
||||
|
||||
$(".ui-clear-history").click(function () {
|
||||
$(".ui-clear-history").click(() => {
|
||||
$('.ui-delete-modal-msg').text('Do you really want to clear all history?');
|
||||
$('.ui-delete-modal-item').html('There is no turning back.');
|
||||
clearHistory = true;
|
||||
deleteId = null;
|
||||
});
|
||||
|
||||
$(".ui-refresh-history").click(function () {
|
||||
var lastTags = $(".ui-use-tags").select2('val');
|
||||
$(".ui-refresh-history").click(() => {
|
||||
const lastTags = $(".ui-use-tags").select2('val');
|
||||
$(".ui-use-tags").select2('val', '');
|
||||
historyList.filter();
|
||||
var lastKeyword = $('.search').val();
|
||||
const lastKeyword = $('.search').val();
|
||||
$('.search').val('');
|
||||
historyList.search();
|
||||
$('#history-list').slideUp('fast');
|
||||
|
|
@ -366,7 +368,7 @@ $(".ui-refresh-history").click(function () {
|
|||
|
||||
resetCheckAuth();
|
||||
historyList.clear();
|
||||
parseHistory(historyList, function (list, notehistory) {
|
||||
parseHistory(historyList, (list, notehistory) => {
|
||||
parseHistoryCallback(list, notehistory);
|
||||
$(".ui-use-tags").select2('val', lastTags);
|
||||
$(".ui-use-tags").trigger('change');
|
||||
|
|
@ -378,16 +380,16 @@ $(".ui-refresh-history").click(function () {
|
|||
});
|
||||
});
|
||||
|
||||
$(".ui-logout").click(function () {
|
||||
$(".ui-logout").click(() => {
|
||||
clearLoginState();
|
||||
location.href = serverurl + '/logout';
|
||||
location.href = `${serverurl}/logout`;
|
||||
});
|
||||
|
||||
var filtertags = [];
|
||||
let filtertags = [];
|
||||
$(".ui-use-tags").select2({
|
||||
placeholder: $(".ui-use-tags").attr('placeholder'),
|
||||
multiple: true,
|
||||
data: function () {
|
||||
data() {
|
||||
return {
|
||||
results: filtertags
|
||||
};
|
||||
|
|
@ -397,7 +399,7 @@ $('.select2-input').css('width', 'inherit');
|
|||
buildTagsFilter([]);
|
||||
|
||||
function buildTagsFilter(tags) {
|
||||
for (var i = 0; i < tags.length; i++)
|
||||
for (let i = 0; i < tags.length; i++)
|
||||
tags[i] = {
|
||||
id: i,
|
||||
text: S(tags[i]).unescapeHTML().s
|
||||
|
|
@ -405,17 +407,17 @@ function buildTagsFilter(tags) {
|
|||
filtertags = tags;
|
||||
}
|
||||
$(".ui-use-tags").on('change', function () {
|
||||
var tags = [];
|
||||
var data = $(this).select2('data');
|
||||
for (var i = 0; i < data.length; i++)
|
||||
const tags = [];
|
||||
const data = $(this).select2('data');
|
||||
for (let i = 0; i < data.length; i++)
|
||||
tags.push(data[i].text);
|
||||
if (tags.length > 0) {
|
||||
historyList.filter(function (item) {
|
||||
var values = item.values();
|
||||
historyList.filter(item => {
|
||||
const values = item.values();
|
||||
if (!values.tags) return false;
|
||||
var found = false;
|
||||
for (var i = 0; i < tags.length; i++) {
|
||||
if (values.tags.indexOf(tags[i]) != -1) {
|
||||
let found = false;
|
||||
for (let i = 0; i < tags.length; i++) {
|
||||
if (values.tags.includes(tags[i])) {
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
|
|
@ -428,6 +430,6 @@ $(".ui-use-tags").on('change', function () {
|
|||
checkHistoryList();
|
||||
});
|
||||
|
||||
$('.search').keyup(function () {
|
||||
$('.search').keyup(() => {
|
||||
checkHistoryList();
|
||||
});
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,10 +1,9 @@
|
|||
var store = require('store');
|
||||
var S = require('string');
|
||||
|
||||
var common = require('./common');
|
||||
var checkIfAuth = common.checkIfAuth;
|
||||
var urlpath = common.urlpath;
|
||||
var getLoginState = common.getLoginState;
|
||||
import store from 'store';
|
||||
import S from 'string';
|
||||
import {
|
||||
checkIfAuth,
|
||||
urlpath
|
||||
} from './common';
|
||||
|
||||
window.migrateHistoryFromTempCallback = null;
|
||||
|
||||
|
|
@ -12,22 +11,22 @@ migrateHistoryFromTemp();
|
|||
|
||||
function migrateHistoryFromTemp() {
|
||||
if (url('#tempid')) {
|
||||
$.get(serverurl + '/temp', {
|
||||
$.get(`${serverurl}/temp`, {
|
||||
tempid: url('#tempid')
|
||||
})
|
||||
.done(function (data) {
|
||||
.done(data => {
|
||||
if (data && data.temp) {
|
||||
getStorageHistory(function (olddata) {
|
||||
getStorageHistory(olddata => {
|
||||
if (!olddata || olddata.length == 0) {
|
||||
saveHistoryToStorage(JSON.parse(data.temp));
|
||||
}
|
||||
});
|
||||
}
|
||||
})
|
||||
.always(function () {
|
||||
var hash = location.hash.split('#')[1];
|
||||
.always(() => {
|
||||
let hash = location.hash.split('#')[1];
|
||||
hash = hash.split('&');
|
||||
for (var i = 0; i < hash.length; i++)
|
||||
for (let i = 0; i < hash.length; i++)
|
||||
if (hash[i].indexOf('tempid') == 0) {
|
||||
hash.splice(i, 1);
|
||||
i--;
|
||||
|
|
@ -40,12 +39,12 @@ function migrateHistoryFromTemp() {
|
|||
}
|
||||
}
|
||||
|
||||
function saveHistory(notehistory) {
|
||||
export function saveHistory(notehistory) {
|
||||
checkIfAuth(
|
||||
function () {
|
||||
() => {
|
||||
saveHistoryToServer(notehistory);
|
||||
},
|
||||
function () {
|
||||
() => {
|
||||
saveHistoryToStorage(notehistory);
|
||||
}
|
||||
);
|
||||
|
|
@ -65,7 +64,7 @@ function saveHistoryToCookie(notehistory) {
|
|||
}
|
||||
|
||||
function saveHistoryToServer(notehistory) {
|
||||
$.post(serverurl + '/history', {
|
||||
$.post(`${serverurl}/history`, {
|
||||
history: JSON.stringify(notehistory)
|
||||
});
|
||||
}
|
||||
|
|
@ -75,37 +74,37 @@ function saveCookieHistoryToStorage(callback) {
|
|||
callback();
|
||||
}
|
||||
|
||||
function saveStorageHistoryToServer(callback) {
|
||||
var data = store.get('notehistory');
|
||||
export function saveStorageHistoryToServer(callback) {
|
||||
const data = store.get('notehistory');
|
||||
if (data) {
|
||||
$.post(serverurl + '/history', {
|
||||
$.post(`${serverurl}/history`, {
|
||||
history: data
|
||||
})
|
||||
.done(function (data) {
|
||||
.done(data => {
|
||||
callback(data);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function saveCookieHistoryToServer(callback) {
|
||||
$.post(serverurl + '/history', {
|
||||
$.post(`${serverurl}/history`, {
|
||||
history: Cookies.get('notehistory')
|
||||
})
|
||||
.done(function (data) {
|
||||
.done(data => {
|
||||
callback(data);
|
||||
});
|
||||
}
|
||||
|
||||
function clearDuplicatedHistory(notehistory) {
|
||||
var newnotehistory = [];
|
||||
for (var i = 0; i < notehistory.length; i++) {
|
||||
var found = false;
|
||||
for (var j = 0; j < newnotehistory.length; j++) {
|
||||
var id = notehistory[i].id.replace(/\=+$/, '');
|
||||
var newId = newnotehistory[j].id.replace(/\=+$/, '');
|
||||
export function clearDuplicatedHistory(notehistory) {
|
||||
const newnotehistory = [];
|
||||
for (let i = 0; i < notehistory.length; i++) {
|
||||
let found = false;
|
||||
for (let j = 0; j < newnotehistory.length; j++) {
|
||||
const id = notehistory[i].id.replace(/\=+$/, '');
|
||||
const newId = newnotehistory[j].id.replace(/\=+$/, '');
|
||||
if (id == newId || notehistory[i].id == newnotehistory[j].id || !notehistory[i].id || !newnotehistory[j].id) {
|
||||
var time = (typeof notehistory[i].time === 'number' ? moment(notehistory[i].time) : moment(notehistory[i].time, 'MMMM Do YYYY, h:mm:ss a'));
|
||||
var newTime = (typeof newnotehistory[i].time === 'number' ? moment(newnotehistory[i].time) : moment(newnotehistory[i].time, 'MMMM Do YYYY, h:mm:ss a'));
|
||||
const time = (typeof notehistory[i].time === 'number' ? moment(notehistory[i].time) : moment(notehistory[i].time, 'MMMM Do YYYY, h:mm:ss a'));
|
||||
const newTime = (typeof newnotehistory[i].time === 'number' ? moment(newnotehistory[i].time) : moment(newnotehistory[i].time, 'MMMM Do YYYY, h:mm:ss a'));
|
||||
if(time >= newTime) {
|
||||
newnotehistory[j] = notehistory[i];
|
||||
}
|
||||
|
|
@ -123,42 +122,42 @@ function addHistory(id, text, time, tags, pinned, notehistory) {
|
|||
// only add when note id exists
|
||||
if (id) {
|
||||
notehistory.push({
|
||||
id: id,
|
||||
text: text,
|
||||
time: time,
|
||||
tags: tags,
|
||||
pinned: pinned
|
||||
id,
|
||||
text,
|
||||
time,
|
||||
tags,
|
||||
pinned
|
||||
});
|
||||
}
|
||||
return notehistory;
|
||||
}
|
||||
|
||||
function removeHistory(id, notehistory) {
|
||||
for (var i = 0; i < notehistory.length; i++) {
|
||||
export function removeHistory(id, notehistory) {
|
||||
for (let i = 0; i < notehistory.length; i++) {
|
||||
if (notehistory[i].id == id) {
|
||||
notehistory.splice(i, 1);
|
||||
i--;
|
||||
i -= 1;
|
||||
}
|
||||
}
|
||||
return notehistory;
|
||||
}
|
||||
|
||||
//used for inner
|
||||
function writeHistory(title, tags) {
|
||||
export function writeHistory(title, tags) {
|
||||
checkIfAuth(
|
||||
function () {
|
||||
() => {
|
||||
// no need to do this anymore, this will count from server-side
|
||||
// writeHistoryToServer(title, tags);
|
||||
},
|
||||
function () {
|
||||
() => {
|
||||
writeHistoryToStorage(title, tags);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
function writeHistoryToServer(title, tags) {
|
||||
$.get(serverurl + '/history')
|
||||
.done(function (data) {
|
||||
$.get(`${serverurl}/history`)
|
||||
.done(data => {
|
||||
try {
|
||||
if (data.history) {
|
||||
var notehistory = data.history;
|
||||
|
|
@ -171,10 +170,10 @@ function writeHistoryToServer(title, tags) {
|
|||
if (!notehistory)
|
||||
notehistory = [];
|
||||
|
||||
var newnotehistory = generateHistory(title, tags, notehistory);
|
||||
const newnotehistory = generateHistory(title, tags, notehistory);
|
||||
saveHistoryToServer(newnotehistory);
|
||||
})
|
||||
.fail(function (xhr, status, error) {
|
||||
.fail((xhr, status, error) => {
|
||||
console.error(xhr.responseText);
|
||||
});
|
||||
}
|
||||
|
|
@ -188,13 +187,13 @@ function writeHistoryToCookie(title, tags) {
|
|||
if (!notehistory)
|
||||
notehistory = [];
|
||||
|
||||
var newnotehistory = generateHistory(title, tags, notehistory);
|
||||
const newnotehistory = generateHistory(title, tags, notehistory);
|
||||
saveHistoryToCookie(newnotehistory);
|
||||
}
|
||||
|
||||
function writeHistoryToStorage(title, tags) {
|
||||
if (store.enabled) {
|
||||
var data = store.get('notehistory');
|
||||
let data = store.get('notehistory');
|
||||
if (data) {
|
||||
if (typeof data == "string")
|
||||
data = JSON.parse(data);
|
||||
|
|
@ -204,7 +203,7 @@ function writeHistoryToStorage(title, tags) {
|
|||
if (!notehistory)
|
||||
notehistory = [];
|
||||
|
||||
var newnotehistory = generateHistory(title, tags, notehistory);
|
||||
const newnotehistory = generateHistory(title, tags, notehistory);
|
||||
saveHistoryToStorage(newnotehistory);
|
||||
} else {
|
||||
writeHistoryToCookie(title, tags);
|
||||
|
|
@ -212,27 +211,25 @@ function writeHistoryToStorage(title, tags) {
|
|||
}
|
||||
|
||||
if (!Array.isArray) {
|
||||
Array.isArray = function(arg) {
|
||||
return Object.prototype.toString.call(arg) === '[object Array]';
|
||||
};
|
||||
Array.isArray = arg => Object.prototype.toString.call(arg) === '[object Array]';
|
||||
}
|
||||
|
||||
function renderHistory(title, tags) {
|
||||
//console.debug(tags);
|
||||
var id = urlpath ? location.pathname.slice(urlpath.length + 1, location.pathname.length).split('/')[1] : location.pathname.split('/')[1];
|
||||
const id = urlpath ? location.pathname.slice(urlpath.length + 1, location.pathname.length).split('/')[1] : location.pathname.split('/')[1];
|
||||
return {
|
||||
id: id,
|
||||
id,
|
||||
text: title,
|
||||
time: moment().valueOf(),
|
||||
tags: tags
|
||||
tags
|
||||
};
|
||||
}
|
||||
|
||||
function generateHistory(title, tags, notehistory) {
|
||||
var info = renderHistory(title, tags);
|
||||
const info = renderHistory(title, tags);
|
||||
//keep any pinned data
|
||||
var pinned = false;
|
||||
for (var i = 0; i < notehistory.length; i++) {
|
||||
let pinned = false;
|
||||
for (let i = 0; i < notehistory.length; i++) {
|
||||
if (notehistory[i].id == info.id && notehistory[i].pinned) {
|
||||
pinned = true;
|
||||
break;
|
||||
|
|
@ -245,25 +242,25 @@ function generateHistory(title, tags, notehistory) {
|
|||
}
|
||||
|
||||
//used for outer
|
||||
function getHistory(callback) {
|
||||
export function getHistory(callback) {
|
||||
checkIfAuth(
|
||||
function () {
|
||||
() => {
|
||||
getServerHistory(callback);
|
||||
},
|
||||
function () {
|
||||
() => {
|
||||
getStorageHistory(callback);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
function getServerHistory(callback) {
|
||||
$.get(serverurl + '/history')
|
||||
.done(function (data) {
|
||||
$.get(`${serverurl}/history`)
|
||||
.done(data => {
|
||||
if (data.history) {
|
||||
callback(data.history);
|
||||
}
|
||||
})
|
||||
.fail(function (xhr, status, error) {
|
||||
.fail((xhr, status, error) => {
|
||||
console.error(xhr.responseText);
|
||||
});
|
||||
}
|
||||
|
|
@ -272,9 +269,9 @@ function getCookieHistory(callback) {
|
|||
callback(Cookies.getJSON('notehistory'));
|
||||
}
|
||||
|
||||
function getStorageHistory(callback) {
|
||||
export function getStorageHistory(callback) {
|
||||
if (store.enabled) {
|
||||
var data = store.get('notehistory');
|
||||
let data = store.get('notehistory');
|
||||
if (data) {
|
||||
if (typeof data == "string")
|
||||
data = JSON.parse(data);
|
||||
|
|
@ -286,37 +283,37 @@ function getStorageHistory(callback) {
|
|||
}
|
||||
}
|
||||
|
||||
function parseHistory(list, callback) {
|
||||
export function parseHistory(list, callback) {
|
||||
checkIfAuth(
|
||||
function () {
|
||||
() => {
|
||||
parseServerToHistory(list, callback);
|
||||
},
|
||||
function () {
|
||||
() => {
|
||||
parseStorageToHistory(list, callback);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
function parseServerToHistory(list, callback) {
|
||||
$.get(serverurl + '/history')
|
||||
.done(function (data) {
|
||||
export function parseServerToHistory(list, callback) {
|
||||
$.get(`${serverurl}/history`)
|
||||
.done(data => {
|
||||
if (data.history) {
|
||||
parseToHistory(list, data.history, callback);
|
||||
}
|
||||
})
|
||||
.fail(function (xhr, status, error) {
|
||||
.fail((xhr, status, error) => {
|
||||
console.error(xhr.responseText);
|
||||
});
|
||||
}
|
||||
|
||||
function parseCookieToHistory(list, callback) {
|
||||
var notehistory = Cookies.getJSON('notehistory');
|
||||
const notehistory = Cookies.getJSON('notehistory');
|
||||
parseToHistory(list, notehistory, callback);
|
||||
}
|
||||
|
||||
function parseStorageToHistory(list, callback) {
|
||||
export function parseStorageToHistory(list, callback) {
|
||||
if (store.enabled) {
|
||||
var data = store.get('notehistory');
|
||||
let data = store.get('notehistory');
|
||||
if (data) {
|
||||
if (typeof data == "string")
|
||||
data = JSON.parse(data);
|
||||
|
|
@ -332,9 +329,9 @@ function parseToHistory(list, notehistory, callback) {
|
|||
if (!callback) return;
|
||||
else if (!list || !notehistory) callback(list, notehistory);
|
||||
else if (notehistory && notehistory.length > 0) {
|
||||
for (var i = 0; i < notehistory.length; i++) {
|
||||
for (let i = 0; i < notehistory.length; i++) {
|
||||
//parse time to timestamp and fromNow
|
||||
var timestamp = (typeof notehistory[i].time === 'number' ? moment(notehistory[i].time) : moment(notehistory[i].time, 'MMMM Do YYYY, h:mm:ss a'));
|
||||
const timestamp = (typeof notehistory[i].time === 'number' ? moment(notehistory[i].time) : moment(notehistory[i].time, 'MMMM Do YYYY, h:mm:ss a'));
|
||||
notehistory[i].timestamp = timestamp.valueOf();
|
||||
notehistory[i].fromNow = timestamp.fromNow();
|
||||
notehistory[i].time = timestamp.format('llll');
|
||||
|
|
@ -349,42 +346,23 @@ function parseToHistory(list, notehistory, callback) {
|
|||
callback(list, notehistory);
|
||||
}
|
||||
|
||||
function postHistoryToServer(noteId, data, callback) {
|
||||
$.post(serverurl + '/history/' + noteId, data)
|
||||
.done(function (result) {
|
||||
return callback(null, result);
|
||||
})
|
||||
.fail(function (xhr, status, error) {
|
||||
export function postHistoryToServer(noteId, data, callback) {
|
||||
$.post(`${serverurl}/history/${noteId}`, data)
|
||||
.done(result => callback(null, result))
|
||||
.fail((xhr, status, error) => {
|
||||
console.error(xhr.responseText);
|
||||
return callback(error, null);
|
||||
});
|
||||
}
|
||||
|
||||
function deleteServerHistory(noteId, callback) {
|
||||
export function deleteServerHistory(noteId, callback) {
|
||||
$.ajax({
|
||||
url: serverurl + '/history' + (noteId ? '/' + noteId : ""),
|
||||
url: `${serverurl}/history${noteId ? '/' + noteId : ""}`,
|
||||
type: 'DELETE'
|
||||
})
|
||||
.done(function (result) {
|
||||
return callback(null, result);
|
||||
})
|
||||
.fail(function (xhr, status, error) {
|
||||
.done(result => callback(null, result))
|
||||
.fail((xhr, status, error) => {
|
||||
console.error(xhr.responseText);
|
||||
return callback(error, null);
|
||||
});
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
writeHistory: writeHistory,
|
||||
parseHistory: parseHistory,
|
||||
getStorageHistory: getStorageHistory,
|
||||
getHistory: getHistory,
|
||||
saveHistory: saveHistory,
|
||||
removeHistory: removeHistory,
|
||||
parseStorageToHistory: parseStorageToHistory,
|
||||
postHistoryToServer: postHistoryToServer,
|
||||
deleteServerHistory: deleteServerHistory,
|
||||
parseServerToHistory: parseServerToHistory,
|
||||
saveStorageHistoryToServer: saveStorageHistoryToServer,
|
||||
clearDuplicatedHistory: clearDuplicatedHistory
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,52 +17,55 @@ 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;
|
||||
import {
|
||||
checkLoginStateChanged,
|
||||
setloginStateChangeEvent,
|
||||
debug,
|
||||
DROPBOX_APP_KEY,
|
||||
GOOGLE_API_KEY,
|
||||
GOOGLE_CLIENT_ID,
|
||||
noteid,
|
||||
noteurl,
|
||||
urlpath,
|
||||
version
|
||||
} from './common';
|
||||
|
||||
var checkLoginStateChanged = common.checkLoginStateChanged;
|
||||
var loginStateChangeEvent = common.loginStateChangeEvent;
|
||||
import {
|
||||
autoLinkify,
|
||||
deduplicatedHeaderId,
|
||||
exportToHTML,
|
||||
exportToRawHTML,
|
||||
finishView,
|
||||
generateToc,
|
||||
isValidURL,
|
||||
md,
|
||||
parseMeta,
|
||||
postProcess,
|
||||
renderFilename,
|
||||
renderTOC,
|
||||
renderTags,
|
||||
renderTitle,
|
||||
scrollToHash,
|
||||
smoothHashScroll,
|
||||
updateLastChange,
|
||||
updateLastChangeUser,
|
||||
updateOwner
|
||||
} from './extra';
|
||||
|
||||
var extra = require('./extra');
|
||||
var md = extra.md;
|
||||
var updateLastChange = extra.updateLastChange;
|
||||
var postProcess = extra.postProcess;
|
||||
var finishView = extra.finishView;
|
||||
var autoLinkify = extra.autoLinkify;
|
||||
var generateToc = extra.generateToc;
|
||||
var smoothHashScroll = extra.smoothHashScroll;
|
||||
var deduplicatedHeaderId = extra.deduplicatedHeaderId;
|
||||
var renderTOC = extra.renderTOC;
|
||||
var renderTitle = extra.renderTitle;
|
||||
var renderFilename = extra.renderFilename;
|
||||
var renderTags = extra.renderTags;
|
||||
var isValidURL = extra.isValidURL;
|
||||
var scrollToHash = extra.scrollToHash;
|
||||
var updateLastChangeUser = extra.updateLastChangeUser;
|
||||
var updateOwner = extra.updateOwner;
|
||||
var parseMeta = extra.parseMeta;
|
||||
var exportToHTML = extra.exportToHTML;
|
||||
var exportToRawHTML = extra.exportToRawHTML;
|
||||
import {
|
||||
clearMap,
|
||||
setupSyncAreas,
|
||||
syncScrollToEdit,
|
||||
syncScrollToView
|
||||
} from './syncscroll';
|
||||
|
||||
var syncScroll = require('./syncscroll');
|
||||
var setupSyncAreas = syncScroll.setupSyncAreas;
|
||||
var clearMap = syncScroll.clearMap;
|
||||
var syncScrollToEdit = syncScroll.syncScrollToEdit;
|
||||
var syncScrollToView = syncScroll.syncScrollToView;
|
||||
|
||||
var historyModule = require('./history');
|
||||
var writeHistory = historyModule.writeHistory;
|
||||
var deleteServerHistory = historyModule.deleteServerHistory;
|
||||
var getHistory = historyModule.getHistory;
|
||||
var saveHistory = historyModule.saveHistory;
|
||||
var removeHistory = historyModule.removeHistory;
|
||||
import {
|
||||
writeHistory,
|
||||
deleteServerHistory,
|
||||
getHistory,
|
||||
saveHistory,
|
||||
removeHistory
|
||||
} from './history';
|
||||
|
||||
var renderer = require('./render');
|
||||
var preventXSS = renderer.preventXSS;
|
||||
|
|
@ -962,10 +965,10 @@ function setNeedRefresh() {
|
|||
showStatus(statusType.offline);
|
||||
}
|
||||
|
||||
loginStateChangeEvent = function () {
|
||||
setloginStateChangeEvent(function () {
|
||||
setRefreshModal('user-state-changed');
|
||||
setNeedRefresh();
|
||||
};
|
||||
});
|
||||
|
||||
//visibility
|
||||
var wasFocus = false;
|
||||
|
|
@ -3693,6 +3696,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) {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
|
|
|||
|
|
@ -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('<pre') === 0) {
|
||||
return highlighted + '\n';
|
||||
return `${highlighted}\n`;
|
||||
}
|
||||
|
||||
if (tokens[idx].map && tokens[idx].level === 0) {
|
||||
var startline = tokens[idx].map[0] + 1;
|
||||
var endline = tokens[idx].map[1];
|
||||
return '<pre class="part" data-startline="' + startline + '" data-endline="' + endline + '"><code' + self.renderAttrs(token) + '>'
|
||||
+ highlighted
|
||||
+ '</code></pre>\n';
|
||||
const startline = tokens[idx].map[0] + 1;
|
||||
const endline = tokens[idx].map[1];
|
||||
return `<pre class="part" data-startline="${startline}" data-endline="${endline}"><code${self.renderAttrs(token)}>${highlighted}</code></pre>\n`;
|
||||
}
|
||||
|
||||
return '<pre><code' + self.renderAttrs(token) + '>'
|
||||
+ highlighted
|
||||
+ '</code></pre>\n';
|
||||
return `<pre><code${self.renderAttrs(token)}>${highlighted}</code></pre>\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 '<pre class="part" data-startline="' + startline + '" data-endline="' + endline + '"><code>' + md.utils.escapeHtml(tokens[idx].content) + '</code></pre>\n';
|
||||
const startline = tokens[idx].map[0] + 1;
|
||||
const endline = tokens[idx].map[1];
|
||||
return `<pre class="part" data-startline="${startline}" data-endline="${endline}"><code>${md.utils.escapeHtml(tokens[idx].content)}</code></pre>\n`;
|
||||
}
|
||||
return '<pre><code>' + md.utils.escapeHtml(tokens[idx].content) + '</code></pre>\n';
|
||||
return `<pre><code>${md.utils.escapeHtml(tokens[idx].content)}</code></pre>\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;
|
||||
let scrollMap, lineHeightMap, viewTop, viewBottom;
|
||||
|
||||
window.viewAjaxCallback = clearMap;
|
||||
|
||||
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
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue