Use JavaScript Standard Style (part 2)

Fixed all fail on frontend code.
This commit is contained in:
BoHong Li 2017-03-09 02:41:05 +08:00
parent 4889e9732d
commit 5bc642d02e
19 changed files with 6790 additions and 7032 deletions

View file

@ -1,7 +1,10 @@
require('./locale');
/* eslint-env browser, jquery */
/* global moment, serverurl */
require('../css/cover.css');
require('../css/site.css');
require('./locale')
require('../css/cover.css')
require('../css/site.css')
import {
checkIfAuth,
@ -9,7 +12,7 @@ import {
getLoginState,
resetCheckAuth,
setloginStateChangeEvent
} from './lib/common/login';
} from './lib/common/login'
import {
clearDuplicatedHistory,
@ -23,411 +26,403 @@ import {
removeHistory,
saveHistory,
saveStorageHistoryToServer
} from './history';
} from './history'
import { saveAs } from 'file-saver';
import List from 'list.js';
import S from 'string';
import { saveAs } from 'file-saver'
import List from 'list.js'
import S from 'string'
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>\
<a href="#">\
<div class="item">\
<div class="ui-history-pin fa fa-thumb-tack fa-fw"></div>\
<div class="ui-history-close fa fa-close fa-fw" data-toggle="modal" data-target=".delete-modal"></div>\
<div class="content">\
<h4 class="text"></h4>\
<p>\
<i><i class="fa fa-clock-o"></i> visited </i><i class="fromNow"></i>\
<br>\
<i class="timestamp" style="display:none;"></i>\
<i class="time"></i>\
</p>\
<p class="tags"></p>\
</div>\
</div>\
</a>\
</li>',
item: '<li class="col-xs-12 col-sm-6 col-md-6 col-lg-4">' +
'<span class="id" style="display:none;"></span>' +
'<a href="#">' +
'<div class="item">' +
'<div class="ui-history-pin fa fa-thumb-tack fa-fw"></div>' +
'<div class="ui-history-close fa fa-close fa-fw" data-toggle="modal" data-target=".delete-modal"></div>' +
'<div class="content">' +
'<h4 class="text"></h4>' +
'<p>' +
'<i><i class="fa fa-clock-o"></i> visited </i><i class="fromNow"></i>' +
'<br>' +
'<i class="timestamp" style="display:none;"></i>' +
'<i class="time"></i>' +
'</p>' +
'<p class="tags"></p>' +
'</div>' +
'</div>' +
'</a>' +
'</li>',
page: 18,
plugins: [
ListPagination({
window.ListPagination({
outerWindow: 1
})
]
};
const historyList = new List('history', options);
}
const historyList = new List('history', options)
migrateHistoryFromTempCallback = pageInit;
setloginStateChangeEvent(pageInit);
window.migrateHistoryFromTempCallback = pageInit
setloginStateChangeEvent(pageInit)
pageInit();
pageInit()
function pageInit () {
checkIfAuth(
data => {
$('.ui-signin').hide();
$('.ui-or').hide();
$('.ui-welcome').show();
if (data.photo) $('.ui-avatar').prop('src', data.photo).show();
else $('.ui-avatar').prop('src', '').hide();
$('.ui-name').html(data.name);
$('.ui-signout').show();
$(".ui-history").click();
parseServerToHistory(historyList, parseHistoryCallback);
$('.ui-signin').hide()
$('.ui-or').hide()
$('.ui-welcome').show()
if (data.photo) $('.ui-avatar').prop('src', data.photo).show()
else $('.ui-avatar').prop('src', '').hide()
$('.ui-name').html(data.name)
$('.ui-signout').show()
$('.ui-history').click()
parseServerToHistory(historyList, parseHistoryCallback)
},
() => {
$('.ui-signin').show();
$('.ui-or').show();
$('.ui-welcome').hide();
$('.ui-avatar').prop('src', '').hide();
$('.ui-name').html('');
$('.ui-signout').hide();
parseStorageToHistory(historyList, parseHistoryCallback);
$('.ui-signin').show()
$('.ui-or').show()
$('.ui-welcome').hide()
$('.ui-avatar').prop('src', '').hide()
$('.ui-name').html('')
$('.ui-signout').hide()
parseStorageToHistory(historyList, parseHistoryCallback)
}
);
)
}
$(".masthead-nav li").click(function () {
$(this).siblings().removeClass("active");
$(this).addClass("active");
});
$('.masthead-nav li').click(function () {
$(this).siblings().removeClass('active')
$(this).addClass('active')
})
// prevent empty link change hash
$('a[href="#"]').click(function (e) {
e.preventDefault();
});
e.preventDefault()
})
$(".ui-home").click(function (e) {
if (!$("#home").is(':visible')) {
$(".section:visible").hide();
$("#home").fadeIn();
$('.ui-home').click(function (e) {
if (!$('#home').is(':visible')) {
$('.section:visible').hide()
$('#home').fadeIn()
}
});
})
$(".ui-history").click(() => {
if (!$("#history").is(':visible')) {
$(".section:visible").hide();
$("#history").fadeIn();
$('.ui-history').click(() => {
if (!$('#history').is(':visible')) {
$('.section:visible').hide()
$('#history').fadeIn()
}
});
})
function checkHistoryList () {
if ($("#history-list").children().length > 0) {
$('.pagination').show();
$(".ui-nohistory").hide();
$(".ui-import-from-browser").hide();
} else if ($("#history-list").children().length == 0) {
$('.pagination').hide();
$(".ui-nohistory").slideDown();
if ($('#history-list').children().length > 0) {
$('.pagination').show()
$('.ui-nohistory').hide()
$('.ui-import-from-browser').hide()
} else if ($('#history-list').children().length === 0) {
$('.pagination').hide()
$('.ui-nohistory').slideDown()
getStorageHistory(data => {
if (data && data.length > 0 && getLoginState() && historyList.items.length == 0) {
$(".ui-import-from-browser").slideDown();
if (data && data.length > 0 && getLoginState() && historyList.items.length === 0) {
$('.ui-import-from-browser').slideDown()
}
});
})
}
}
function parseHistoryCallback (list, notehistory) {
checkHistoryList();
checkHistoryList()
// sort by pinned then timestamp
list.sort('', {
sortFunction (a, b) {
const notea = a.values();
const noteb = b.values();
const notea = a.values()
const noteb = b.values()
if (notea.pinned && !noteb.pinned) {
return -1;
return -1
} else if (!notea.pinned && noteb.pinned) {
return 1;
return 1
} else {
if (notea.timestamp > noteb.timestamp) {
return -1;
return -1
} else if (notea.timestamp < noteb.timestamp) {
return 1;
return 1
} else {
return 0;
return 0
}
}
}
});
})
// parse filter tags
const filtertags = [];
const filtertags = []
for (let i = 0, l = list.items.length; i < l; i++) {
const tags = list.items[i]._values.tags;
const tags = list.items[i]._values.tags
if (tags && tags.length > 0) {
for (let j = 0; j < tags.length; j++) {
// push info filtertags if not found
let found = false;
if (filtertags.includes(tags[j]))
found = true;
if (!found)
filtertags.push(tags[j]);
let found = false
if (filtertags.includes(tags[j])) { found = true }
if (!found) { filtertags.push(tags[j]) }
}
}
}
buildTagsFilter(filtertags);
buildTagsFilter(filtertags)
}
// update items whenever list updated
historyList.on('updated', e => {
for (let i = 0, l = e.items.length; i < l; i++) {
const item = e.items[i];
const item = e.items[i]
if (item.visible()) {
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");
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');
pin.addClass('active')
} else {
pin.removeClass('active');
pin.removeClass('active')
}
// parse tags
const tags = values.tags;
const tags = values.tags
if (tags && tags.length > 0 && tagsEl.children().length <= 0) {
const labels = [];
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(' '));
tagsEl.html(labels.join(' '))
}
}
}
$(".ui-history-close").off('click');
$(".ui-history-close").on('click', historyCloseClick);
$(".ui-history-pin").off('click');
$(".ui-history-pin").on('click', historyPinClick);
});
$('.ui-history-close').off('click')
$('.ui-history-close').on('click', historyCloseClick)
$('.ui-history-pin').off('click')
$('.ui-history-pin').on('click', historyPinClick)
})
function historyCloseClick (e) {
e.preventDefault();
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}`);
clearHistory = false;
deleteId = id;
e.preventDefault()
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}`)
clearHistory = false
deleteId = id
}
function historyPinClick (e) {
e.preventDefault();
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;
e.preventDefault()
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;
pinned = true
item._values.pinned = true
} else {
pinned = false;
item._values.pinned = false;
pinned = false
item._values.pinned = false
}
checkIfAuth(() => {
postHistoryToServer(id, {
pinned
}, (err, result) => {
if (!err) {
if (pinned)
$this.addClass('active');
else
$this.removeClass('active');
if (pinned) { $this.addClass('active') } else { $this.removeClass('active') }
}
});
})
}, () => {
getHistory(notehistory => {
for (let i = 0; i < notehistory.length; i++) {
if (notehistory[i].id == id) {
notehistory[i].pinned = pinned;
break;
if (notehistory[i].id === id) {
notehistory[i].pinned = pinned
break
}
}
saveHistory(notehistory);
if (pinned)
$this.addClass('active');
else
$this.removeClass('active');
});
});
saveHistory(notehistory)
if (pinned) { $this.addClass('active') } else { $this.removeClass('active') }
})
})
}
// auto update item fromNow every minutes
setInterval(updateItemFromNow, 60000);
setInterval(updateItemFromNow, 60000)
function updateItemFromNow () {
const items = $('.item').toArray();
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());
const item = $(items[i])
const timestamp = parseInt(item.find('.timestamp').text())
item.find('.fromNow').text(moment(timestamp).fromNow())
}
}
var clearHistory = false;
var deleteId = null;
var clearHistory = false
var deleteId = null
function deleteHistory () {
checkIfAuth(() => {
deleteServerHistory(deleteId, (err, result) => {
if (!err) {
if (clearHistory) {
historyList.clear();
checkHistoryList();
historyList.clear()
checkHistoryList()
} else {
historyList.remove('id', deleteId);
checkHistoryList();
historyList.remove('id', deleteId)
checkHistoryList()
}
}
$('.delete-modal').modal('hide');
deleteId = null;
clearHistory = false;
});
$('.delete-modal').modal('hide')
deleteId = null
clearHistory = false
})
}, () => {
if (clearHistory) {
saveHistory([]);
historyList.clear();
checkHistoryList();
deleteId = null;
saveHistory([])
historyList.clear()
checkHistoryList()
deleteId = null
} else {
if (!deleteId) return;
if (!deleteId) return
getHistory(notehistory => {
const newnotehistory = removeHistory(deleteId, notehistory);
saveHistory(newnotehistory);
historyList.remove('id', deleteId);
checkHistoryList();
deleteId = null;
});
const newnotehistory = removeHistory(deleteId, notehistory)
saveHistory(newnotehistory)
historyList.remove('id', deleteId)
checkHistoryList()
deleteId = null
})
}
$('.delete-modal').modal('hide');
clearHistory = false;
});
$('.delete-modal').modal('hide')
clearHistory = false
})
}
$(".ui-delete-modal-confirm").click(() => {
deleteHistory();
});
$('.ui-delete-modal-confirm').click(() => {
deleteHistory()
})
$(".ui-import-from-browser").click(() => {
$('.ui-import-from-browser').click(() => {
saveStorageHistoryToServer(() => {
parseStorageToHistory(historyList, parseHistoryCallback);
});
});
parseStorageToHistory(historyList, parseHistoryCallback)
})
})
$(".ui-save-history").click(() => {
$('.ui-save-history').click(() => {
getHistory(data => {
const history = JSON.stringify(data);
const history = JSON.stringify(data)
const blob = new Blob([history], {
type: "application/json;charset=utf-8"
});
saveAs(blob, `hackmd_history_${moment().format('YYYYMMDDHHmmss')}`, true);
});
});
type: 'application/json;charset=utf-8'
})
saveAs(blob, `hackmd_history_${moment().format('YYYYMMDDHHmmss')}`, true)
})
})
$(".ui-open-history").bind("change", e => {
const files = e.target.files || e.dataTransfer.files;
const file = files[0];
const reader = new FileReader();
$('.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);
const notehistory = JSON.parse(reader.result)
// console.log(notehistory);
if (!reader.result) return;
if (!reader.result) return
getHistory(data => {
let mergedata = data.concat(notehistory);
mergedata = clearDuplicatedHistory(mergedata);
saveHistory(mergedata);
parseHistory(historyList, parseHistoryCallback);
});
$(".ui-open-history").replaceWith($(".ui-open-history").val('').clone(true));
};
reader.readAsText(file);
});
let mergedata = data.concat(notehistory)
mergedata = clearDuplicatedHistory(mergedata)
saveHistory(mergedata)
parseHistory(historyList, parseHistoryCallback)
})
$('.ui-open-history').replaceWith($('.ui-open-history').val('').clone(true))
}
reader.readAsText(file)
})
$(".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-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(() => {
const lastTags = $(".ui-use-tags").select2('val');
$(".ui-use-tags").select2('val', '');
historyList.filter();
const lastKeyword = $('.search').val();
$('.search').val('');
historyList.search();
$('#history-list').slideUp('fast');
$('.pagination').hide();
$('.ui-refresh-history').click(() => {
const lastTags = $('.ui-use-tags').select2('val')
$('.ui-use-tags').select2('val', '')
historyList.filter()
const lastKeyword = $('.search').val()
$('.search').val('')
historyList.search()
$('#history-list').slideUp('fast')
$('.pagination').hide()
resetCheckAuth();
historyList.clear();
resetCheckAuth()
historyList.clear()
parseHistory(historyList, (list, notehistory) => {
parseHistoryCallback(list, notehistory);
$(".ui-use-tags").select2('val', lastTags);
$(".ui-use-tags").trigger('change');
historyList.search(lastKeyword);
$('.search').val(lastKeyword);
checkHistoryList();
$('#history-list').slideDown('fast');
});
});
parseHistoryCallback(list, notehistory)
$('.ui-use-tags').select2('val', lastTags)
$('.ui-use-tags').trigger('change')
historyList.search(lastKeyword)
$('.search').val(lastKeyword)
checkHistoryList()
$('#history-list').slideDown('fast')
})
})
$(".ui-logout").click(() => {
clearLoginState();
location.href = `${serverurl}/logout`;
});
$('.ui-logout').click(() => {
clearLoginState()
location.href = `${serverurl}/logout`
})
let filtertags = [];
$(".ui-use-tags").select2({
placeholder: $(".ui-use-tags").attr('placeholder'),
let filtertags = []
$('.ui-use-tags').select2({
placeholder: $('.ui-use-tags').attr('placeholder'),
multiple: true,
data () {
return {
results: filtertags
};
}
});
$('.select2-input').css('width', 'inherit');
buildTagsFilter([]);
}
})
$('.select2-input').css('width', 'inherit')
buildTagsFilter([])
function buildTagsFilter (tags) {
for (let i = 0; i < tags.length; i++)
for (let i = 0; i < tags.length; i++) {
tags[i] = {
id: i,
text: S(tags[i]).unescapeHTML().s
};
filtertags = tags;
}
$(".ui-use-tags").on('change', function () {
const tags = [];
const data = $(this).select2('data');
for (let i = 0; i < data.length; i++)
tags.push(data[i].text);
}
filtertags = tags
}
$('.ui-use-tags').on('change', function () {
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(item => {
const values = item.values();
if (!values.tags) return false;
let found = false;
const values = item.values()
if (!values.tags) return false
let found = false
for (let i = 0; i < tags.length; i++) {
if (values.tags.includes(tags[i])) {
found = true;
break;
found = true
break
}
}
return found;
});
return found
})
} else {
historyList.filter();
historyList.filter()
}
checkHistoryList();
});
checkHistoryList()
})
$('.search').keyup(() => {
checkHistoryList();
});
checkHistoryList()
})

