caojiezi2003/Stackedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented macro shortcuts

Browse Source
This commit is contained in:
benweet 2014-04-17 00:29:51 +01:00
parent bbae356537
commit 6f6c10c601
11 changed files with 101 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
public/res/core.js
View File

@ -207,52 +207,6 @@ define([
} }
} }
// Create the layout
function createLayout() {
var layoutGlobalConfig = {
closable: true,
resizable: false,
slidable: false,
livePaneResizing: true,
enableCursorHotkey: false,
resizerDblClickToggle: false,
resizeWithWindow: false,
north__spacing_open: 1,
north__spacing_closed: 1,
spacing_open: 32,
spacing_closed: 32,
togglerLength_open: 60,
togglerLength_closed: 60,
stateManagement__enabled: false,
north__minSize: 49,
center__minWidth: 250,
center__minHeight: 180,
east__onalert: function() {
window.location.href = 'viewer';
},
south__onalert: function() {
window.location.href = 'viewer';
},
fxSettings: {
easing: "easeInOutQuad",
duration: 350
},
onresize_end: function(paneName) {
eventMgr.onLayoutResize(paneName);
},
};
eventMgr.onLayoutConfigure(layoutGlobalConfig);
if(settings.layoutOrientation == "horizontal") {
}
else if(settings.layoutOrientation == "vertical") {
}
//setPanelVisibility();
//setPreviewButtonsVisibility();
layout.init();
eventMgr.onLayoutCreated(layout);
}
var $navbarElt; var $navbarElt;
var $leftBtnElts; var $leftBtnElts;
var $rightBtnElts; var $rightBtnElts;
@ -360,8 +314,6 @@ define([
}; };
// Initialize multiple things and then fire eventMgr.onReady // Initialize multiple things and then fire eventMgr.onReady
var isDocumentPanelShown = false;
var isMenuPanelShown = false;
core.onReady = function() { core.onReady = function() {
// Add RTL class // Add RTL class
settings.editMode == 'rtl' && $(document.body).addClass('rtl'); settings.editMode == 'rtl' && $(document.body).addClass('rtl');
@ -386,11 +338,6 @@ define([
// Populate shortcuts in settings // Populate shortcuts in settings
shortcutMgr.addSettingEntries(); shortcutMgr.addSettingEntries();
// Hide shortcuts settings if light mode
if(window.lightMode) {
$('.tab-settings-shortcuts').hide();
}
// listen to online/offline events // listen to online/offline events
$(window).on('offline', core.setOffline); $(window).on('offline', core.setOffline);
$(window).on('online', setOnline); $(window).on('online', setOnline);
@ -401,9 +348,7 @@ define([
// Detect user activity // Detect user activity
$(document).mousemove(setUserActive).keypress(setUserActive); $(document).mousemove(setUserActive).keypress(setUserActive);
// Create UI layout layout.init();
createLayout();
editor.init(); editor.init();
// Do periodic tasks // Do periodic tasks

34
public/res/editor.js
View File

@ -113,8 +113,9 @@ define([
this.cursorY = 0; this.cursorY = 0;
this.findOffset = function(offset) { this.findOffset = function(offset) {
var walker = document.createTreeWalker(contentElt, 4); var walker = document.createTreeWalker(contentElt, 4);
var text = '';
while(walker.nextNode()) { while(walker.nextNode()) {
var text = walker.currentNode.nodeValue || ''; text = walker.currentNode.nodeValue || '';
if (text.length > offset) { if (text.length > offset) {
return { return {
container: walker.currentNode, container: walker.currentNode,
@ -124,11 +125,13 @@ define([
offset -= text.length; offset -= text.length;
} }
return { return {
container: contentElt, container: walker.currentNode,
offset: 0 offset: text.length
}; };
}; };
this.createRange = function(start, end) { this.createRange = function(start, end) {
start = start < 0 ? 0 : start;
end = end < 0 ? 0 : end;
var range = document.createRange(); var range = document.createRange();
var offset = _.isObject(start) ? start : this.findOffset(start); var offset = _.isObject(start) ? start : this.findOffset(start);
range.setStart(offset.container, offset.offset); range.setStart(offset.container, offset.offset);
@ -185,10 +188,10 @@ define([
var range; var range;
var selection = rangy.getSelection(); var selection = rangy.getSelection();
if(selection.rangeCount > 0) { if(selection.rangeCount > 0) {
range = selection.getRangeAt(0); var selectionRange = selection.getRangeAt(0);
var element = range.startContainer; var element = selectionRange.startContainer;
if ((contentElt.compareDocumentPosition(element) & 0x10)) { if ((contentElt.compareDocumentPosition(element) & 0x10)) {
range = selectionRange;
var container = element; var container = element;
var offset = range.startOffset; var offset = range.startOffset;
do { do {
@ -288,7 +291,7 @@ define([
} }
var selectionMgr = new SelectionMgr(); var selectionMgr = new SelectionMgr();
editor.selectionMgr = selectionMgr; editor.selectionMgr = selectionMgr;
$(document).on('selectionchange', _.bind(selectionMgr.saveSelectionState, selectionMgr, true)); $(document).on('selectionchange', '.editor-content', _.bind(selectionMgr.saveSelectionState, selectionMgr, true));
var adjustCursorPosition = (function() { var adjustCursorPosition = (function() {
var adjust = utils.debounce(function() { var adjust = utils.debounce(function() {
@ -333,6 +336,23 @@ define([
} }
editor.setValue = setValue; editor.setValue = setValue;
function replacePreviousText(text, replacement) {
var offset = selectionMgr.selectionStart;
if(offset !== selectionMgr.selectionEnd) {
return false;
}
var range = selectionMgr.createRange(offset - text.length, offset);
if('' + range != text) {
return false;
}
range.deleteContents();
range.insertNode(document.createTextNode(replacement));
offset = offset - text.length + replacement.length;
selectionMgr.setSelectionStartEnd(offset, offset);
return true;
}
editor.replacePreviousText = replacePreviousText;
function setValueNoWatch(value) { function setValueNoWatch(value) {
setValue(value); setValue(value);
textContent = value; textContent = value;

2
public/res/eventMgr.js
View File

@ -203,9 +203,9 @@ define([
addEventHook("onPublishRemoved"); addEventHook("onPublishRemoved");
// Operations on Layout // Operations on Layout
addEventHook("onLayoutConfigure");
addEventHook("onLayoutCreated"); addEventHook("onLayoutCreated");
addEventHook("onLayoutResize"); addEventHook("onLayoutResize");
addEventHook("onPreviewToggle");
// Operations on editor // Operations on editor
addEventHook("onPagedownConfigure"); addEventHook("onPagedownConfigure");

9
public/res/extensions/comments.js
View File

@ -458,7 +458,14 @@ define([
$commentElt = $(sortedCommentEltList[(curentIndex + 1) % sortedCommentEltList.length]); $commentElt = $(sortedCommentEltList[(curentIndex + 1) % sortedCommentEltList.length]);
} }
} }
$commentElt.click(); if(currentContext && currentContext.commentElt === $commentElt[0]) {
// Close the popover properly
closeCurrentPopover();
inputElt.focus();
}
else {
$commentElt.click();
}
evt.stopPropagation(); evt.stopPropagation();
}); });
$openDiscussionIconElt = $openDiscussionElt.find('i'); $openDiscussionIconElt = $openDiscussionElt.find('i');

11
public/res/extensions/documentTitle.js
View File

@ -6,11 +6,6 @@ define([
var documentTitle = new Extension("documentTitle", "Document Title"); var documentTitle = new Extension("documentTitle", "Document Title");
var layout;
documentTitle.onLayoutCreated = function(layoutParameter) {
layout = layoutParameter;
};
var fileDesc; var fileDesc;
var $fileTitleNavbar; var $fileTitleNavbar;
var updateTitle = _.debounce(function(fileDescParameter) { var updateTitle = _.debounce(function(fileDescParameter) {
@ -23,8 +18,6 @@ define([
$fileTitleNavbar.html(fileDesc.composeTitle()); $fileTitleNavbar.html(fileDesc.composeTitle());
$(".file-title").text(title); $(".file-title").text(title);
$(".input-file-title").val(title); $(".input-file-title").val(title);
layout && layout.resizeAll();
}, 50); }, 50);
documentTitle.onFileSelected = function(fileDescParameter) { documentTitle.onFileSelected = function(fileDescParameter) {
@ -38,7 +31,7 @@ define([
documentTitle.onNewPublishSuccess = updateTitle; documentTitle.onNewPublishSuccess = updateTitle;
documentTitle.onPublishRemoved = updateTitle; documentTitle.onPublishRemoved = updateTitle;
documentTitle.onReady = updateTitle; documentTitle.onReady = updateTitle;
documentTitle.onReady = function() { documentTitle.onReady = function() {
$fileTitleNavbar = $(".file-title-navbar"); $fileTitleNavbar = $(".file-title-navbar");
// Add a scrolling effect on hover // Add a scrolling effect on hover
@ -56,4 +49,4 @@ define([
return documentTitle; return documentTitle;
}); });

28
public/res/extensions/scrollLink.js
View File

@ -17,6 +17,11 @@ define([
sectionList = sectionListParam; sectionList = sectionListParam;
}; };
var isPreviewVisible = true;
scrollLink.onPreviewToggle = function(isOpen) {
isPreviewVisible = isOpen;
};
var $editorElt; var $editorElt;
var $previewElt; var $previewElt;
var mdSectionList = []; var mdSectionList = [];
@ -196,21 +201,6 @@ define([
buildSections(); buildSections();
}; };
var isPreviewVisible = true;
function setPreviewHidden() {
isPreviewVisible = false;
}
function setPreviewVisible() {
isPreviewVisible = true;
}
scrollLink.onLayoutConfigure = function(layoutGlobalConfig) {
layoutGlobalConfig.east__onclose = setPreviewHidden;
layoutGlobalConfig.south__onclose = setPreviewHidden;
layoutGlobalConfig.east__onopen_start = setPreviewVisible;
layoutGlobalConfig.south__onclose_start = setPreviewVisible;
};
scrollLink.onFileClosed = function() { scrollLink.onFileClosed = function() {
mdSectionList = []; mdSectionList = [];
}; };
@ -228,22 +218,20 @@ define([
} }
scrollAdjust = false; scrollAdjust = false;
}); });
var handleEditorScroll = function() { $editorElt.scroll(function() {
if(isEditorMoving === false) { if(isEditorMoving === false) {
isScrollEditor = true; isScrollEditor = true;
isScrollPreview = false; isScrollPreview = false;
doScrollLink(); doScrollLink();
} }
}; });
$editorElt.scroll(handleEditorScroll);
}; };
var $previewContentsElt; var $previewContentsElt;
scrollLink.onPagedownConfigure = function(editor) { scrollLink.onPagedownConfigure = function(editor) {
$previewContentsElt = $("#preview-contents"); $previewContentsElt = $("#preview-contents");
editor.getConverter().hooks.chain("postConversion", function(text) { editor.getConverter().hooks.chain("postConversion", function(text) {
// To avoid losing scrolling position before elements are fully // To avoid losing scrolling position before elements are fully loaded
// loaded
$previewContentsElt.height($previewContentsElt.height()); $previewContentsElt.height($previewContentsElt.height());
return text; return text;
}); });

16
public/res/extensions/shortcuts.js
View File

@ -15,13 +15,11 @@ define([
}; };
var eventMgr; var eventMgr;
var clickPagedownButton; var pagedownEditor;
shortcuts.onEventMgrCreated = function(eventMgrParameter) { shortcuts.onEventMgrCreated = function(eventMgrParameter) {
eventMgr = eventMgrParameter; eventMgr = eventMgrParameter;
eventMgr.addListener('onPagedownConfigure', function(pagedownEditor) { eventMgr.addListener('onPagedownConfigure', function(pagedownEditorParam) {
clickPagedownButton = function(buttonName) { pagedownEditor = pagedownEditorParam;
pagedownEditor.uiManager.doClick(pagedownEditor.uiManager.buttons[buttonName]);
};
}); });
}; };
@ -42,6 +40,14 @@ define([
} }
}; };
/*jshint unused:false */
function bindPagedownButton(buttonName) {
return function(evt) {
pagedownEditor.uiManager.doClick(pagedownEditor.uiManager.buttons[buttonName]);
evt.preventDefault();
};
}
shortcuts.onInit = function() { shortcuts.onInit = function() {
try { try {
/*jshint evil: true */ /*jshint evil: true */

35
public/res/extensions/shortcutsDefaultMapping.js
View File

@ -1,17 +1,32 @@
{ {
'mod+r': function() { 'mod+b': bindPagedownButton('bold'),
clickPagedownButton('hr'); 'mod+i': bindPagedownButton('italic'),
'mod+l': bindPagedownButton('link'),
'mod+q': bindPagedownButton('quote'),
'mod+k': bindPagedownButton('code'),
'mod+g': bindPagedownButton('image'),
'mod+o': bindPagedownButton('olist'),
'mod+u': bindPagedownButton('ulist'),
'mod+h': bindPagedownButton('heading'),
'mod+r': bindPagedownButton('hr'),
'mod+z': bindPagedownButton('undo'),
'mod+y': bindPagedownButton('redo'),
'mod+shift+z': bindPagedownButton('redo'),
'mod+d': function(evt) {
$('.button-open-discussion').click();
evt.preventDefault();
}, },
'mod+z': function() { '= = > space': function() {
require('editor').undoMgr.undo(); setTimeout(function() {
require('editor').replacePreviousText('==> ', '⇒ ');
}, 0);
}, },
'mod+y': function() { '< = = space': function() {
require('editor').undoMgr.redo(); setTimeout(function() {
}, require('editor').replacePreviousText('<== ', '⇐ ');
'mod+shift+z': function() { }, 0);
require('editor').undoMgr.redo();
}, },
'S t a c k E d i t': function() { 'S t a c k E d i t': function() {
eventMgr.onMessage('StackEdit is so good!!!'); eventMgr.onMessage("You are stunned!!! Aren't you?");
} }
} }

27
public/res/layout.js
View File

@ -109,15 +109,17 @@ define([
}, this)); }, this));
this.$elt.addClass('bring-to-front'); this.$elt.addClass('bring-to-front');
} }
onToggle && onToggle(this.isOpen); laterCssQueue.push(_.bind(function() {
onToggle && onToggle(this.isOpen);
}, this));
} }
else { else {
onToggle && onToggle(false);
backdropElt && backdropElt.removeBackdrop(); backdropElt && backdropElt.removeBackdrop();
backdropElt = undefined; backdropElt = undefined;
laterCssQueue.push(_.bind(function() { laterCssQueue.push(_.bind(function() {
!this.isOpen && this.$elt.find('.in').collapse('hide'); !this.isOpen && this.$elt.find('.in').collapse('hide');
this.$elt.toggleClass('panel-open', this.isOpen).toggleClass('bring-to-front', (!!backdrop && this.isOpen)); this.$elt.toggleClass('panel-open', this.isOpen).toggleClass('bring-to-front', (!!backdrop && this.isOpen));
onToggle && onToggle(this.isOpen);
}, this)); }, this));
} }
startAnimation(); startAnimation();
@ -185,11 +187,12 @@ define([
wrapperL3.width = windowSize.width; wrapperL3.width = windowSize.width;
wrapperL3.height = wrapperL1.height - navbarHeight; wrapperL3.height = wrapperL1.height - navbarHeight;
if(navbar.isOpen && wrapperL3.height < editorMinSize.height + resizerSize) {
navbar.isOpen = false;
return resizeAll();
}
if(isVertical) { if(isVertical) {
if(navbar.isOpen && wrapperL3.height < editorMinSize.height + resizerSize) {
navbar.isOpen = false;
return resizeAll();
}
if(!previewPanel.isOpen) { if(!previewPanel.isOpen) {
previewPanel.y = wrapperL3.height - resizerSize; previewPanel.y = wrapperL3.height - resizerSize;
} }
@ -223,10 +226,6 @@ define([
previewResizer.width = previewContainer.width; previewResizer.width = previewContainer.width;
} }
else { else {
if(navbar.isOpen && wrapperL3.height < editorMinSize.height + resizerSize) {
navbar.isOpen = false;
return resizeAll();
}
if(!previewPanel.isOpen) { if(!previewPanel.isOpen) {
previewPanel.x = wrapperL3.width - resizerSize; previewPanel.x = wrapperL3.width - resizerSize;
} }
@ -306,6 +305,7 @@ define([
previewPanel.isOpen = true; previewPanel.isOpen = true;
previewPanel.createToggler(false, function(isOpen) { previewPanel.createToggler(false, function(isOpen) {
$previewButtonsElt.toggleClass('hide', !isOpen); $previewButtonsElt.toggleClass('hide', !isOpen);
eventMgr.onPreviewToggle(isOpen);
}); });
previewPanel.halfSize = true; previewPanel.halfSize = true;
previewToggler.$elt.click(_.bind(previewPanel.toggle, previewPanel)); previewToggler.$elt.click(_.bind(previewPanel.toggle, previewPanel));
@ -318,8 +318,6 @@ define([
documentPanel.createToggler(true); documentPanel.createToggler(true);
documentPanel.$elt.find('.toggle-button').click(_.bind(documentPanel.toggle, documentPanel)); documentPanel.$elt.find('.toggle-button').click(_.bind(documentPanel.toggle, documentPanel));
// Hide menu panel when clicking 'Save as' button // Hide menu panel when clicking 'Save as' button
$('.collapse-save-as a').click(function() { $('.collapse-save-as a').click(function() {
menuPanel.toggle(false); menuPanel.toggle(false);
@ -385,8 +383,8 @@ define([
}); });
// Configure Mousetrap // Configure Mousetrap
mousetrap.stopCallback = function(e, element) { mousetrap.stopCallback = function() {
return menuPanel.isOpen || documentPanel.isOpen || isModalShown || $(element).is("input, select, textarea:not(.ace_text-input)"); return menuPanel.isOpen || documentPanel.isOpen || isModalShown;
}; };
$(window).resize(resizeAll); $(window).resize(resizeAll);
@ -427,5 +425,6 @@ define([
resizeAll(); resizeAll();
}; };
eventMgr.onLayoutCreated(layout);
return layout; return layout;
}); });

4
public/res/styles/base.less
View File

@ -280,7 +280,7 @@ kbd {
[class^="icon-"], [class*=" icon-"] { [class^="icon-"], [class*=" icon-"] {
display: inline-block; display: inline-block;
line-height: 1.2em; line-height: 1.35em;
vertical-align: middle; vertical-align: middle;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
@ -302,7 +302,7 @@ kbd {
} }
.icon-chart-bar { .icon-chart-bar {
font-size: 90%; font-size: 95%;
&:before { &:before {
margin-left: 0.3em; margin-left: 0.3em;
margin-right: 0.3em; margin-right: 0.3em;

6
public/res/styles/main.less
View File

@ -972,7 +972,7 @@ a {
} }
.layout-animate { .layout-animate {
.transition(350ms ease-in-out all); .transition-transform(350ms ease-in-out);
} }
.layout-resizer { .layout-resizer {
@ -998,7 +998,7 @@ a {
} }
&.layout-toggler-preview { &.layout-toggler-preview {
.layout-animate & { .layout-animate & {
.transition(350ms ease-in-out all); .transition-transform(350ms ease-in-out);
} }
line-height: 55px; line-height: 55px;
i:before { i:before {
@ -1021,7 +1021,7 @@ a {
line-height: 0; line-height: 0;
i { i {
font-size: 16px; font-size: 16px;
height: 10.5px; height: 12px;
overflow: hidden; overflow: hidden;
} }
} }