github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-25 11:16:31 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix indentations

Browse source
This commit is contained in:
Yukai Huang 2017-03-28 20:38:31 +08:00
parent b711ecfadb
commit a938cac42a
1 changed files with 48 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
public/js/index.js
View file

@ -443,29 +443,29 @@ $(document).ready(function () {
clearMap() clearMap()
} }
checkEditorStyle() checkEditorStyle()
/* we need this only on touch devices */ /* we need this only on touch devices */
if (window.isTouchDevice) { if (window.isTouchDevice) {
/* cache dom references */ /* cache dom references */
var $body = jQuery('body') var $body = jQuery('body')
/* bind events */ /* bind events */
$(document) $(document)
.on('focus', 'textarea, input', function () { .on('focus', 'textarea, input', function () {
$body.addClass('fixfixed') $body.addClass('fixfixed')
}) })
.on('blur', 'textarea, input', function () { .on('blur', 'textarea, input', function () {
$body.removeClass('fixfixed') $body.removeClass('fixfixed')
}) })
} }
// showup // showup
$().showUp('.navbar', { $().showUp('.navbar', {
upClass: 'navbar-hide', upClass: 'navbar-hide',
downClass: 'navbar-show' downClass: 'navbar-show'
}) })
// tooltip // tooltip
$('[data-toggle="tooltip"]').tooltip() $('[data-toggle="tooltip"]').tooltip()
// shortcuts // shortcuts
// allow on all tags // allow on all tags
key.filter = function (e) { return true } key.filter = function (e) { return true }
key('ctrl+alt+e', function (e) { key('ctrl+alt+e', function (e) {
changeMode(modeType.edit) changeMode(modeType.edit)
@ -476,7 +476,7 @@ $(document).ready(function () {
key('ctrl+alt+b', function (e) { key('ctrl+alt+b', function (e) {
changeMode(modeType.both) changeMode(modeType.both)
}) })
// toggle-dropdown // toggle-dropdown
$(document).on('click', '.toggle-dropdown .dropdown-menu', function (e) { $(document).on('click', '.toggle-dropdown .dropdown-menu', function (e) {
e.stopPropagation() e.stopPropagation()
}) })
@ -491,10 +491,10 @@ $(window).resize(function () {
}) })
// when page unload // when page unload
$(window).on('unload', function () { $(window).on('unload', function () {
// updateHistoryInner(); // updateHistoryInner();
}) })
$(window).on('error', function () { $(window).on('error', function () {
// setNeedRefresh(); // setNeedRefresh();
}) })
setupSyncAreas(ui.area.codemirrorScroll, ui.area.view, ui.area.markdown) setupSyncAreas(ui.area.codemirrorScroll, ui.area.view, ui.area.markdown)
@ -516,7 +516,7 @@ function windowResizeInner (callback) {
checkEditorStyle() checkEditorStyle()
checkTocStyle() checkTocStyle()
checkCursorMenu() checkCursorMenu()
// refresh editor // refresh editor
if (window.loaded) { if (window.loaded) {
if (editor.getOption('scrollbarStyle') === 'native') { if (editor.getOption('scrollbarStyle') === 'native') {
setTimeout(function () { setTimeout(function () {
@ -526,13 +526,13 @@ function windowResizeInner (callback) {
if (callback && typeof callback === 'function') { callback() } if (callback && typeof callback === 'function') { callback() }
}, 1) }, 1)
} else { } else {
// force it load all docs at once to prevent scroll knob blink // force it load all docs at once to prevent scroll knob blink
editor.setOption('viewportMargin', Infinity) editor.setOption('viewportMargin', Infinity)
setTimeout(function () { setTimeout(function () {
clearMap() clearMap()
autoSyncscroll() autoSyncscroll()
editor.setOption('viewportMargin', viewportMargin) editor.setOption('viewportMargin', viewportMargin)
// add or update user cursors // add or update user cursors
for (var i = 0; i < window.onlineUsers.length; i++) { for (var i = 0; i < window.onlineUsers.length; i++) {
if (window.onlineUsers[i].id !== window.personalInfo.id) { buildCursor(window.onlineUsers[i]) } if (window.onlineUsers[i].id !== window.personalInfo.id) { buildCursor(window.onlineUsers[i]) }
} }
@ -581,9 +581,9 @@ function checkEditorStyle () {
ui.area.codemirrorScroll.css('height', '') ui.area.codemirrorScroll.css('height', '')
ui.area.codemirrorScroll.css('min-height', desireHeight + 'px') ui.area.codemirrorScroll.css('min-height', desireHeight + 'px')
} }
// workaround editor will have wrong doc height when editor height changed // workaround editor will have wrong doc height when editor height changed
editor.setSize(null, ui.area.edit.height()) editor.setSize(null, ui.area.edit.height())
// make editor resizable // make editor resizable
if (!ui.area.resize.handle.length) { if (!ui.area.resize.handle.length) {
ui.area.edit.resizable({ ui.area.edit.resizable({
handles: 'e', handles: 'e',
@ -662,8 +662,8 @@ var checkEditorScrollbar = _.debounce(function () {
}, 50) }, 50)
function checkEditorScrollbarInner () { function checkEditorScrollbarInner () {
// workaround simple scroll bar knob // workaround simple scroll bar knob
// will get wrong position when editor height changed // will get wrong position when editor height changed
var scrollInfo = editor.getScrollInfo() var scrollInfo = editor.getScrollInfo()
editor.scrollTo(null, scrollInfo.top - 1) editor.scrollTo(null, scrollInfo.top - 1)
editor.scrollTo(null, scrollInfo.top) editor.scrollTo(null, scrollInfo.top)
@ -687,7 +687,7 @@ function checkTocStyle () {
} else { } else {
newbool = false newbool = false
} }
// toc scrollspy // toc scrollspy
ui.toc.toc.removeClass('scrollspy-body, scrollspy-view') ui.toc.toc.removeClass('scrollspy-body, scrollspy-view')
ui.toc.affix.removeClass('scrollspy-body, scrollspy-view') ui.toc.affix.removeClass('scrollspy-body, scrollspy-view')
if (window.currentMode === modeType.both) { if (window.currentMode === modeType.both) {
@ -1895,10 +1895,6 @@ function initMarkAndCheckGutter (mark, author, timestamp) {
} }
return mark return mark
} }
var gutterStylePrefix = 'border-left: 3px solid '
var gutterStylePostfix = '; height: ' + defaultTextHeight + 'px; margin-left: 3px;'
var textMarkderStylePrefix = 'background-image: linear-gradient(to top, '
var textMarkderStylePostfix = ' 1px, transparent 1px);'
var addStyleRule = (function () { var addStyleRule = (function () {
var added = {} var added = {}
var styleElement = document.createElement('style') var styleElement = document.createElement('style')
@ -2015,11 +2011,11 @@ function updateAuthorshipInner () {
for (let i = 0; i < addTextMarkers.length; i++) { for (let i = 0; i < addTextMarkers.length; i++) {
let textMarker = addTextMarkers[i] let textMarker = addTextMarkers[i]
let author = authors[textMarker.userid] let author = authors[textMarker.userid]
var rgbcolor = hex2rgb(author.color) const rgbcolor = hex2rgb(author.color)
var colorString = 'rgba(' + rgbcolor.red + ',' + rgbcolor.green + ',' + rgbcolor.blue + ',0.7)' const colorString = `rgba(${rgbcolor.red},${rgbcolor.green},${rgbcolor.blue},0.7)`
var styleString = textMarkderStylePrefix + colorString + textMarkderStylePostfix const styleString = `background-image: linear-gradient(to top, ${colorString} 1px, transparent 1px);`
let className = 'authorship-inline-' + author.color.substr(1) let className = `authorship-inline-${author.color.substr(1)}`
var rule = '.' + className + '{' + styleString + '}' const rule = `.${className} { ${styleString} }`
addStyleRule(rule) addStyleRule(rule)
editor.markText(textMarker.pos[0], textMarker.pos[1], { editor.markText(textMarker.pos[0], textMarker.pos[1], {
className: 'authorship-inline ' + className, className: 'authorship-inline ' + className,
@ -2033,12 +2029,12 @@ function iterateLine (line) {
var author = currMark ? authors[currMark.gutter.userid] : null var author = currMark ? authors[currMark.gutter.userid] : null
if (currMark && author) { if (currMark && author) {
let className = 'authorship-gutter-' + author.color.substr(1) let className = 'authorship-gutter-' + author.color.substr(1)
var gutters = line.gutterMarkers const gutters = line.gutterMarkers
if (!gutters || !gutters['authorship-gutters'] || if (!gutters || !gutters['authorship-gutters'] ||
!gutters['authorship-gutters'].className || !gutters['authorship-gutters'].className ||
!gutters['authorship-gutters'].className.indexOf(className) < 0) { !gutters['authorship-gutters'].className.indexOf(className) < 0) {
var styleString = gutterStylePrefix + author.color + gutterStylePostfix const styleString = `border-left: 3px solid ${author.color}; height: ${defaultTextHeight}px; margin-left: 3px;`
var rule = '.' + className + '{' + styleString + '}' const rule = `.${className} { ${styleString} }`
addStyleRule(rule) addStyleRule(rule)
var gutter = $('<div>', { var gutter = $('<div>', {
class: 'authorship-gutter ' + className, class: 'authorship-gutter ' + className,
@ -2069,14 +2065,14 @@ editorInstance.on('update', function () {
placement: 'bottom', placement: 'bottom',
delay: { 'show': 500, 'hide': 100 } delay: { 'show': 500, 'hide': 100 }
}) })
// clear tooltip which described element has been removed // clear tooltip which described element has been removed
$('[id^="tooltip"]').each(function (index, element) { $('[id^="tooltip"]').each(function (index, element) {
var $ele = $(element) var $ele = $(element)
if ($('[aria-describedby="' + $ele.attr('id') + '"]').length <= 0) $ele.remove() if ($('[aria-describedby="' + $ele.attr('id') + '"]').length <= 0) $ele.remove()
}) })
}) })
socket.on('check', function (data) { socket.on('check', function (data) {
// console.log(data); // console.log(data);
updateInfo(data) updateInfo(data)
}) })
socket.on('permission', function (data) { socket.on('permission', function (data) {
@ -2096,7 +2092,7 @@ socket.on('refresh', function (data) {
if (nocontent) { if (nocontent) {
if (window.visibleXS) { window.currentMode = modeType.edit } else { window.currentMode = modeType.both } if (window.visibleXS) { window.currentMode = modeType.edit } else { window.currentMode = modeType.both }
} }
// parse mode from url // parse mode from url
if (window.location.search.length > 0) { if (window.location.search.length > 0) {
var urlMode = modeType[window.location.search.substr(1)] var urlMode = modeType[window.location.search.substr(1)]
if (urlMode) window.currentMode = urlMode if (urlMode) window.currentMode = urlMode
@ -2112,9 +2108,9 @@ socket.on('refresh', function (data) {
emitUserStatus() // send first user status emitUserStatus() // send first user status
updateOnlineStatus() // update first online status updateOnlineStatus() // update first online status
setTimeout(function () { setTimeout(function () {
// work around editor not refresh or doc not fully loaded // work around editor not refresh or doc not fully loaded
windowResizeInner() windowResizeInner()
// work around might not scroll to hash // work around might not scroll to hash
scrollToHash() scrollToHash()
}, 1) }, 1)
} }
@ -2148,7 +2144,7 @@ socket.on('doc', function (obj) {
ui.spinner.hide() ui.spinner.hide()
ui.content.fadeIn() ui.content.fadeIn()
} else { } else {
// if current doc is equal to the doc before disconnect // if current doc is equal to the doc before disconnect
if (setDoc && bodyMismatch) editor.clearHistory() if (setDoc && bodyMismatch) editor.clearHistory()
else if (window.lastInfo.history) editor.setHistory(window.lastInfo.history) else if (window.lastInfo.history) editor.setHistory(window.lastInfo.history)
window.lastInfo.history = null window.lastInfo.history = null
@ -2156,9 +2152,9 @@ socket.on('doc', function (obj) {
if (!cmClient) { if (!cmClient) {
cmClient = window.cmClient = new EditorClient( cmClient = window.cmClient = new EditorClient(
obj.revision, obj.clients, obj.revision, obj.clients,
new SocketIOAdapter(socket), new CodeMirrorAdapter(editor) new SocketIOAdapter(socket), new CodeMirrorAdapter(editor)
) )
synchronized_ = cmClient.state synchronized_ = cmClient.state
} else if (setDoc) { } else if (setDoc) {
if (bodyMismatch) { if (bodyMismatch) {
@ -2263,11 +2259,11 @@ socket.on('cursor blur', function (data) {
var options = { var options = {
valueNames: ['id', 'name'], valueNames: ['id', 'name'],
item: '<li class="ui-user-item">' + item: '<li class="ui-user-item">' +
'<span class="id" style="display:none;"></span>' + '<span class="id" style="display:none;"></span>' +
'<a href="#">' + '<a href="#">' +
'<span class="pull-left"><i class="ui-user-icon"></i></span><span class="ui-user-name name"></span><span class="pull-right"><i class="fa fa-circle ui-user-status"></i></span>' + '<span class="pull-left"><i class="ui-user-icon"></i></span><span class="ui-user-name name"></span><span class="pull-right"><i class="fa fa-circle ui-user-status"></i></span>' +
'</a>' + '</a>' +
'</li>' '</li>'
} }
var onlineUserList = new List('online-user-list', options) var onlineUserList = new List('online-user-list', options)
var shortOnlineUserList = new List('short-online-user-list', options) var shortOnlineUserList = new List('short-online-user-list', options)