File diff suppressed because it is too large Load diff

View file

@ -8,23 +8,23 @@
*/
var FilePicker = window.FilePicker = function (options) {
// Config
this.apiKey = options.apiKey;
this.clientId = options.clientId;
this.apiKey = options.apiKey
this.clientId = options.clientId
// Elements
this.buttonEl = options.buttonEl;
this.buttonEl = options.buttonEl
// Events
this.onSelect = options.onSelect;
this.buttonEl.on('click', this.open.bind(this));
this.onSelect = options.onSelect
this.buttonEl.on('click', this.open.bind(this))
// Disable the button until the API loads, as it won't work properly until then.
this.buttonEl.prop('disabled', true);
this.buttonEl.prop('disabled', true)
// Load the drive API
gapi.client.setApiKey(this.apiKey);
gapi.client.load('drive', 'v2', this._driveApiLoaded.bind(this));
google.load('picker', '1', { callback: this._pickerApiLoaded.bind(this) });
window.gapi.client.setApiKey(this.apiKey)
window.gapi.client.load('drive', 'v2', this._driveApiLoaded.bind(this))
window.google.load('picker', '1', { callback: this._pickerApiLoaded.bind(this) })
}
FilePicker.prototype = {
@ -33,13 +33,13 @@
*/
open: function () {
// Check if the user has already authenticated
var token = gapi.auth.getToken();
var token = window.gapi.auth.getToken()
if (token) {
this._showPicker();
this._showPicker()
} else {
// The user has not yet authenticated with Google
// We need to do the authentication before displaying the Drive picker.
this._doAuth(false, function() { this._showPicker(); }.bind(this));
this._doAuth(false, function () { this._showPicker() }.bind(this))
}
},
@ -48,19 +48,19 @@
* @private
*/
_showPicker: function () {
var accessToken = gapi.auth.getToken().access_token;
var view = new google.picker.DocsView();
view.setMimeTypes("text/markdown,text/html");
view.setIncludeFolders(true);
view.setOwnedByMe(true);
this.picker = new google.picker.PickerBuilder().
enableFeature(google.picker.Feature.NAV_HIDDEN).
addView(view).
setAppId(this.clientId).
setOAuthToken(accessToken).
setCallback(this._pickerCallback.bind(this)).
build().
setVisible(true);
var accessToken = window.gapi.auth.getToken().access_token
var view = new window.google.picker.DocsView()
view.setMimeTypes('text/markdown,text/html')
view.setIncludeFolders(true)
view.setOwnedByMe(true)
this.picker = new window.google.picker.PickerBuilder()
.enableFeature(window.google.picker.Feature.NAV_HIDDEN)
.addView(view)
.setAppId(this.clientId)
.setOAuthToken(accessToken)
.setCallback(this._pickerCallback.bind(this))
.build()
.setVisible(true)
},
/**
@ -68,14 +68,13 @@
* @private
*/
_pickerCallback: function (data) {
if (data[google.picker.Response.ACTION] == google.picker.Action.PICKED) {
var file = data[google.picker.Response.DOCUMENTS][0],
id = file[google.picker.Document.ID],
request = gapi.client.drive.files.get({
if (data[window.google.picker.Response.ACTION] === window.google.picker.Action.PICKED) {
var file = data[window.google.picker.Response.DOCUMENTS][0]
var id = file[window.google.picker.Document.ID]
var request = window.gapi.client.drive.files.get({
fileId: id
});
request.execute(this._fileGetCallback.bind(this));
})
request.execute(this._fileGetCallback.bind(this))
}
},
/**
@ -84,7 +83,7 @@
*/
_fileGetCallback: function (file) {
if (this.onSelect) {
this.onSelect(file);
this.onSelect(file)
}
},
@ -93,7 +92,7 @@
* @private
*/
_pickerApiLoaded: function () {
this.buttonEl.prop('disabled', false);
this.buttonEl.prop('disabled', false)
},
/**
@ -101,7 +100,7 @@
* @private
*/
_driveApiLoaded: function () {
this._doAuth(true);
this._doAuth(true)
},
/**
@ -109,11 +108,11 @@
* @private
*/
_doAuth: function (immediate, callback) {
gapi.auth.authorize({
window.gapi.auth.authorize({
client_id: this.clientId,
scope: 'https://www.googleapis.com/auth/drive.readonly',
immediate: immediate
}, callback ? callback : function() {});
}, callback || function () {})
}
};
}());
}
}())

View file

@ -1,3 +1,4 @@
/* eslint-env browser, jquery */
/**
* Helper for implementing retries with backoff. Initial retry
* delay is 1 second, increasing by 2x (+jitter) for subsequent retries
@ -5,9 +6,9 @@
* @constructor
*/
var RetryHandler = function () {
this.interval = 1000; // Start at one second
this.maxInterval = 60 * 1000; // Don't wait longer than a minute
};
this.interval = 1000 // Start at one second
this.maxInterval = 60 * 1000 // Don't wait longer than a minute
}
/**
* Invoke the function after waiting
@ -15,16 +16,16 @@ var RetryHandler = function() {
* @param {function} fn Function to invoke
*/
RetryHandler.prototype.retry = function (fn) {
setTimeout(fn, this.interval);
this.interval = this.nextInterval_();
};
setTimeout(fn, this.interval)
this.interval = this.nextInterval_()
}
/**
* Reset the counter (e.g. after successful request.)
*/
RetryHandler.prototype.reset = function () {
this.interval = 1000;
};
this.interval = 1000
}
/**
* Calculate the next wait time.
@ -33,9 +34,9 @@ RetryHandler.prototype.reset = function() {
* @private
*/
RetryHandler.prototype.nextInterval_ = function () {
var interval = this.interval * 2 + this.getRandomInt_(0, 1000);
return Math.min(interval, this.maxInterval);
};
var interval = this.interval * 2 + this.getRandomInt_(0, 1000)
return Math.min(interval, this.maxInterval)
}
/**
* Get a random int in the range of min to max. Used to add jitter to wait times.
@ -45,9 +46,8 @@ RetryHandler.prototype.nextInterval_ = function() {
* @private
*/
RetryHandler.prototype.getRandomInt_ = function (min, max) {
return Math.floor(Math.random() * (max - min + 1) + min);
};
return Math.floor(Math.random() * (max - min + 1) + min)
}
/**
* Helper class for resumable uploads using XHR/CORS. Can upload any Blob-like item, whether
@ -76,55 +76,54 @@ RetryHandler.prototype.getRandomInt_ = function(min, max) {
* @param {function} [options.onError] Callback if upload fails
*/
var MediaUploader = function (options) {
var noop = function() {};
this.file = options.file;
this.contentType = options.contentType || this.file.type || 'application/octet-stream';
var noop = function () {}
this.file = options.file
this.contentType = options.contentType || this.file.type || 'application/octet-stream'
this.metadata = options.metadata || {
'title': this.file.name,
'mimeType': this.contentType
};
this.token = options.token;
this.onComplete = options.onComplete || noop;
this.onProgress = options.onProgress || noop;
this.onError = options.onError || noop;
this.offset = options.offset || 0;
this.chunkSize = options.chunkSize || 0;
this.retryHandler = new RetryHandler();
this.url = options.url;
if (!this.url) {
var params = options.params || {};
params.uploadType = 'resumable';
this.url = this.buildUrl_(options.fileId, params, options.baseUrl);
}
this.httpMethod = options.fileId ? 'PUT' : 'POST';
};
this.token = options.token
this.onComplete = options.onComplete || noop
this.onProgress = options.onProgress || noop
this.onError = options.onError || noop
this.offset = options.offset || 0
this.chunkSize = options.chunkSize || 0
this.retryHandler = new RetryHandler()
this.url = options.url
if (!this.url) {
var params = options.params || {}
params.uploadType = 'resumable'
this.url = this.buildUrl_(options.fileId, params, options.baseUrl)
}
this.httpMethod = options.fileId ? 'PUT' : 'POST'
}
/**
* Initiate the upload.
*/
MediaUploader.prototype.upload = function () {
var self = this;
var xhr = new XMLHttpRequest();
var xhr = new XMLHttpRequest()
xhr.open(this.httpMethod, this.url, true);
xhr.setRequestHeader('Authorization', 'Bearer ' + this.token);
xhr.setRequestHeader('Content-Type', 'application/json');
xhr.setRequestHeader('X-Upload-Content-Length', this.file.size);
xhr.setRequestHeader('X-Upload-Content-Type', this.contentType);
xhr.open(this.httpMethod, this.url, true)
xhr.setRequestHeader('Authorization', 'Bearer ' + this.token)
xhr.setRequestHeader('Content-Type', 'application/json')
xhr.setRequestHeader('X-Upload-Content-Length', this.file.size)
xhr.setRequestHeader('X-Upload-Content-Type', this.contentType)
xhr.onload = function (e) {
if (e.target.status < 400) {
var location = e.target.getResponseHeader('Location');
this.url = location;
this.sendFile_();
var location = e.target.getResponseHeader('Location')
this.url = location
this.sendFile_()
} else {
this.onUploadError_(e);
this.onUploadError_(e)
}
}.bind(this)
xhr.onerror = this.onUploadError_.bind(this)
xhr.send(JSON.stringify(this.metadata))
}
}.bind(this);
xhr.onerror = this.onUploadError_.bind(this);
xhr.send(JSON.stringify(this.metadata));
};
/**
* Send the actual file content.
@ -132,29 +131,29 @@ MediaUploader.prototype.upload = function() {
* @private
*/
MediaUploader.prototype.sendFile_ = function () {
var content = this.file;
var end = this.file.size;
var content = this.file
var end = this.file.size
if (this.offset || this.chunkSize) {
// Only bother to slice the file if we're either resuming or uploading in chunks
if (this.chunkSize) {
end = Math.min(this.offset + this.chunkSize, this.file.size);
end = Math.min(this.offset + this.chunkSize, this.file.size)
}
content = content.slice(this.offset, end);
content = content.slice(this.offset, end)
}
var xhr = new XMLHttpRequest();
xhr.open('PUT', this.url, true);
xhr.setRequestHeader('Content-Type', this.contentType);
xhr.setRequestHeader('Content-Range', "bytes " + this.offset + "-" + (end - 1) + "/" + this.file.size);
xhr.setRequestHeader('X-Upload-Content-Type', this.file.type);
var xhr = new XMLHttpRequest()
xhr.open('PUT', this.url, true)
xhr.setRequestHeader('Content-Type', this.contentType)
xhr.setRequestHeader('Content-Range', 'bytes ' + this.offset + '-' + (end - 1) + '/' + this.file.size)
xhr.setRequestHeader('X-Upload-Content-Type', this.file.type)
if (xhr.upload) {
xhr.upload.addEventListener('progress', this.onProgress);
xhr.upload.addEventListener('progress', this.onProgress)
}
xhr.onload = this.onContentUploadSuccess_.bind(this)
xhr.onerror = this.onContentUploadError_.bind(this)
xhr.send(content)
}
xhr.onload = this.onContentUploadSuccess_.bind(this);
xhr.onerror = this.onContentUploadError_.bind(this);
xhr.send(content);
};
/**
* Query for the state of the file for resumption.
@ -162,17 +161,17 @@ MediaUploader.prototype.sendFile_ = function() {
* @private
*/
MediaUploader.prototype.resume_ = function () {
var xhr = new XMLHttpRequest();
xhr.open('PUT', this.url, true);
xhr.setRequestHeader('Content-Range', "bytes */" + this.file.size);
xhr.setRequestHeader('X-Upload-Content-Type', this.file.type);
var xhr = new XMLHttpRequest()
xhr.open('PUT', this.url, true)
xhr.setRequestHeader('Content-Range', 'bytes */' + this.file.size)
xhr.setRequestHeader('X-Upload-Content-Type', this.file.type)
if (xhr.upload) {
xhr.upload.addEventListener('progress', this.onProgress);
xhr.upload.addEventListener('progress', this.onProgress)
}
xhr.onload = this.onContentUploadSuccess_.bind(this)
xhr.onerror = this.onContentUploadError_.bind(this)
xhr.send()
}
xhr.onload = this.onContentUploadSuccess_.bind(this);
xhr.onerror = this.onContentUploadError_.bind(this);
xhr.send();
};
/**
* Extract the last saved range if available in the request.
@ -180,11 +179,11 @@ MediaUploader.prototype.resume_ = function() {
* @param {XMLHttpRequest} xhr Request object
*/
MediaUploader.prototype.extractRange_ = function (xhr) {
var range = xhr.getResponseHeader('Range');
var range = xhr.getResponseHeader('Range')
if (range) {
this.offset = parseInt(range.match(/\d+/g).pop(), 10) + 1;
this.offset = parseInt(range.match(/\d+/g).pop(), 10) + 1
}
}
};
/**
* Handle successful responses for uploads. Depending on the context,
@ -195,16 +194,16 @@ MediaUploader.prototype.extractRange_ = function(xhr) {
* @param {object} e XHR event
*/
MediaUploader.prototype.onContentUploadSuccess_ = function (e) {
if (e.target.status == 200 || e.target.status == 201) {
this.onComplete(e.target.response);
} else if (e.target.status == 308) {
this.extractRange_(e.target);
this.retryHandler.reset();
this.sendFile_();
if (e.target.status === 200 || e.target.status === 201) {
this.onComplete(e.target.response)
} else if (e.target.status === 308) {
this.extractRange_(e.target)
this.retryHandler.reset()
this.sendFile_()
} else {
this.onContentUploadError_(e);
this.onContentUploadError_(e)
}
}
};
/**
* Handles errors for uploads. Either retries or aborts depending
@ -215,11 +214,11 @@ MediaUploader.prototype.onContentUploadSuccess_ = function(e) {
*/
MediaUploader.prototype.onContentUploadError_ = function (e) {
if (e.target.status && e.target.status < 500) {
this.onError(e.target.response);
this.onError(e.target.response)
} else {
this.retryHandler.retry(this.resume_.bind(this));
this.retryHandler.retry(this.resume_.bind(this))
}
}
};
/**
* Handles errors for the initial request.
@ -228,8 +227,8 @@ MediaUploader.prototype.onContentUploadError_ = function(e) {
* @param {object} e XHR event
*/
MediaUploader.prototype.onUploadError_ = function (e) {
this.onError(e.target.response); // TODO - Retries for initial upload
};
this.onError(e.target.response) // TODO - Retries for initial upload
}
/**
* Construct a query string from a hash/object
@ -239,11 +238,11 @@ MediaUploader.prototype.onUploadError_ = function(e) {
* @return {string} query string
*/
MediaUploader.prototype.buildQuery_ = function (params) {
params = params || {};
params = params || {}
return Object.keys(params).map(function (key) {
return encodeURIComponent(key) + '=' + encodeURIComponent(params[key]);
}).join('&');
};
return encodeURIComponent(key) + '=' + encodeURIComponent(params[key])
}).join('&')
}
/**
* Build the drive upload URL
@ -254,15 +253,15 @@ MediaUploader.prototype.buildQuery_ = function(params) {
* @return {string} URL
*/
MediaUploader.prototype.buildUrl_ = function (id, params, baseUrl) {
var url = baseUrl || 'https://www.googleapis.com/upload/drive/v2/files/';
var url = baseUrl || 'https://www.googleapis.com/upload/drive/v2/files/'
if (id) {
url += id;
url += id
}
var query = this.buildQuery_(params);
var query = this.buildQuery_(params)
if (query) {
url += '?' + query;
url += '?' + query
}
return url
}
return url;
};
window.MediaUploader = MediaUploader;
window.MediaUploader = MediaUploader

View file

@ -1,125 +1,110 @@
import store from 'store';
import S from 'string';
/* eslint-env browser, jquery */
/* global serverurl, Cookies, moment */
import store from 'store'
import S from 'string'
import {
checkIfAuth
} from './lib/common/login';
} from './lib/common/login'
import {
urlpath
} from './lib/config';
} from './lib/config'
window.migrateHistoryFromTempCallback = null;
window.migrateHistoryFromTempCallback = null
migrateHistoryFromTemp();
migrateHistoryFromTemp()
function migrateHistoryFromTemp () {
if (url('#tempid')) {
if (window.url('#tempid')) {
$.get(`${serverurl}/temp`, {
tempid: url('#tempid')
tempid: window.url('#tempid')
})
.done(data => {
if (data && data.temp) {
getStorageHistory(olddata => {
if (!olddata || olddata.length == 0) {
saveHistoryToStorage(JSON.parse(data.temp));
if (!olddata || olddata.length === 0) {
saveHistoryToStorage(JSON.parse(data.temp))
}
});
})
}
})
.always(() => {
let hash = location.hash.split('#')[1];
hash = hash.split('&');
for (let i = 0; i < hash.length; i++)
if (hash[i].indexOf('tempid') == 0) {
hash.splice(i, 1);
i--;
let hash = location.hash.split('#')[1]
hash = hash.split('&')
for (let i = 0; i < hash.length; i++) {
if (hash[i].indexOf('tempid') === 0) {
hash.splice(i, 1)
i--
}
hash = hash.join('&');
location.hash = hash;
if (migrateHistoryFromTempCallback)
migrateHistoryFromTempCallback();
});
}
hash = hash.join('&')
location.hash = hash
if (window.migrateHistoryFromTempCallback) { window.migrateHistoryFromTempCallback() }
})
}
}
export function saveHistory (notehistory) {
checkIfAuth(
() => {
saveHistoryToServer(notehistory);
saveHistoryToServer(notehistory)
},
() => {
saveHistoryToStorage(notehistory);
saveHistoryToStorage(notehistory)
}
);
)
}
function saveHistoryToStorage (notehistory) {
if (store.enabled)
store.set('notehistory', JSON.stringify(notehistory));
else
saveHistoryToCookie(notehistory);
if (store.enabled) { store.set('notehistory', JSON.stringify(notehistory)) } else { saveHistoryToCookie(notehistory) }
}
function saveHistoryToCookie (notehistory) {
Cookies.set('notehistory', notehistory, {
expires: 365
});
})
}
function saveHistoryToServer (notehistory) {
$.post(`${serverurl}/history`, {
history: JSON.stringify(notehistory)
});
}
function saveCookieHistoryToStorage(callback) {
store.set('notehistory', Cookies.get('notehistory'));
callback();
})
}
export function saveStorageHistoryToServer (callback) {
const data = store.get('notehistory');
const data = store.get('notehistory')
if (data) {
$.post(`${serverurl}/history`, {
history: data
})
.done(data => {
callback(data);
});
}
}
function saveCookieHistoryToServer(callback) {
$.post(`${serverurl}/history`, {
history: Cookies.get('notehistory')
callback(data)
})
.done(data => {
callback(data);
});
}
}
export function clearDuplicatedHistory (notehistory) {
const newnotehistory = [];
const newnotehistory = []
for (let i = 0; i < notehistory.length; i++) {
let found = false;
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) {
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'));
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) {
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];
newnotehistory[j] = notehistory[i]
}
found = true;
break;
found = true
break
}
}
if (!found)
newnotehistory.push(notehistory[i]);
if (!found) { newnotehistory.push(notehistory[i]) }
}
return newnotehistory;
return newnotehistory
}
function addHistory (id, text, time, tags, pinned, notehistory) {
@ -131,19 +116,19 @@ function addHistory(id, text, time, tags, pinned, notehistory) {
time,
tags,
pinned
});
})
}
return notehistory;
return notehistory
}
export function removeHistory (id, notehistory) {
for (let i = 0; i < notehistory.length; i++) {
if (notehistory[i].id == id) {
notehistory.splice(i, 1);
i -= 1;
if (notehistory[i].id === id) {
notehistory.splice(i, 1)
i -= 1
}
}
return notehistory;
return notehistory
}
// used for inner
@ -154,219 +139,190 @@ export function writeHistory(title, tags) {
// writeHistoryToServer(title, tags);
},
() => {
writeHistoryToStorage(title, tags);
writeHistoryToStorage(title, tags)
}
);
}
function writeHistoryToServer(title, tags) {
$.get(`${serverurl}/history`)
.done(data => {
try {
if (data.history) {
var notehistory = data.history;
} else {
var notehistory = [];
}
} catch (err) {
var notehistory = [];
}
if (!notehistory)
notehistory = [];
const newnotehistory = generateHistory(title, tags, notehistory);
saveHistoryToServer(newnotehistory);
})
.fail((xhr, status, error) => {
console.error(xhr.responseText);
});
)
}
function writeHistoryToCookie (title, tags) {
var notehistory
try {
var notehistory = Cookies.getJSON('notehistory');
notehistory = Cookies.getJSON('notehistory')
} catch (err) {
var notehistory = [];
notehistory = []
}
if (!notehistory)
notehistory = [];
const newnotehistory = generateHistory(title, tags, notehistory);
saveHistoryToCookie(newnotehistory);
if (!notehistory) { notehistory = [] }
const newnotehistory = generateHistory(title, tags, notehistory)
saveHistoryToCookie(newnotehistory)
}
function writeHistoryToStorage (title, tags) {
if (store.enabled) {
let data = store.get('notehistory');
let data = store.get('notehistory')
var notehistory
if (data) {
if (typeof data == "string")
data = JSON.parse(data);
var notehistory = data;
} else
var notehistory = [];
if (!notehistory)
notehistory = [];
const newnotehistory = generateHistory(title, tags, notehistory);
saveHistoryToStorage(newnotehistory);
if (typeof data === 'string') { data = JSON.parse(data) }
notehistory = data
} else {
writeHistoryToCookie(title, tags);
notehistory = []
}
if (!notehistory) { notehistory = [] }
const newnotehistory = generateHistory(title, tags, notehistory)
saveHistoryToStorage(newnotehistory)
} else {
writeHistoryToCookie(title, tags)
}
}
if (!Array.isArray) {
Array.isArray = arg => Object.prototype.toString.call(arg) === '[object Array]';
Array.isArray = arg => Object.prototype.toString.call(arg) === '[object Array]'
}
function renderHistory (title, tags) {
// console.debug(tags);
const 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,
text: title,
time: moment().valueOf(),
tags
};
}
}
function generateHistory (title, tags, notehistory) {
const info = renderHistory(title, tags);
const info = renderHistory(title, tags)
// keep any pinned data
let pinned = false;
let pinned = false
for (let i = 0; i < notehistory.length; i++) {
if (notehistory[i].id == info.id && notehistory[i].pinned) {
pinned = true;
break;
if (notehistory[i].id === info.id && notehistory[i].pinned) {
pinned = true
break
}
}
notehistory = removeHistory(info.id, notehistory);
notehistory = addHistory(info.id, info.text, info.time, info.tags, pinned, notehistory);
notehistory = clearDuplicatedHistory(notehistory);
return notehistory;
notehistory = removeHistory(info.id, notehistory)
notehistory = addHistory(info.id, info.text, info.time, info.tags, pinned, notehistory)
notehistory = clearDuplicatedHistory(notehistory)
return notehistory
}
// used for outer
export function getHistory (callback) {
checkIfAuth(
() => {
getServerHistory(callback);
getServerHistory(callback)
},
() => {
getStorageHistory(callback);
getStorageHistory(callback)
}
);
)
}
function getServerHistory (callback) {
$.get(`${serverurl}/history`)
.done(data => {
if (data.history) {
callback(data.history);
callback(data.history)
}
})
.fail((xhr, status, error) => {
console.error(xhr.responseText);
});
console.error(xhr.responseText)
})
}
function getCookieHistory (callback) {
callback(Cookies.getJSON('notehistory'));
callback(Cookies.getJSON('notehistory'))
}
export function getStorageHistory (callback) {
if (store.enabled) {
let data = store.get('notehistory');
let data = store.get('notehistory')
if (data) {
if (typeof data == "string")
data = JSON.parse(data);
callback(data);
} else
getCookieHistory(callback);
if (typeof data === 'string') { data = JSON.parse(data) }
callback(data)
} else { getCookieHistory(callback) }
} else {
getCookieHistory(callback);
getCookieHistory(callback)
}
}
export function parseHistory (list, callback) {
checkIfAuth(
() => {
parseServerToHistory(list, callback);
parseServerToHistory(list, callback)
},
() => {
parseStorageToHistory(list, callback);
parseStorageToHistory(list, callback)
}
);
)
}
export function parseServerToHistory (list, callback) {
$.get(`${serverurl}/history`)
.done(data => {
if (data.history) {
parseToHistory(list, data.history, callback);
parseToHistory(list, data.history, callback)
}
})
.fail((xhr, status, error) => {
console.error(xhr.responseText);
});
console.error(xhr.responseText)
})
}
function parseCookieToHistory (list, callback) {
const notehistory = Cookies.getJSON('notehistory');
parseToHistory(list, notehistory, callback);
const notehistory = Cookies.getJSON('notehistory')
parseToHistory(list, notehistory, callback)
}
export function parseStorageToHistory (list, callback) {
if (store.enabled) {
let data = store.get('notehistory');
let data = store.get('notehistory')
if (data) {
if (typeof data == "string")
data = JSON.parse(data);
parseToHistory(list, data, callback);
} else
parseCookieToHistory(list, callback);
if (typeof data === 'string') { data = JSON.parse(data) }
parseToHistory(list, data, callback)
} else { parseCookieToHistory(list, callback) }
} else {
parseCookieToHistory(list, callback);
parseCookieToHistory(list, callback)
}
}
function parseToHistory (list, notehistory, callback) {
if (!callback) return;
else if (!list || !notehistory) callback(list, notehistory);
if (!callback) return
else if (!list || !notehistory) callback(list, notehistory)
else if (notehistory && notehistory.length > 0) {
for (let i = 0; i < notehistory.length; i++) {
// parse time to timestamp and fromNow
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');
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')
// prevent XSS
notehistory[i].text = S(notehistory[i].text).escapeHTML().s;
notehistory[i].tags = (notehistory[i].tags && notehistory[i].tags.length > 0) ? S(notehistory[i].tags).escapeHTML().s.split(',') : [];
notehistory[i].text = S(notehistory[i].text).escapeHTML().s
notehistory[i].tags = (notehistory[i].tags && notehistory[i].tags.length > 0) ? S(notehistory[i].tags).escapeHTML().s.split(',') : []
// add to list
if (notehistory[i].id && list.get('id', notehistory[i].id).length == 0)
list.add(notehistory[i]);
if (notehistory[i].id && list.get('id', notehistory[i].id).length === 0) { list.add(notehistory[i]) }
}
}
callback(list, notehistory);
callback(list, notehistory)
}
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);
});
console.error(xhr.responseText)
return callback(error, null)
})
}
export function deleteServerHistory (noteId, callback) {
$.ajax({
url: `${serverurl}/history${noteId ? '/' + noteId : ""}`,
url: `${serverurl}/history${noteId ? '/' + noteId : ''}`,
type: 'DELETE'
})
.done(result => callback(null, result))
.fail((xhr, status, error) => {
console.error(xhr.responseText);
return callback(error, null);
});
console.error(xhr.responseText)
return callback(error, null)
})
}

View file

@ -1,6 +1,6 @@
require('../css/github-extract.css');
require('../css/markdown.css');
require('../css/extra.css');
require('../css/slide-preview.css');
require('../css/google-font.css');
require('../css/site.css');
require('../css/github-extract.css')
require('../css/markdown.css')
require('../css/extra.css')
require('../css/slide-preview.css')
require('../css/google-font.css')
require('../css/site.css')

File diff suppressed because it is too large Load diff

View file

@ -1,82 +1,85 @@
import { serverurl } from '../config';
/* eslint-env browser, jquery */
/* global Cookies */
let checkAuth = false;
let profile = null;
let lastLoginState = getLoginState();
let lastUserId = getUserId();
var loginStateChangeEvent = null;
import { serverurl } from '../config'
let checkAuth = false
let profile = null
let lastLoginState = getLoginState()
let lastUserId = getUserId()
var loginStateChangeEvent = null
export function setloginStateChangeEvent (func) {
loginStateChangeEvent = func;
loginStateChangeEvent = func
}
export function resetCheckAuth () {
checkAuth = false;
checkAuth = false
}
export function setLoginState (bool, id) {
Cookies.set('loginstate', bool, {
expires: 365
});
})
if (id) {
Cookies.set('userid', id, {
expires: 365
});
})
} else {
Cookies.remove('userid');
Cookies.remove('userid')
}
lastLoginState = bool;
lastUserId = id;
checkLoginStateChanged();
lastLoginState = bool
lastUserId = id
checkLoginStateChanged()
}
export function checkLoginStateChanged () {
if (getLoginState() != lastLoginState || getUserId() != lastUserId) {
if (loginStateChangeEvent) setTimeout(loginStateChangeEvent, 100);
return true;
if (getLoginState() !== lastLoginState || getUserId() !== lastUserId) {
if (loginStateChangeEvent) setTimeout(loginStateChangeEvent, 100)
return true
} else {
return false;
return false
}
}
export function getLoginState () {
const state = Cookies.get('loginstate');
return state === "true" || state === true;
const state = Cookies.get('loginstate')
return state === 'true' || state === true
}
export function getUserId () {
return Cookies.get('userid');
return Cookies.get('userid')
}
export function clearLoginState () {
Cookies.remove('loginstate');
Cookies.remove('loginstate')
}
export function checkIfAuth (yesCallback, noCallback) {
const cookieLoginState = getLoginState();
if (checkLoginStateChanged()) checkAuth = false;
if (!checkAuth || typeof cookieLoginState == 'undefined') {
const cookieLoginState = getLoginState()
if (checkLoginStateChanged()) checkAuth = false
if (!checkAuth || typeof cookieLoginState === 'undefined') {
$.get(`${serverurl}/me`)
.done(data => {
if (data && data.status == 'ok') {
profile = data;
yesCallback(profile);
setLoginState(true, data.id);
if (data && data.status === 'ok') {
profile = data
yesCallback(profile)
setLoginState(true, data.id)
} else {
noCallback();
setLoginState(false);
noCallback()
setLoginState(false)
}
})
.fail(() => {
noCallback();
noCallback()
})
.always(() => {
checkAuth = true;
});
checkAuth = true
})
} else if (cookieLoginState) {
yesCallback(profile);
yesCallback(profile)
} else {
noCallback();
noCallback()
}
}
@ -86,4 +89,4 @@ export default {
lastLoginState,
lastUserId,
loginStateChangeEvent
};
}

View file

@ -1,19 +1,19 @@
import configJson from '../../../../config.json'; // root path json config
import configJson from '../../../../config.json' // root path json config
const config = 'production' === process.env.NODE_ENV ? configJson.production : configJson.development;
const config = process.env.NODE_ENV === 'production' ? configJson.production : configJson.development
export const GOOGLE_API_KEY = (config.google && config.google.apiKey) || '';
export const GOOGLE_CLIENT_ID = (config.google && config.google.clientID) || '';
export const DROPBOX_APP_KEY = (config.dropbox && config.dropbox.appKey) || '';
export const GOOGLE_API_KEY = (config.google && config.google.apiKey) || ''
export const GOOGLE_CLIENT_ID = (config.google && config.google.clientID) || ''
export const DROPBOX_APP_KEY = (config.dropbox && config.dropbox.appKey) || ''
export const domain = config.domain || ''; // domain name
export const urlpath = config.urlpath || ''; // sub url path, like: www.example.com/<urlpath>
export const debug = config.debug || false;
export const domain = config.domain || '' // domain name
export const urlpath = config.urlpath || '' // sub url path, like: www.example.com/<urlpath>
export const debug = config.debug || false
export const port = window.location.port;
export const serverurl = `${window.location.protocol}//${domain ? domain : window.location.hostname}${port ? ':' + port : ''}${urlpath ? '/' + urlpath : ''}`;
window.serverurl = serverurl;
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 port = window.location.port
export const serverurl = `${window.location.protocol}//${domain || window.location.hostname}${port ? ':' + port : ''}${urlpath ? '/' + urlpath : ''}`
window.serverurl = serverurl
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';
export const version = '0.5.0'

View file

@ -1,26 +1,28 @@
var lang = "en";
var userLang = navigator.language || navigator.userLanguage;
var userLangCode = userLang.split('-')[0];
var userCountryCode = userLang.split('-')[1];
var locale = $('.ui-locale');
var supportLangs = [];
$(".ui-locale option").each(function() {
supportLangs.push($(this).val());
});
/* eslint-env browser, jquery */
/* global Cookies */
var lang = 'en'
var userLang = navigator.language || navigator.userLanguage
var userLangCode = userLang.split('-')[0]
var locale = $('.ui-locale')
var supportLangs = []
$('.ui-locale option').each(function () {
supportLangs.push($(this).val())
})
if (Cookies.get('locale')) {
lang = Cookies.get('locale');
lang = Cookies.get('locale')
} else if (supportLangs.indexOf(userLang) !== -1) {
lang = supportLangs[supportLangs.indexOf(userLang)];
lang = supportLangs[supportLangs.indexOf(userLang)]
} else if (supportLangs.indexOf(userLangCode) !== -1) {
lang = supportLangs[supportLangs.indexOf(userLangCode)];
lang = supportLangs[supportLangs.indexOf(userLangCode)]
}
locale.val(lang);
$('select.ui-locale option[value="' + lang + '"]').attr('selected','selected');
locale.val(lang)
$('select.ui-locale option[value="' + lang + '"]').attr('selected', 'selected')
locale.change(function () {
Cookies.set('locale', $(this).val(), {
expires: 365
});
window.location.reload();
});
})
window.location.reload()
})

View file

@ -1,8 +1,11 @@
require('../css/extra.css');
require('../css/slide-preview.css');
require('../css/site.css');
/* eslint-env browser, jquery */
/* global refreshView */
require('highlight.js/styles/github-gist.css');
require('../css/extra.css')
require('../css/slide-preview.css')
require('../css/site.css')
require('highlight.js/styles/github-gist.css')
import {
autoLinkify,
@ -16,126 +19,126 @@ import {
scrollToHash,
smoothHashScroll,
updateLastChange
} from './extra';
} from './extra'
import { preventXSS } from './render';
import { preventXSS } from './render'
const markdown = $("#doc.markdown-body");
const text = markdown.text();
const lastMeta = md.meta;
md.meta = {};
delete md.metaError;
let rendered = md.render(text);
const markdown = $('#doc.markdown-body')
const text = markdown.text()
const lastMeta = md.meta
md.meta = {}
delete md.metaError
let rendered = md.render(text)
if (md.meta.type && md.meta.type === 'slide') {
const slideOptions = {
separator: '^(\r\n?|\n)---(\r\n?|\n)$',
verticalSeparator: '^(\r\n?|\n)----(\r\n?|\n)$'
};
const slides = RevealMarkdown.slidify(text, slideOptions);
markdown.html(slides);
RevealMarkdown.initialize();
}
const slides = window.RevealMarkdown.slidify(text, slideOptions)
markdown.html(slides)
window.RevealMarkdown.initialize()
// prevent XSS
markdown.html(preventXSS(markdown.html()));
markdown.addClass('slides');
markdown.html(preventXSS(markdown.html()))
markdown.addClass('slides')
} else {
if (lastMeta.type && lastMeta.type === 'slide') {
refreshView();
markdown.removeClass('slides');
refreshView()
markdown.removeClass('slides')
}
// only render again when meta changed
if (JSON.stringify(md.meta) != JSON.stringify(lastMeta)) {
parseMeta(md, null, markdown, $('#ui-toc'), $('#ui-toc-affix'));
rendered = md.render(text);
if (JSON.stringify(md.meta) !== JSON.stringify(lastMeta)) {
parseMeta(md, null, markdown, $('#ui-toc'), $('#ui-toc-affix'))
rendered = md.render(text)
}
// prevent XSS
rendered = preventXSS(rendered);
const result = postProcess(rendered);
markdown.html(result.html());
rendered = preventXSS(rendered)
const result = postProcess(rendered)
markdown.html(result.html())
}
$(document.body).show();
$(document.body).show()
finishView(markdown);
autoLinkify(markdown);
deduplicatedHeaderId(markdown);
renderTOC(markdown);
generateToc('ui-toc');
generateToc('ui-toc-affix');
smoothHashScroll();
createtime = lastchangeui.time.attr('data-createtime');
lastchangetime = lastchangeui.time.attr('data-updatetime');
updateLastChange();
finishView(markdown)
autoLinkify(markdown)
deduplicatedHeaderId(markdown)
renderTOC(markdown)
generateToc('ui-toc')
generateToc('ui-toc-affix')
smoothHashScroll()
window.createtime = window.lastchangeui.time.attr('data-createtime')
window.lastchangetime = window.lastchangeui.time.attr('data-updatetime')
updateLastChange()
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');
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(e => {
e.stopPropagation();
});
e.stopPropagation()
})
let enoughForAffixToc = true;
let enoughForAffixToc = true
function generateScrollspy () {
$(document.body).scrollspy({
target: ''
});
$(document.body).scrollspy('refresh');
})
$(document.body).scrollspy('refresh')
if (enoughForAffixToc) {
toc.hide();
tocAffix.show();
toc.hide()
tocAffix.show()
} else {
tocAffix.hide();
toc.show();
tocAffix.hide()
toc.show()
}
$(document.body).scroll();
$(document.body).scroll()
}
function windowResize () {
// toc right
const paddingRight = parseFloat(markdown.css('padding-right'));
const 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
let newbool;
const 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;
const affixLeftMargin = (tocAffix.outerWidth() - tocAffix.width()) / 2;
const left = markdown.offset().left + markdown.outerWidth() - affixLeftMargin;
tocAffix.css('left', `${left}px`);
newbool = true
const affixLeftMargin = (tocAffix.outerWidth() - tocAffix.width()) / 2
const left = markdown.offset().left + markdown.outerWidth() - affixLeftMargin
tocAffix.css('left', `${left}px`)
} else {
newbool = false;
newbool = false
}
if (newbool != enoughForAffixToc) {
enoughForAffixToc = newbool;
generateScrollspy();
if (newbool !== enoughForAffixToc) {
enoughForAffixToc = newbool
generateScrollspy()
}
}
$(window).resize(() => {
windowResize();
});
windowResize()
})
$(document).ready(() => {
windowResize();
generateScrollspy();
setTimeout(scrollToHash, 0);
windowResize()
generateScrollspy()
setTimeout(scrollToHash, 0)
// tooltip
$('[data-toggle="tooltip"]').tooltip();
});
$('[data-toggle="tooltip"]').tooltip()
})
export function scrollToTop () {
$('body, html').stop(true, true).animate({
scrollTop: 0
}, 100, "linear");
}, 100, 'linear')
}
export function scrollToBottom () {
$('body, html').stop(true, true).animate({
scrollTop: $(document.body)[0].scrollHeight
}, 100, "linear");
}, 100, 'linear')
}
window.scrollToTop = scrollToTop;
window.scrollToBottom = scrollToBottom;
window.scrollToTop = scrollToTop
window.scrollToBottom = scrollToBottom

View file

@ -1,62 +1,64 @@
/* eslint-env browser, jquery */
/* global filterXSS */
// allow some attributes
var whiteListAttr = ['id', 'class', 'style'];
window.whiteListAttr = whiteListAttr;
var whiteListAttr = ['id', 'class', 'style']
window.whiteListAttr = whiteListAttr
// allow link starts with '.', '/' and custom protocol with '://'
var linkRegex = /^([\w|-]+:\/\/)|^([\.|\/])+/;
var linkRegex = /^([\w|-]+:\/\/)|^([.|/])+/
// allow data uri, from https://gist.github.com/bgrins/6194623
var dataUriRegex = /^\s*data:([a-z]+\/[a-z0-9-+.]+(;[a-z-]+=[a-z0-9-]+)?)?(;base64)?,([a-z0-9!$&',()*+;=\-._~:@\/?%\s]*)\s*$/i;
var dataUriRegex = /^\s*data:([a-z]+\/[a-z0-9-+.]+(;[a-z-]+=[a-z0-9-]+)?)?(;base64)?,([a-z0-9!$&',()*+;=\-._~:@/?%\s]*)\s*$/i
// custom white list
var whiteList = filterXSS.whiteList;
var whiteList = filterXSS.whiteList
// allow ol specify start number
whiteList['ol'] = ['start'];
whiteList['ol'] = ['start']
// allow li specify value number
whiteList['li'] = ['value'];
whiteList['li'] = ['value']
// allow style tag
whiteList['style'] = [];
whiteList['style'] = []
// allow kbd tag
whiteList['kbd'] = [];
whiteList['kbd'] = []
// allow ifram tag with some safe attributes
whiteList['iframe'] = ['allowfullscreen', 'name', 'referrerpolicy', 'sandbox', 'src', 'srcdoc', 'width', 'height'];
whiteList['iframe'] = ['allowfullscreen', 'name', 'referrerpolicy', 'sandbox', 'src', 'srcdoc', 'width', 'height']
// allow summary tag
whiteList['summary'] = [];
whiteList['summary'] = []
var filterXSSOptions = {
allowCommentTag: true,
whiteList: whiteList,
escapeHtml: function (html) {
// allow html comment in multiple lines
return html.replace(/<(.*?)>/g, '&lt;$1&gt;');
return html.replace(/<(.*?)>/g, '&lt;$1&gt;')
},
onIgnoreTag: function (tag, html, options) {
// allow comment tag
if (tag == "!--") {
if (tag === '!--') {
// do not filter its attributes
return html;
return html
}
},
onTagAttr: function (tag, name, value, isWhiteAttr) {
// allow href and src that match linkRegex
if (isWhiteAttr && (name === 'href' || name === 'src') && linkRegex.test(value)) {
return name + '="' + filterXSS.escapeAttrValue(value) + '"';
return name + '="' + filterXSS.escapeAttrValue(value) + '"'
}
// allow data uri in img src
if (isWhiteAttr && (tag == "img" && name === 'src') && dataUriRegex.test(value)) {
return name + '="' + filterXSS.escapeAttrValue(value) + '"';
if (isWhiteAttr && (tag === 'img' && name === 'src') && dataUriRegex.test(value)) {
return name + '="' + filterXSS.escapeAttrValue(value) + '"'
}
},
onIgnoreTagAttr: function (tag, name, value, isWhiteAttr) {
// allow attr start with 'data-' or in the whiteListAttr
if (name.substr(0, 5) === 'data-' || whiteListAttr.indexOf(name) !== -1) {
if (name.substr(0, 5) === 'data-' || window.whiteListAttr.indexOf(name) !== -1) {
// escape its value using built-in escapeAttrValue function
return name + '="' + filterXSS.escapeAttrValue(value) + '"';
return name + '="' + filterXSS.escapeAttrValue(value) + '"'
}
}
}
};
function preventXSS (html) {
return filterXSS(html, filterXSSOptions);
return filterXSS(html, filterXSSOptions)
}
window.preventXSS = preventXSS;
window.preventXSS = preventXSS
module.exports = {
preventXSS: preventXSS

View file

@ -1,3 +1,8 @@
/* eslint-env browser, jquery */
import { preventXSS } from './render'
import { md } from './extra'
/**
* The reveal.js markdown plugin. Handles parsing of
* markdown inside of presentations as well as loading
@ -5,49 +10,43 @@
*/
(function (root, factory) {
if (typeof exports === 'object') {
module.exports = factory();
}
else {
module.exports = factory()
} else {
// Browser globals (root is window)
root.RevealMarkdown = factory();
root.RevealMarkdown.initialize();
root.RevealMarkdown = factory()
root.RevealMarkdown.initialize()
}
}(this, function () {
var DEFAULT_SLIDE_SEPARATOR = '^\r?\n---\r?\n$'
var DEFAULT_NOTES_SEPARATOR = 'note:'
var DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR = '\\.element\\s*?(.+?)$'
var DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR = '\\.slide:\\s*?(\\S.+?)$'
var DEFAULT_SLIDE_SEPARATOR = '^\r?\n---\r?\n$',
DEFAULT_NOTES_SEPARATOR = 'note:',
DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR = '\\\.element\\\s*?(.+?)$',
DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR = '\\\.slide:\\\s*?(\\\S.+?)$';
var SCRIPT_END_PLACEHOLDER = '__SCRIPT_END__';
var SCRIPT_END_PLACEHOLDER = '__SCRIPT_END__'
/**
* Retrieves the markdown contents of a slide section
* element. Normalizes leading tabs/whitespace.
*/
function getMarkdownFromSlide (section) {
var template = section.querySelector( 'script' );
var template = section.querySelector('script')
// strip leading whitespace so it isn't evaluated as code
var text = ( template || section ).textContent;
var text = (template || section).textContent
// restore script end tags
text = text.replace( new RegExp( SCRIPT_END_PLACEHOLDER, 'g' ), '</script>' );
text = text.replace(new RegExp(SCRIPT_END_PLACEHOLDER, 'g'), '</script>')
var leadingWs = text.match( /^\n?(\s*)/ )[1].length,
leadingTabs = text.match( /^\n?(\t*)/ )[1].length;
var leadingWs = text.match(/^\n?(\s*)/)[1].length
var leadingTabs = text.match(/^\n?(\t*)/)[1].length
if (leadingTabs > 0) {
text = text.replace( new RegExp('\\n?\\t{' + leadingTabs + '}','g'), '\n' );
}
else if( leadingWs > 1 ) {
text = text.replace( new RegExp('\\n? {' + leadingWs + '}', 'g'), '\n' );
text = text.replace(new RegExp('\\n?\\t{' + leadingTabs + '}', 'g'), '\n')
} else if (leadingWs > 1) {
text = text.replace(new RegExp('\\n? {' + leadingWs + '}', 'g'), '\n')
}
return text;
return text
}
/**
@ -57,27 +56,24 @@
* to the output markdown slide.
*/
function getForwardedAttributes (section) {
var attributes = section.attributes;
var result = [];
var attributes = section.attributes
var result = []
for (var i = 0, len = attributes.length; i < len; i++) {
var name = attributes[i].name,
value = attributes[i].value;
var name = attributes[i].name
var value = attributes[i].value
// disregard attributes that are used for markdown loading/parsing
if( /data\-(markdown|separator|vertical|notes)/gi.test( name ) ) continue;
if (/data-(markdown|separator|vertical|notes)/gi.test(name)) continue
if (value) {
result.push( name + '="' + value + '"' );
}
else {
result.push( name );
result.push(name + '="' + value + '"')
} else {
result.push(name)
}
}
return result.join( ' ' );
return result.join(' ')
}
/**
@ -85,35 +81,31 @@
* values for what's not defined.
*/
function getSlidifyOptions (options) {
options = options || {}
options.separator = options.separator || DEFAULT_SLIDE_SEPARATOR
options.notesSeparator = options.notesSeparator || DEFAULT_NOTES_SEPARATOR
options.attributes = options.attributes || ''
options = options || {};
options.separator = options.separator || DEFAULT_SLIDE_SEPARATOR;
options.notesSeparator = options.notesSeparator || DEFAULT_NOTES_SEPARATOR;
options.attributes = options.attributes || '';
return options;
return options
}
/**
* Helper function for constructing a markdown slide.
*/
function createMarkdownSlide (content, options) {
options = getSlidifyOptions(options)
options = getSlidifyOptions( options );
var notesMatch = content.split( new RegExp( options.notesSeparator, 'mgi' ) );
var notesMatch = content.split(new RegExp(options.notesSeparator, 'mgi'))
if (notesMatch.length === 2) {
content = notesMatch[0] + '<aside class="notes" data-markdown>' + notesMatch[1].trim() + '</aside>';
content = notesMatch[0] + '<aside class="notes" data-markdown>' + notesMatch[1].trim() + '</aside>'
}
// prevent script end tags in the content from interfering
// with parsing
content = content.replace( /<\/script>/g, SCRIPT_END_PLACEHOLDER );
return '<script type="text/template">' + content + '</script>';
content = content.replace(/<\/script>/g, SCRIPT_END_PLACEHOLDER)
return '<script type="text/template">' + content + '</script>'
}
/**
@ -121,71 +113,65 @@
* on the passed in separator arguments.
*/
function slidify (markdown, options) {
options = getSlidifyOptions(options)
options = getSlidifyOptions( options );
var separatorRegex = new RegExp(options.separator + (options.verticalSeparator ? '|' + options.verticalSeparator : ''), 'mg')
var horizontalSeparatorRegex = new RegExp(options.separator)
var separatorRegex = new RegExp( options.separator + ( options.verticalSeparator ? '|' + options.verticalSeparator : '' ), 'mg' ),
horizontalSeparatorRegex = new RegExp( options.separator );
var matches,
lastIndex = 0,
isHorizontal,
wasHorizontal = true,
content,
sectionStack = [];
var matches
var lastIndex = 0
var isHorizontal
var wasHorizontal = true
var content
var sectionStack = []
// iterate until all blocks between separators are stacked up
while( matches = separatorRegex.exec( markdown ) ) {
notes = null;
while ((matches = separatorRegex.exec(markdown)) !== null) {
// determine direction (horizontal by default)
isHorizontal = horizontalSeparatorRegex.test( matches[0] );
isHorizontal = horizontalSeparatorRegex.test(matches[0])
if (!isHorizontal && wasHorizontal) {
// create vertical stack
sectionStack.push( [] );
sectionStack.push([])
}
// pluck slide content from markdown input
content = markdown.substring( lastIndex, matches.index );
content = markdown.substring(lastIndex, matches.index)
if (isHorizontal && wasHorizontal) {
// add to horizontal stack
sectionStack.push( content );
}
else {
sectionStack.push(content)
} else {
// add to vertical stack
sectionStack[sectionStack.length-1].push( content );
sectionStack[sectionStack.length - 1].push(content)
}
lastIndex = separatorRegex.lastIndex;
wasHorizontal = isHorizontal;
lastIndex = separatorRegex.lastIndex
wasHorizontal = isHorizontal
}
// add the remaining slide
( wasHorizontal ? sectionStack : sectionStack[sectionStack.length-1] ).push( markdown.substring( lastIndex ) );
(wasHorizontal ? sectionStack : sectionStack[sectionStack.length - 1]).push(markdown.substring(lastIndex))
var markdownSections = '';
var markdownSections = ''
// flatten the hierarchical stack, and insert <section data-markdown> tags
for (var i = 0, len = sectionStack.length; i < len; i++) {
// vertical
if (sectionStack[i] instanceof Array) {
markdownSections += '<section '+ options.attributes +'>';
markdownSections += '<section ' + options.attributes + '>'
sectionStack[i].forEach(function (child) {
markdownSections += '<section data-markdown>' + createMarkdownSlide( child, options ) + '</section>';
} );
markdownSections += '<section data-markdown>' + createMarkdownSlide(child, options) + '</section>'
})
markdownSections += '</section>';
}
else {
markdownSections += '<section '+ options.attributes +' data-markdown>' + createMarkdownSlide( sectionStack[i], options ) + '</section>';
markdownSections += '</section>'
} else {
markdownSections += '<section ' + options.attributes + ' data-markdown>' + createMarkdownSlide(sectionStack[i], options) + '</section>'
}
}
return markdownSections;
return markdownSections
}
/**
@ -194,76 +180,61 @@
* handles loading of external markdown.
*/
function processSlides () {
var sections = document.querySelectorAll( '[data-markdown]'),
section;
var sections = document.querySelectorAll('[data-markdown]')
var section
for (var i = 0, len = sections.length; i < len; i++) {
section = sections[i];
section = sections[i]
if (section.getAttribute('data-markdown').length) {
var xhr = new XMLHttpRequest()
var url = section.getAttribute('data-markdown')
var xhr = new XMLHttpRequest(),
url = section.getAttribute( 'data-markdown' );
datacharset = section.getAttribute( 'data-charset' );
var datacharset = section.getAttribute('data-charset')
// see https://developer.mozilla.org/en-US/docs/Web/API/element.getAttribute#Notes
if( datacharset != null && datacharset != '' ) {
xhr.overrideMimeType( 'text/html; charset=' + datacharset );
if (datacharset !== null && datacharset !== '') {
xhr.overrideMimeType('text/html; charset=' + datacharset)
}
xhr.onreadystatechange = function () {
if (xhr.readyState === 4) {
// file protocol yields status code 0 (useful for local debug, mobile applications etc.)
if ((xhr.status >= 200 && xhr.status < 300) || xhr.status === 0) {
section.outerHTML = slidify(xhr.responseText, {
separator: section.getAttribute('data-separator'),
verticalSeparator: section.getAttribute('data-separator-vertical'),
notesSeparator: section.getAttribute('data-separator-notes'),
attributes: getForwardedAttributes(section)
});
}
else {
})
} else {
section.outerHTML = '<section data-state="alert">' +
'ERROR: The attempt to fetch ' + url + ' failed with HTTP status ' + xhr.status + '.' +
'Check your browser\'s JavaScript console for more details.' +
'<p>Remember that you need to serve the presentation HTML from a HTTP server.</p>' +
'</section>';
'</section>'
}
}
}
};
xhr.open( 'GET', url, false );
xhr.open('GET', url, false)
try {
xhr.send();
xhr.send()
} catch (e) {
alert('Failed to get the Markdown file ' + url + '. Make sure that the presentation and the file are served by a HTTP server and the file can be found there. ' + e)
}
catch ( e ) {
alert( 'Failed to get the Markdown file ' + url + '. Make sure that the presentation and the file are served by a HTTP server and the file can be found there. ' + e );
}
}
else if( section.getAttribute( 'data-separator' ) || section.getAttribute( 'data-separator-vertical' ) || section.getAttribute( 'data-separator-notes' ) ) {
} else if (section.getAttribute('data-separator') || section.getAttribute('data-separator-vertical') || section.getAttribute('data-separator-notes')) {
section.outerHTML = slidify(getMarkdownFromSlide(section), {
separator: section.getAttribute('data-separator'),
verticalSeparator: section.getAttribute('data-separator-vertical'),
notesSeparator: section.getAttribute('data-separator-notes'),
attributes: getForwardedAttributes(section)
});
}
else {
section.innerHTML = createMarkdownSlide( getMarkdownFromSlide( section ) );
})
} else {
section.innerHTML = createMarkdownSlide(getMarkdownFromSlide(section))
}
}
}
/**
@ -276,24 +247,23 @@
* http://stackoverflow.com/questions/5690269/disabling-chrome-cache-for-website-development/7000899#answer-11786277
*/
function addAttributeInElement (node, elementTarget, separator) {
var mardownClassesInElementsRegex = new RegExp( separator, 'mg' );
var mardownClassRegex = new RegExp( "([^\"= ]+?)=\"([^\"=]+?)\"", 'mg' );
var nodeValue = node.nodeValue;
if( matches = mardownClassesInElementsRegex.exec( nodeValue ) ) {
var classes = matches[1];
nodeValue = nodeValue.substring( 0, matches.index ) + nodeValue.substring( mardownClassesInElementsRegex.lastIndex );
node.nodeValue = nodeValue;
while( matchesClass = mardownClassRegex.exec( classes ) ) {
var name = matchesClass[1];
var value = matchesClass[2];
if (name.substr(0, 5) === 'data-' || whiteListAttr.indexOf(name) !== -1)
elementTarget.setAttribute( name, filterXSS.escapeAttrValue(value) );
var mardownClassesInElementsRegex = new RegExp(separator, 'mg')
var mardownClassRegex = new RegExp('([^"= ]+?)="([^"=]+?)"', 'mg')
var nodeValue = node.nodeValue
var matches
var matchesClass
if ((matches = mardownClassesInElementsRegex.exec(nodeValue))) {
var classes = matches[1]
nodeValue = nodeValue.substring(0, matches.index) + nodeValue.substring(mardownClassesInElementsRegex.lastIndex)
node.nodeValue = nodeValue
while ((matchesClass = mardownClassRegex.exec(classes))) {
var name = matchesClass[1]
var value = matchesClass[2]
if (name.substr(0, 5) === 'data-' || window.whiteListAttr.indexOf(name) !== -1) { elementTarget.setAttribute(name, window.filterXSS.escapeAttrValue(value)) }
}
return true;
return true
}
return false;
return false
}
/**
@ -301,36 +271,35 @@
* or the element of an attribute node.
*/
function addAttributes (section, element, previousElement, separatorElementAttributes, separatorSectionAttributes) {
if ( element != null && element.childNodes != undefined && element.childNodes.length > 0 ) {
previousParentElement = element;
if (element != null && element.childNodes !== undefined && element.childNodes.length > 0) {
var previousParentElement = element
for (var i = 0; i < element.childNodes.length; i++) {
childElement = element.childNodes[i];
var childElement = element.childNodes[i]
if (i > 0) {
j = i - 1;
let j = i - 1
while (j >= 0) {
aPreviousChildElement = element.childNodes[j];
if ( typeof aPreviousChildElement.setAttribute == 'function' && aPreviousChildElement.tagName != "BR" ) {
previousParentElement = aPreviousChildElement;
break;
var aPreviousChildElement = element.childNodes[j]
if (typeof aPreviousChildElement.setAttribute === 'function' && aPreviousChildElement.tagName !== 'BR') {
previousParentElement = aPreviousChildElement
break
}
j = j - 1;
j = j - 1
}
}
parentSection = section;
if( childElement.nodeName == "section" ) {
parentSection = childElement ;
previousParentElement = childElement ;
var parentSection = section
if (childElement.nodeName === 'section') {
parentSection = childElement
previousParentElement = childElement
}
if ( typeof childElement.setAttribute == 'function' || childElement.nodeType == Node.COMMENT_NODE ) {
addAttributes( parentSection, childElement, previousParentElement, separatorElementAttributes, separatorSectionAttributes );
if (typeof childElement.setAttribute === 'function' || childElement.nodeType === Node.COMMENT_NODE) {
addAttributes(parentSection, childElement, previousParentElement, separatorElementAttributes, separatorSectionAttributes)
}
}
}
if ( element.nodeType == Node.COMMENT_NODE ) {
if ( addAttributeInElement( element, previousElement, separatorElementAttributes ) == false ) {
addAttributeInElement( element, section, separatorSectionAttributes );
if (element.nodeType === Node.COMMENT_NODE) {
if (addAttributeInElement(element, previousElement, separatorElementAttributes) === false) {
addAttributeInElement(element, section, separatorSectionAttributes)
}
}
}
@ -340,57 +309,47 @@
* DOM to HTML.
*/
function convertSlides () {
var sections = document.querySelectorAll( '[data-markdown]');
var sections = document.querySelectorAll('[data-markdown]')
for (var i = 0, len = sections.length; i < len; i++) {
var section = sections[i];
var section = sections[i]
// Only parse the same slide once
if (!section.getAttribute('data-markdown-parsed')) {
section.setAttribute('data-markdown-parsed', true)
var notes = section.querySelector( 'aside.notes' );
var markdown = getMarkdownFromSlide( section );
var notes = section.querySelector('aside.notes')
var markdown = getMarkdownFromSlide(section)
var rendered = md.render(markdown);
rendered = preventXSS(rendered);
var result = postProcess(rendered);
section.innerHTML = result[0].outerHTML;
var rendered = md.render(markdown)
rendered = preventXSS(rendered)
var result = window.postProcess(rendered)
section.innerHTML = result[0].outerHTML
addAttributes(section, section, null, section.getAttribute('data-element-attributes') ||
section.parentNode.getAttribute('data-element-attributes') ||
DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR,
section.getAttribute('data-attributes') ||
section.parentNode.getAttribute('data-attributes') ||
DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR);
DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR)
// If there were notes, we need to re-add them after
// having overwritten the section's HTML
if (notes) {
section.appendChild( notes );
section.appendChild(notes)
}
}
}
}
// API
return {
initialize: function () {
processSlides();
convertSlides();
processSlides()
convertSlides()
},
// TODO: Do these belong in the API?
processSlides: processSlides,
convertSlides: convertSlides,
slidify: slidify
};
}));
}
}))

View file

@ -1,42 +1,43 @@
require('../css/extra.css');
require('../css/site.css');
/* eslint-env browser, jquery */
/* global serverurl, Reveal */
import { md, updateLastChange, finishView } from './extra';
require('../css/extra.css')
require('../css/site.css')
import { preventXSS } from './render';
import { md, updateLastChange, finishView } from './extra'
const body = $(".slides").text();
const body = $('.slides').text()
createtime = lastchangeui.time.attr('data-createtime');
lastchangetime = lastchangeui.time.attr('data-updatetime');
updateLastChange();
const url = window.location.pathname;
$('.ui-edit').attr('href', `${url}/edit`);
window.createtime = window.lastchangeui.time.attr('data-createtime')
window.lastchangetime = window.lastchangeui.time.attr('data-updatetime')
updateLastChange()
const url = window.location.pathname
$('.ui-edit').attr('href', `${url}/edit`)
$(document).ready(() => {
// tooltip
$('[data-toggle="tooltip"]').tooltip();
});
$('[data-toggle="tooltip"]').tooltip()
})
function extend () {
const target = {};
const target = {}
for (const source of arguments) {
for (const key in source) {
if (source.hasOwnProperty(key)) {
target[key] = source[key];
target[key] = source[key]
}
}
}
return target;
return target
}
// Optional libraries used to extend on reveal.js
const deps = [{
src: `${serverurl}/build/reveal.js/lib/js/classList.js`,
condition () {
return !document.body.classList;
return !document.body.classList
}
}, {
src: `${serverurl}/js/reveal-markdown.js`,
@ -44,19 +45,19 @@ const deps = [{
const slideOptions = {
separator: '^(\r\n?|\n)---(\r\n?|\n)$',
verticalSeparator: '^(\r\n?|\n)----(\r\n?|\n)$'
};
const slides = RevealMarkdown.slidify(body, slideOptions);
$(".slides").html(slides);
RevealMarkdown.initialize();
$(".slides").show();
}
const slides = window.RevealMarkdown.slidify(body, slideOptions)
$('.slides').html(slides)
window.RevealMarkdown.initialize()
$('.slides').show()
}
}, {
src: `${serverurl}/build/reveal.js/plugin/notes/notes.js`,
async: true,
condition () {
return !!document.body.classList;
return !!document.body.classList
}
}];
}]
// default options to init reveal.js
const defaultOptions = {
@ -67,72 +68,72 @@ const defaultOptions = {
center: true,
transition: 'none',
dependencies: deps
};
}
// options from yaml meta
const meta = JSON.parse($("#meta").text());
var options = meta.slideOptions || {};
const meta = JSON.parse($('#meta').text())
var options = meta.slideOptions || {}
const view = $('.reveal');
const view = $('.reveal')
// text language
if (meta.lang && typeof meta.lang == "string") {
view.attr('lang', meta.lang);
if (meta.lang && typeof meta.lang === 'string') {
view.attr('lang', meta.lang)
} else {
view.removeAttr('lang');
view.removeAttr('lang')
}
// text direction
if (meta.dir && typeof meta.dir == "string" && meta.dir == "rtl") {
options.rtl = true;
if (meta.dir && typeof meta.dir === 'string' && meta.dir === 'rtl') {
options.rtl = true
} else {
options.rtl = false;
options.rtl = false
}
// breaks
if (typeof meta.breaks === 'boolean' && !meta.breaks) {
md.options.breaks = false;
md.options.breaks = false
} else {
md.options.breaks = true;
md.options.breaks = true
}
// options from URL query string
const queryOptions = Reveal.getQueryHash() || {};
const queryOptions = Reveal.getQueryHash() || {}
var options = extend(defaultOptions, options, queryOptions);
Reveal.initialize(options);
options = extend(defaultOptions, options, queryOptions)
Reveal.initialize(options)
window.viewAjaxCallback = () => {
Reveal.layout();
};
Reveal.layout()
}
function renderSlide (event) {
if (window.location.search.match(/print-pdf/gi)) {
const slides = $('.slides');
var title = document.title;
finishView(slides);
document.title = title;
Reveal.layout();
const slides = $('.slides')
let title = document.title
finishView(slides)
document.title = title
Reveal.layout()
} else {
const markdown = $(event.currentSlide);
const markdown = $(event.currentSlide)
if (!markdown.attr('data-rendered')) {
var title = document.title;
finishView(markdown);
markdown.attr('data-rendered', 'true');
document.title = title;
Reveal.layout();
let title = document.title
finishView(markdown)
markdown.attr('data-rendered', 'true')
document.title = title
Reveal.layout()
}
}
}
Reveal.addEventListener('ready', event => {
renderSlide(event);
const markdown = $(event.currentSlide);
renderSlide(event)
const markdown = $(event.currentSlide)
// force browser redraw
setTimeout(() => {
markdown.hide().show(0);
}, 0);
});
Reveal.addEventListener('slidechanged', renderSlide);
markdown.hide().show(0)
}, 0)
})
Reveal.addEventListener('slidechanged', renderSlide)
const isMacLike = navigator.platform.match(/(Mac|iPhone|iPod|iPad)/i) ? true : false;
const isMacLike = !!navigator.platform.match(/(Mac|iPhone|iPod|iPad)/i)
if (!isMacLike) $('.container').addClass('hidescrollbar');
if (!isMacLike) $('.container').addClass('hidescrollbar')

View file

@ -1,365 +1,367 @@
/* eslint-env browser, jquery */
/* global _ */
// Inject line numbers for sync scroll.
import markdownitContainer from 'markdown-it-container';
import markdownitContainer from 'markdown-it-container'
import { md } from './extra';
import { md } from './extra'
function addPart (tokens, idx) {
if (tokens[idx].map && tokens[idx].level === 0) {
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);
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)
}
}
md.renderer.rules.blockquote_open = function (tokens, idx, options, env, self) {
tokens[idx].attrJoin('class', 'raw');
addPart(tokens, idx);
return self.renderToken(...arguments);
};
md.renderer.rules.table_open = function (tokens, idx, options, env, self) {
addPart(tokens, idx);
return self.renderToken(...arguments);
};
md.renderer.rules.bullet_list_open = function (tokens, idx, options, env, self) {
addPart(tokens, idx);
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) {
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);
tokens[idx].attrJoin('class', 'raw')
addPart(tokens, idx)
return self.renderToken(...arguments)
}
md.renderer.rules.table_open = function (tokens, idx, options, env, self) {
addPart(tokens, idx)
return self.renderToken(...arguments)
}
md.renderer.rules.bullet_list_open = function (tokens, idx, options, env, self) {
addPart(tokens, idx)
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) {
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(...arguments)
}
return self.renderToken(...arguments);
};
md.renderer.rules.ordered_list_open = function (tokens, idx, options, env, self) {
addPart(tokens, idx);
return self.renderToken(...arguments);
};
addPart(tokens, idx)
return self.renderToken(...arguments)
}
md.renderer.rules.link_open = function (tokens, idx, options, env, self) {
addPart(tokens, idx);
return self.renderToken(...arguments);
};
addPart(tokens, idx)
return self.renderToken(...arguments)
}
md.renderer.rules.paragraph_open = function (tokens, idx, options, env, self) {
addPart(tokens, idx);
return self.renderToken(...arguments);
};
addPart(tokens, idx)
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(...arguments);
};
tokens[idx].attrJoin('class', 'raw')
addPart(tokens, idx)
return self.renderToken(...arguments)
}
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;
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];
if (/\!$/.test(info)) token.attrJoin('class', 'wrap');
token.attrJoin('class', options.langPrefix + langName.replace(/\=$|\=\d+$|\=\+$|\!$|\=\!/, ''));
token.attrJoin('class', 'hljs');
token.attrJoin('class', 'raw');
langName = info.split(/\s+/g)[0]
if (/!$/.test(info)) token.attrJoin('class', 'wrap')
token.attrJoin('class', options.langPrefix + langName.replace(/=$|=\d+$|=\+$|!$|=!/, ''))
token.attrJoin('class', 'hljs')
token.attrJoin('class', 'raw')
}
if (options.highlight) {
highlighted = options.highlight(token.content, langName) || md.utils.escapeHtml(token.content);
highlighted = options.highlight(token.content, langName) || md.utils.escapeHtml(token.content)
} else {
highlighted = md.utils.escapeHtml(token.content);
highlighted = md.utils.escapeHtml(token.content)
}
if (highlighted.indexOf('<pre') === 0) {
return `${highlighted}\n`;
return `${highlighted}\n`
}
if (tokens[idx].map && tokens[idx].level === 0) {
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`;
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 = (tokens, idx, options, env, self) => {
if (tokens[idx].map && tokens[idx].level === 0) {
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`;
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()}`);
addPart(tokens, idx);
return self.renderToken(...arguments);
tokens[idx].attrJoin('role', 'alert')
tokens[idx].attrJoin('class', 'alert')
tokens[idx].attrJoin('class', `alert-${tokens[idx].info.trim()}`)
addPart(tokens, idx)
return self.renderToken(...arguments)
}
md.use(markdownitContainer, 'success', { render: renderContainer });
md.use(markdownitContainer, 'info', { render: renderContainer });
md.use(markdownitContainer, 'warning', { render: renderContainer });
md.use(markdownitContainer, 'danger', { render: renderContainer });
md.use(markdownitContainer, 'success', { render: renderContainer })
md.use(markdownitContainer, 'info', { render: renderContainer })
md.use(markdownitContainer, 'warning', { render: renderContainer })
md.use(markdownitContainer, 'danger', { render: renderContainer })
// FIXME: expose syncscroll to window
window.syncscroll = true;
window.syncscroll = true
window.preventSyncScrollToEdit = false;
window.preventSyncScrollToView = false;
window.preventSyncScrollToEdit = false
window.preventSyncScrollToView = false
const editScrollThrottle = 5;
const viewScrollThrottle = 5;
const buildMapThrottle = 100;
const editScrollThrottle = 5
const viewScrollThrottle = 5
const buildMapThrottle = 100
let viewScrolling = false;
let editScrolling = false;
let viewScrolling = false
let editScrolling = false
let editArea = null;
let viewArea = null;
let markdownArea = null;
let editArea = null
let viewArea = null
let markdownArea = null
export function setupSyncAreas (edit, view, markdown) {
editArea = edit;
viewArea = view;
markdownArea = markdown;
editArea.on('scroll', _.throttle(syncScrollToView, editScrollThrottle));
viewArea.on('scroll', _.throttle(syncScrollToEdit, viewScrollThrottle));
editArea = edit
viewArea = view
markdownArea = markdown
editArea.on('scroll', _.throttle(syncScrollToView, editScrollThrottle))
viewArea.on('scroll', _.throttle(syncScrollToEdit, viewScrollThrottle))
}
let scrollMap, lineHeightMap, viewTop, viewBottom;
let scrollMap, lineHeightMap, viewTop, viewBottom
export function clearMap () {
scrollMap = null;
lineHeightMap = null;
viewTop = null;
viewBottom = null;
scrollMap = null
lineHeightMap = null
viewTop = null
viewBottom = null
}
window.viewAjaxCallback = clearMap;
window.viewAjaxCallback = clearMap
const 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;
let i, offset, nonEmptyList, pos, a, b, _lineHeightMap, linesCount, acc, _scrollMap;
if (!viewArea || !markdownArea) return
let i, offset, nonEmptyList, pos, a, b, _lineHeightMap, linesCount, acc, _scrollMap
offset = viewArea.scrollTop() - viewArea.offset().top;
_scrollMap = [];
nonEmptyList = [];
_lineHeightMap = [];
viewTop = 0;
viewBottom = viewArea[0].scrollHeight - viewArea.height();
offset = viewArea.scrollTop() - viewArea.offset().top
_scrollMap = []
nonEmptyList = []
_lineHeightMap = []
viewTop = 0
viewBottom = viewArea[0].scrollHeight - viewArea.height()
acc = 0;
const lines = editor.getValue().split('\n');
const lineHeight = editor.defaultTextHeight();
acc = 0
const lines = window.editor.getValue().split('\n')
const lineHeight = window.editor.defaultTextHeight()
for (i = 0; i < lines.length; i++) {
const str = lines[i];
const str = lines[i]
_lineHeightMap.push(acc);
_lineHeightMap.push(acc)
if (str.length === 0) {
acc++;
continue;
acc++
continue
}
const h = editor.heightAtLine(i + 1) - editor.heightAtLine(i);
acc += Math.round(h / lineHeight);
const h = window.editor.heightAtLine(i + 1) - window.editor.heightAtLine(i)
acc += Math.round(h / lineHeight)
}
_lineHeightMap.push(acc);
linesCount = acc;
_lineHeightMap.push(acc)
linesCount = acc
for (i = 0; i < linesCount; i++) {
_scrollMap.push(-1);
_scrollMap.push(-1)
}
nonEmptyList.push(0);
nonEmptyList.push(0)
// make the first line go top
_scrollMap[0] = viewTop;
_scrollMap[0] = viewTop
const parts = markdownArea.find('.part').toArray();
const parts = markdownArea.find('.part').toArray()
for (i = 0; i < parts.length; i++) {
const $el = $(parts[i]);
let t = $el.attr('data-startline') - 1;
const $el = $(parts[i])
let t = $el.attr('data-startline') - 1
if (t === '') {
return;
return
}
t = _lineHeightMap[t];
t = _lineHeightMap[t]
if (t !== 0 && t !== nonEmptyList[nonEmptyList.length - 1]) {
nonEmptyList.push(t);
nonEmptyList.push(t)
}
_scrollMap[t] = Math.round($el.offset().top + offset - 10);
_scrollMap[t] = Math.round($el.offset().top + offset - 10)
}
nonEmptyList.push(linesCount);
_scrollMap[linesCount] = viewArea[0].scrollHeight;
nonEmptyList.push(linesCount)
_scrollMap[linesCount] = viewArea[0].scrollHeight
pos = 0;
pos = 0
for (i = 1; i < linesCount; i++) {
if (_scrollMap[i] !== -1) {
pos++;
continue;
pos++
continue
}
a = nonEmptyList[pos];
b = nonEmptyList[pos + 1];
_scrollMap[i] = Math.round((_scrollMap[b] * (i - a) + _scrollMap[a] * (b - i)) / (b - a));
a = nonEmptyList[pos]
b = nonEmptyList[pos + 1]
_scrollMap[i] = Math.round((_scrollMap[b] * (i - a) + _scrollMap[a] * (b - i)) / (b - a))
}
_scrollMap[0] = 0;
_scrollMap[0] = 0
scrollMap = _scrollMap;
lineHeightMap = _lineHeightMap;
scrollMap = _scrollMap
lineHeightMap = _lineHeightMap
if (loaded && callback) callback();
if (window.loaded && callback) callback()
}
// sync view scroll progress to edit
let viewScrollingTimer = null;
let viewScrollingTimer = null
export function syncScrollToEdit (event, preventAnimate) {
if (currentMode != modeType.both || !syncscroll || !editArea) return;
if (preventSyncScrollToEdit) {
if (typeof preventSyncScrollToEdit === 'number') {
preventSyncScrollToEdit--;
if (window.currentMode !== window.modeType.both || !window.syncscroll || !editArea) return
if (window.preventSyncScrollToEdit) {
if (typeof window.preventSyncScrollToEdit === 'number') {
window.preventSyncScrollToEdit--
} else {
preventSyncScrollToEdit = false;
window.preventSyncScrollToEdit = false
}
return;
return
}
if (!scrollMap || !lineHeightMap) {
buildMap(() => {
syncScrollToEdit(event, preventAnimate);
});
return;
syncScrollToEdit(event, preventAnimate)
})
return
}
if (editScrolling) return;
if (editScrolling) return
const scrollTop = viewArea[0].scrollTop;
let lineIndex = 0;
for (var i = 0, l = scrollMap.length; i < l; i++) {
const scrollTop = viewArea[0].scrollTop
let lineIndex = 0
for (let i = 0, l = scrollMap.length; i < l; i++) {
if (scrollMap[i] > scrollTop) {
break;
break
} else {
lineIndex = i;
lineIndex = i
}
}
let lineNo = 0;
let lineDiff = 0;
for (var i = 0, l = lineHeightMap.length; i < l; i++) {
let lineNo = 0
let lineDiff = 0
for (let i = 0, l = lineHeightMap.length; i < l; i++) {
if (lineHeightMap[i] > lineIndex) {
break;
break
} else {
lineNo = lineHeightMap[i];
lineDiff = lineHeightMap[i + 1] - lineNo;
lineNo = lineHeightMap[i]
lineDiff = lineHeightMap[i + 1] - lineNo
}
}
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];
let posTo = 0
let topDiffPercent = 0
let posToNextDiff = 0
const scrollInfo = window.editor.getScrollInfo()
const textHeight = window.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;
topDiffPercent = (scrollTop - preLastLinePos) / (viewBottom - preLastLinePos);
posToNextDiff = textHeight * topDiffPercent;
posTo += Math.ceil(posToNextDiff);
posTo = preLastLineHeight
topDiffPercent = (scrollTop - preLastLinePos) / (viewBottom - preLastLinePos)
posToNextDiff = textHeight * topDiffPercent
posTo += Math.ceil(posToNextDiff)
} else {
posTo = lineNo * textHeight;
topDiffPercent = (scrollTop - scrollMap[lineNo]) / (scrollMap[lineNo + lineDiff] - scrollMap[lineNo]);
posToNextDiff = textHeight * lineDiff * topDiffPercent;
posTo += Math.ceil(posToNextDiff);
posTo = lineNo * textHeight
topDiffPercent = (scrollTop - scrollMap[lineNo]) / (scrollMap[lineNo + lineDiff] - scrollMap[lineNo])
posToNextDiff = textHeight * lineDiff * topDiffPercent
posTo += Math.ceil(posToNextDiff)
}
if (preventAnimate) {
editArea.scrollTop(posTo);
editArea.scrollTop(posTo)
} else {
const posDiff = Math.abs(scrollInfo.top - posTo);
var duration = posDiff / 50;
duration = duration >= 100 ? duration : 100;
const posDiff = Math.abs(scrollInfo.top - posTo)
var duration = posDiff / 50
duration = duration >= 100 ? duration : 100
editArea.stop(true, true).animate({
scrollTop: posTo
}, duration, "linear");
}, duration, 'linear')
}
viewScrolling = true;
clearTimeout(viewScrollingTimer);
viewScrollingTimer = setTimeout(viewScrollingTimeoutInner, duration * 1.5);
viewScrolling = true
clearTimeout(viewScrollingTimer)
viewScrollingTimer = setTimeout(viewScrollingTimeoutInner, duration * 1.5)
}
function viewScrollingTimeoutInner () {
viewScrolling = false;
viewScrolling = false
}
// sync edit scroll progress to view
let editScrollingTimer = null;
let editScrollingTimer = null
export function syncScrollToView (event, preventAnimate) {
if (currentMode != modeType.both || !syncscroll || !viewArea) return;
if (preventSyncScrollToView) {
if (window.currentMode !== window.modeType.both || !window.syncscroll || !viewArea) return
if (window.preventSyncScrollToView) {
if (typeof preventSyncScrollToView === 'number') {
preventSyncScrollToView--;
window.preventSyncScrollToView--
} else {
preventSyncScrollToView = false;
window.preventSyncScrollToView = false
}
return;
return
}
if (!scrollMap || !lineHeightMap) {
buildMap(() => {
syncScrollToView(event, preventAnimate);
});
return;
syncScrollToView(event, preventAnimate)
})
return
}
if (viewScrolling) return;
if (viewScrolling) return
let lineNo, posTo;
let topDiffPercent, posToNextDiff;
const scrollInfo = editor.getScrollInfo();
const textHeight = editor.defaultTextHeight();
lineNo = Math.floor(scrollInfo.top / textHeight);
let lineNo, posTo
let topDiffPercent, posToNextDiff
const scrollInfo = window.editor.getScrollInfo()
const textHeight = window.editor.defaultTextHeight()
lineNo = Math.floor(scrollInfo.top / textHeight)
// if reach the last line, will start lerp to the bottom
const 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];
posToNextDiff = (viewBottom - posTo) * topDiffPercent;
posTo += Math.floor(posToNextDiff);
topDiffPercent = diffToBottom / textHeight
posTo = scrollMap[lineNo + 1]
posToNextDiff = (viewBottom - posTo) * topDiffPercent
posTo += Math.floor(posToNextDiff)
} else {
topDiffPercent = (scrollInfo.top % textHeight) / textHeight;
posTo = scrollMap[lineNo];
posToNextDiff = (scrollMap[lineNo + 1] - posTo) * topDiffPercent;
posTo += Math.floor(posToNextDiff);
topDiffPercent = (scrollInfo.top % textHeight) / textHeight
posTo = scrollMap[lineNo]
posToNextDiff = (scrollMap[lineNo + 1] - posTo) * topDiffPercent
posTo += Math.floor(posToNextDiff)
}
if (preventAnimate) {
viewArea.scrollTop(posTo);
viewArea.scrollTop(posTo)
} else {
const posDiff = Math.abs(viewArea.scrollTop() - posTo);
var duration = posDiff / 50;
duration = duration >= 100 ? duration : 100;
const posDiff = Math.abs(viewArea.scrollTop() - posTo)
var duration = posDiff / 50
duration = duration >= 100 ? duration : 100
viewArea.stop(true, true).animate({
scrollTop: posTo
}, duration, "linear");
}, duration, 'linear')
}
editScrolling = true;
clearTimeout(editScrollingTimer);
editScrollingTimer = setTimeout(editScrollingTimeoutInner, duration * 1.5);
editScrolling = true
clearTimeout(editScrollingTimer)
editScrollingTimer = setTimeout(editScrollingTimeoutInner, duration * 1.5)
}
function editScrollingTimeoutInner () {
editScrolling = false;
editScrolling = false
}

View file

@ -1,3 +1,4 @@
/* eslint-env browser, jquery */
/**
* md-toc.js v1.0.2
* https://github.com/yijian166/md-toc.js
@ -5,125 +6,118 @@
(function (window) {
function Toc (id, options) {
this.el = document.getElementById(id);
if (!this.el) return;
this.options = options || {};
this.tocLevel = parseInt(options.level) || 0;
this.tocClass = options['class'] || 'toc';
this.ulClass = options['ulClass'];
this.tocTop = parseInt(options.top) || 0;
this.elChilds = this.el.children;
this.process = options['process'];
if (!this.elChilds.length) return;
this._init();
this.el = document.getElementById(id)
if (!this.el) return
this.options = options || {}
this.tocLevel = parseInt(options.level) || 0
this.tocClass = options['class'] || 'toc'
this.ulClass = options['ulClass']
this.tocTop = parseInt(options.top) || 0
this.elChilds = this.el.children
this.process = options['process']
if (!this.elChilds.length) return
this._init()
}
Toc.prototype._init = function () {
this._collectTitleElements();
this._createTocContent();
this._showToc();
};
this._collectTitleElements()
this._createTocContent()
this._showToc()
}
Toc.prototype._collectTitleElements = function () {
this._elTitlesNames = [],
this.elTitleElements = [];
this._elTitlesNames = []
this.elTitleElements = []
for (var i = 1; i < 7; i++) {
if (this.el.getElementsByTagName('h' + i).length) {
this._elTitlesNames.push('h' + i);
this._elTitlesNames.push('h' + i)
}
}
this._elTitlesNames.length = this._elTitlesNames.length > this.tocLevel ? this.tocLevel : this._elTitlesNames.length;
this._elTitlesNames.length = this._elTitlesNames.length > this.tocLevel ? this.tocLevel : this._elTitlesNames.length
for (var j = 0; j < this.elChilds.length; j++) {
this._elChildName = this.elChilds[j].tagName.toLowerCase();
this._elChildName = this.elChilds[j].tagName.toLowerCase()
if (this._elTitlesNames.toString().match(this._elChildName)) {
this.elTitleElements.push(this.elChilds[j]);
this.elTitleElements.push(this.elChilds[j])
}
}
}
};
Toc.prototype._createTocContent = function () {
this._elTitleElementsLen = this.elTitleElements.length;
if (!this._elTitleElementsLen) return;
this.tocContent = '';
this._tempLists = [];
this._elTitleElementsLen = this.elTitleElements.length
if (!this._elTitleElementsLen) return
this.tocContent = ''
this._tempLists = []
var url = location.origin + location.pathname;
for (var i = 0; i < this._elTitleElementsLen; i++) {
var j = i + 1;
this._elTitleElement = this.elTitleElements[i];
this._elTitleElementName = this._elTitleElement.tagName;
this._elTitleElementText = (typeof this.process === 'function' ? this.process(this._elTitleElement) : this._elTitleElement.innerHTML).replace(/<(?:.|\n)*?>/gm, '');
var id = this._elTitleElement.getAttribute('id');
var j = i + 1
this._elTitleElement = this.elTitleElements[i]
this._elTitleElementName = this._elTitleElement.tagName
this._elTitleElementText = (typeof this.process === 'function' ? this.process(this._elTitleElement) : this._elTitleElement.innerHTML).replace(/<(?:.|\n)*?>/gm, '')
var id = this._elTitleElement.getAttribute('id')
if (!id) {
this._elTitleElement.setAttribute('id', 'tip' + i);
id = '#tip' + i;
this._elTitleElement.setAttribute('id', 'tip' + i)
id = '#tip' + i
} else {
id = '#' + id;
id = '#' + id
}
this.tocContent += '<li><a href="' + id + '">' + this._elTitleElementText + '</a>';
this.tocContent += '<li><a href="' + id + '">' + this._elTitleElementText + '</a>'
if (j != this._elTitleElementsLen) {
this._elNextTitleElementName = this.elTitleElements[j].tagName;
if (this._elTitleElementName != this._elNextTitleElementName) {
var checkColse = false,
y = 1;
if (j !== this._elTitleElementsLen) {
this._elNextTitleElementName = this.elTitleElements[j].tagName
if (this._elTitleElementName !== this._elNextTitleElementName) {
var checkColse = false
var y = 1
for (var t = this._tempLists.length - 1; t >= 0; t--) {
if (this._tempLists[t].tagName == this._elNextTitleElementName) {
checkColse = true;
break;
if (this._tempLists[t].tagName === this._elNextTitleElementName) {
checkColse = true
break
}
y++;
y++
}
if (checkColse) {
this.tocContent += new Array(y + 1).join('</li></ul>');
this._tempLists.length = this._tempLists.length - y;
this.tocContent += new Array(y + 1).join('</li></ul>')
this._tempLists.length = this._tempLists.length - y
} else {
this._tempLists.push(this._elTitleElement);
if (this.ulClass)
this.tocContent += '<ul class="' + this.ulClass + '">';
else
this.tocContent += '<ul>';
this._tempLists.push(this._elTitleElement)
if (this.ulClass) { this.tocContent += '<ul class="' + this.ulClass + '">' } else { this.tocContent += '<ul>' }
}
} else {
this.tocContent += '</li>';
this.tocContent += '</li>'
}
} else {
if (this._tempLists.length) {
this.tocContent += new Array(this._tempLists.length + 1).join('</li></ul>');
this.tocContent += new Array(this._tempLists.length + 1).join('</li></ul>')
} else {
this.tocContent += '</li>';
this.tocContent += '</li>'
}
}
}
if (this.ulClass)
this.tocContent = '<ul class="' + this.ulClass + '">' + this.tocContent + '</ul>';
else
this.tocContent = '<ul>' + this.tocContent + '</ul>';
};
if (this.ulClass) { this.tocContent = '<ul class="' + this.ulClass + '">' + this.tocContent + '</ul>' } else { this.tocContent = '<ul>' + this.tocContent + '</ul>' }
}
Toc.prototype._showToc = function () {
this.toc = document.createElement('div');
this.toc.innerHTML = this.tocContent;
this.toc.setAttribute('class', this.tocClass);
this.toc = document.createElement('div')
this.toc.innerHTML = this.tocContent
this.toc.setAttribute('class', this.tocClass)
if (!this.options.targetId) {
this.el.appendChild(this.toc);
this.el.appendChild(this.toc)
} else {
document.getElementById(this.options.targetId).appendChild(this.toc);
document.getElementById(this.options.targetId).appendChild(this.toc)
}
var self = this;
var self = this
if (this.tocTop > -1) {
window.onscroll = function () {
var t = document.documentElement.scrollTop || document.body.scrollTop;
var t = document.documentElement.scrollTop || document.body.scrollTop
if (t < self.tocTop) {
self.toc.setAttribute('style', 'position:absolute;top:' + self.tocTop + 'px;');
self.toc.setAttribute('style', 'position:absolute;top:' + self.tocTop + 'px;')
} else {
self.toc.setAttribute('style', 'position:fixed;top:10px;');
self.toc.setAttribute('style', 'position:fixed;top:10px;')
}
}
}
};
window.Toc = Toc;
})(window);
}
window.Toc = Toc
})(window)

View file

@ -1,10 +1,10 @@
var baseConfig = require('./webpackBaseConfig');
var ExtractTextPlugin = require("extract-text-webpack-plugin");
var path = require('path');
var baseConfig = require('./webpackBaseConfig')
var ExtractTextPlugin = require('extract-text-webpack-plugin')
var path = require('path')
module.exports = [Object.assign({}, baseConfig, {
plugins: baseConfig.plugins.concat([
new ExtractTextPlugin("[name].css")
new ExtractTextPlugin('[name].css')
])
}), {
entry: {
@ -28,6 +28,6 @@ module.exports = [Object.assign({}, baseConfig, {
filename: '[name].js'
},
plugins: [
new ExtractTextPlugin("html.min.css")
new ExtractTextPlugin('html.min.css')
]
}];
}]

View file

@ -1,9 +1,9 @@
var baseConfig = require('./webpackBaseConfig');
var webpack = require('webpack');
var path = require('path');
var ExtractTextPlugin = require("extract-text-webpack-plugin");
var OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
var ParallelUglifyPlugin = require('webpack-parallel-uglify-plugin');
var baseConfig = require('./webpackBaseConfig')
var webpack = require('webpack')
var path = require('path')
var ExtractTextPlugin = require('extract-text-webpack-plugin')
var OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin')
var ParallelUglifyPlugin = require('webpack-parallel-uglify-plugin')
module.exports = [Object.assign({}, baseConfig, {
plugins: baseConfig.plugins.concat([
@ -21,7 +21,7 @@ module.exports = [Object.assign({}, baseConfig, {
sourceMap: false
}
}),
new ExtractTextPlugin("[name].[hash].css")
new ExtractTextPlugin('[name].[hash].css')
]),
output: {
@ -57,7 +57,7 @@ module.exports = [Object.assign({}, baseConfig, {
'NODE_ENV': JSON.stringify('production')
}
}),
new ExtractTextPlugin("html.min.css"),
new ExtractTextPlugin('html.min.css'),
new OptimizeCssAssetsPlugin()
]
}];
}]

View file

@ -1,24 +1,24 @@
var webpack = require('webpack');
var path = require('path');
var ExtractTextPlugin = require("extract-text-webpack-plugin");
var HtmlWebpackPlugin = require('html-webpack-plugin');
var CopyWebpackPlugin = require('copy-webpack-plugin');
var webpack = require('webpack')
var path = require('path')
var ExtractTextPlugin = require('extract-text-webpack-plugin')
var HtmlWebpackPlugin = require('html-webpack-plugin')
var CopyWebpackPlugin = require('copy-webpack-plugin')
module.exports = {
plugins: [
new webpack.ProvidePlugin({
Visibility: "visibilityjs",
Cookies: "js-cookie",
key: "keymaster",
$: "jquery",
jQuery: "jquery",
"window.jQuery": "jquery",
"moment": "moment",
"Handlebars": "handlebars"
Visibility: 'visibilityjs',
Cookies: 'js-cookie',
key: 'keymaster',
$: 'jquery',
jQuery: 'jquery',
'window.jQuery': 'jquery',
'moment': 'moment',
'Handlebars': 'handlebars'
}),
new webpack.optimize.OccurrenceOrderPlugin(true),
new webpack.optimize.CommonsChunkPlugin({
names: ["cover", "index", "pretty", "slide", "vendor"],
names: ['cover', 'index', 'pretty', 'slide', 'vendor'],
children: true,
async: true,
filename: '[name].js',
@ -150,54 +150,54 @@ module.exports = {
entry: {
font: path.join(__dirname, 'public/css/google-font.css'),
"font-pack": path.join(__dirname, 'public/css/font.css'),
'font-pack': path.join(__dirname, 'public/css/font.css'),
common: [
"expose?jQuery!expose?$!jquery",
"velocity-animate",
"imports?$=jquery!jquery-mousewheel",
"bootstrap"
'expose?jQuery!expose?$!jquery',
'velocity-animate',
'imports?$=jquery!jquery-mousewheel',
'bootstrap'
],
cover: [
"babel-polyfill",
'babel-polyfill',
path.join(__dirname, 'public/js/cover.js')
],
"cover-styles-pack": [
'cover-styles-pack': [
path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'),
path.join(__dirname, 'node_modules/font-awesome/css/font-awesome.min.css'),
path.join(__dirname, 'public/css/bootstrap-social.css'),
path.join(__dirname, 'node_modules/select2/select2.css'),
path.join(__dirname, 'node_modules/select2/select2-bootstrap.css'),
path.join(__dirname, 'node_modules/select2/select2-bootstrap.css')
],
"cover-pack": [
"babel-polyfill",
"bootstrap-validator",
"script!listPagnation",
"expose?select2!select2",
"expose?moment!moment",
"script!js-url",
'cover-pack': [
'babel-polyfill',
'bootstrap-validator',
'script!listPagnation',
'expose?select2!select2',
'expose?moment!moment',
'script!js-url',
path.join(__dirname, 'public/js/cover.js')
],
index: [
"babel-polyfill",
"script!jquery-ui-resizable",
"script!js-url",
"expose?filterXSS!xss",
"script!Idle.Js",
"expose?LZString!lz-string",
"script!codemirror",
"script!inlineAttachment",
"script!jqueryTextcomplete",
"script!codemirrorSpellChecker",
"script!codemirrorInlineAttachment",
"script!ot",
"flowchart.js",
"js-sequence-diagrams",
"expose?RevealMarkdown!reveal-markdown",
'babel-polyfill',
'script!jquery-ui-resizable',
'script!js-url',
'expose?filterXSS!xss',
'script!Idle.Js',
'expose?LZString!lz-string',
'script!codemirror',
'script!inlineAttachment',
'script!jqueryTextcomplete',
'script!codemirrorSpellChecker',
'script!codemirrorInlineAttachment',
'script!ot',
'flowchart.js',
'js-sequence-diagrams',
'expose?RevealMarkdown!reveal-markdown',
path.join(__dirname, 'public/js/google-drive-upload.js'),
path.join(__dirname, 'public/js/google-drive-picker.js'),
path.join(__dirname, 'public/js/index.js')
],
"index-styles": [
'index-styles': [
path.join(__dirname, 'public/vendor/jquery-ui/jquery-ui.min.css'),
path.join(__dirname, 'public/vendor/codemirror-spell-checker/spell-checker.min.css'),
path.join(__dirname, 'node_modules/codemirror/lib/codemirror.css'),
@ -216,120 +216,120 @@ module.exports = {
path.join(__dirname, 'public/css/markdown.css'),
path.join(__dirname, 'public/css/slide-preview.css')
],
"index-styles-pack": [
'index-styles-pack': [
path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'),
path.join(__dirname, 'node_modules/font-awesome/css/font-awesome.min.css'),
path.join(__dirname, 'public/css/bootstrap-social.css'),
path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'),
path.join(__dirname, 'node_modules/octicons/octicons/octicons.css')
],
"index-pack": [
"babel-polyfill",
"expose?Spinner!spin.js",
"script!jquery-ui-resizable",
"bootstrap-validator",
"expose?jsyaml!js-yaml",
"script!mermaid",
"expose?moment!moment",
"script!js-url",
"script!handlebars",
"expose?hljs!highlight.js",
"expose?emojify!emojify.js",
"expose?filterXSS!xss",
"script!Idle.Js",
"script!gist-embed",
"expose?LZString!lz-string",
"script!codemirror",
"script!inlineAttachment",
"script!jqueryTextcomplete",
"script!codemirrorSpellChecker",
"script!codemirrorInlineAttachment",
"script!ot",
"flowchart.js",
"js-sequence-diagrams",
"expose?Viz!viz.js",
"expose?io!socket.io-client",
"expose?RevealMarkdown!reveal-markdown",
'index-pack': [
'babel-polyfill',
'expose?Spinner!spin.js',
'script!jquery-ui-resizable',
'bootstrap-validator',
'expose?jsyaml!js-yaml',
'script!mermaid',
'expose?moment!moment',
'script!js-url',
'script!handlebars',
'expose?hljs!highlight.js',
'expose?emojify!emojify.js',
'expose?filterXSS!xss',
'script!Idle.Js',
'script!gist-embed',
'expose?LZString!lz-string',
'script!codemirror',
'script!inlineAttachment',
'script!jqueryTextcomplete',
'script!codemirrorSpellChecker',
'script!codemirrorInlineAttachment',
'script!ot',
'flowchart.js',
'js-sequence-diagrams',
'expose?Viz!viz.js',
'expose?io!socket.io-client',
'expose?RevealMarkdown!reveal-markdown',
path.join(__dirname, 'public/js/google-drive-upload.js'),
path.join(__dirname, 'public/js/google-drive-picker.js'),
path.join(__dirname, 'public/js/index.js')
],
pretty: [
"babel-polyfill",
"expose?filterXSS!xss",
"flowchart.js",
"js-sequence-diagrams",
"expose?RevealMarkdown!reveal-markdown",
'babel-polyfill',
'expose?filterXSS!xss',
'flowchart.js',
'js-sequence-diagrams',
'expose?RevealMarkdown!reveal-markdown',
path.join(__dirname, 'public/js/pretty.js')
],
"pretty-styles": [
'pretty-styles': [
path.join(__dirname, 'public/css/github-extract.css'),
path.join(__dirname, 'public/css/mermaid.css'),
path.join(__dirname, 'public/css/markdown.css'),
path.join(__dirname, 'public/css/slide-preview.css')
],
"pretty-styles-pack": [
'pretty-styles-pack': [
path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'),
path.join(__dirname, 'node_modules/font-awesome/css/font-awesome.min.css'),
path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'),
path.join(__dirname, 'node_modules/octicons/octicons/octicons.css')
],
"pretty-pack": [
"babel-polyfill",
"expose?jsyaml!js-yaml",
"script!mermaid",
"expose?moment!moment",
"script!handlebars",
"expose?hljs!highlight.js",
"expose?emojify!emojify.js",
"expose?filterXSS!xss",
"script!gist-embed",
"flowchart.js",
"js-sequence-diagrams",
"expose?Viz!viz.js",
"expose?RevealMarkdown!reveal-markdown",
'pretty-pack': [
'babel-polyfill',
'expose?jsyaml!js-yaml',
'script!mermaid',
'expose?moment!moment',
'script!handlebars',
'expose?hljs!highlight.js',
'expose?emojify!emojify.js',
'expose?filterXSS!xss',
'script!gist-embed',
'flowchart.js',
'js-sequence-diagrams',
'expose?Viz!viz.js',
'expose?RevealMarkdown!reveal-markdown',
path.join(__dirname, 'public/js/pretty.js')
],
slide: [
"babel-polyfill",
"bootstrap-tooltip",
"expose?filterXSS!xss",
"flowchart.js",
"js-sequence-diagrams",
"expose?RevealMarkdown!reveal-markdown",
'babel-polyfill',
'bootstrap-tooltip',
'expose?filterXSS!xss',
'flowchart.js',
'js-sequence-diagrams',
'expose?RevealMarkdown!reveal-markdown',
path.join(__dirname, 'public/js/slide.js')
],
"slide-styles": [
'slide-styles': [
path.join(__dirname, 'public/vendor/bootstrap/tooltip.min.css'),
path.join(__dirname, 'public/css/github-extract.css'),
path.join(__dirname, 'public/css/mermaid.css'),
path.join(__dirname, 'public/css/markdown.css')
],
"slide-styles-pack": [
'slide-styles-pack': [
path.join(__dirname, 'node_modules/font-awesome/css/font-awesome.min.css'),
path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'),
path.join(__dirname, 'node_modules/octicons/octicons/octicons.css')
],
"slide-pack": [
"babel-polyfill",
"expose?jQuery!expose?$!jquery",
"velocity-animate",
"imports?$=jquery!jquery-mousewheel",
"bootstrap-tooltip",
"expose?jsyaml!js-yaml",
"script!mermaid",
"expose?moment!moment",
"script!handlebars",
"expose?hljs!highlight.js",
"expose?emojify!emojify.js",
"expose?filterXSS!xss",
"script!gist-embed",
"flowchart.js",
"js-sequence-diagrams",
"expose?Viz!viz.js",
"headjs",
"expose?Reveal!reveal.js",
"expose?RevealMarkdown!reveal-markdown",
'slide-pack': [
'babel-polyfill',
'expose?jQuery!expose?$!jquery',
'velocity-animate',
'imports?$=jquery!jquery-mousewheel',
'bootstrap-tooltip',
'expose?jsyaml!js-yaml',
'script!mermaid',
'expose?moment!moment',
'script!handlebars',
'expose?hljs!highlight.js',
'expose?emojify!emojify.js',
'expose?filterXSS!xss',
'script!gist-embed',
'flowchart.js',
'js-sequence-diagrams',
'expose?Viz!viz.js',
'headjs',
'expose?Reveal!reveal.js',
'expose?RevealMarkdown!reveal-markdown',
path.join(__dirname, 'public/js/slide.js')
]
},
@ -346,7 +346,7 @@ module.exports = {
path.resolve(__dirname, 'src'),
path.resolve(__dirname, 'node_modules')
],
extensions: ["", ".js"],
extensions: ['', '.js'],
alias: {
codemirror: path.join(__dirname, 'node_modules/codemirror/codemirror.min.js'),
inlineAttachment: path.join(__dirname, 'public/vendor/inlineAttachment/inline-attachment.js'),
@ -357,23 +357,23 @@ module.exports = {
listPagnation: path.join(__dirname, 'node_modules/list.pagination.js/dist/list.pagination.min.js'),
mermaid: path.join(__dirname, 'node_modules/mermaid/dist/mermaid.min.js'),
handlebars: path.join(__dirname, 'node_modules/handlebars/dist/handlebars.min.js'),
"jquery-ui-resizable": path.join(__dirname, 'public/vendor/jquery-ui/jquery-ui.min.js'),
"gist-embed": path.join(__dirname, 'node_modules/gist-embed/gist-embed.min.js'),
"bootstrap-tooltip": path.join(__dirname, 'public/vendor/bootstrap/tooltip.min.js'),
"headjs": path.join(__dirname, 'node_modules/reveal.js/lib/js/head.min.js'),
"reveal-markdown": path.join(__dirname, 'public/js/reveal-markdown.js')
'jquery-ui-resizable': path.join(__dirname, 'public/vendor/jquery-ui/jquery-ui.min.js'),
'gist-embed': path.join(__dirname, 'node_modules/gist-embed/gist-embed.min.js'),
'bootstrap-tooltip': path.join(__dirname, 'public/vendor/bootstrap/tooltip.min.js'),
'headjs': path.join(__dirname, 'node_modules/reveal.js/lib/js/head.min.js'),
'reveal-markdown': path.join(__dirname, 'public/js/reveal-markdown.js')
}
},
externals: {
"viz.js": "Viz",
"socket.io-client": "io",
"lodash": "_",
"jquery": "$",
"moment": "moment",
"handlebars": "Handlebars",
"highlight.js": "hljs",
"select2": "select2"
'viz.js': 'Viz',
'socket.io-client': 'io',
'lodash': '_',
'jquery': '$',
'moment': 'moment',
'handlebars': 'Handlebars',
'highlight.js': 'hljs',
'select2': 'select2'
},
module: {
@ -394,30 +394,30 @@ module.exports = {
test: /\.less$/,
loader: ExtractTextPlugin.extract('style-loader', 'less-loader')
}, {
test: require.resolve("js-sequence-diagrams"),
loader: "imports?Raphael=raphael"
test: require.resolve('js-sequence-diagrams'),
loader: 'imports?Raphael=raphael'
}, {
test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
loader: "file"
loader: 'file'
}, {
test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/,
loader: "url?prefix=font/&limit=5000"
loader: 'url?prefix=font/&limit=5000'
}, {
test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
loader: "url?limit=10000&mimetype=application/octet-stream"
loader: 'url?limit=10000&mimetype=application/octet-stream'
}, {
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
loader: "url?limit=10000&mimetype=image/svg+xml"
loader: 'url?limit=10000&mimetype=image/svg+xml'
}, {
test: /\.png(\?v=\d+\.\d+\.\d+)?$/,
loader: "url?limit=10000&mimetype=image/png"
loader: 'url?limit=10000&mimetype=image/png'
}, {
test: /\.gif(\?v=\d+\.\d+\.\d+)?$/,
loader: "url?limit=10000&mimetype=image/gif"
loader: 'url?limit=10000&mimetype=image/gif'
}]
},
node: {
fs: "empty"
fs: 'empty'
}
}
};