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

Merge branch 'master' of github.com:benweet/stackedit

Browse Source
This commit is contained in:
benweet 2018-02-11 12:32:42 +00:00
commit b51a772299
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "stackedit", "name": "stackedit",
"version": "5.7.0", "version": "5.7.1",
"description": "Free, open-source, full-featured Markdown editor", "description": "Free, open-source, full-featured Markdown editor",
"author": "Benoit Schweblin", "author": "Benoit Schweblin",
"license": "Apache-2.0", "license": "Apache-2.0",

4
src/components/Tour.vue
View File

@ -144,7 +144,7 @@ $tour-step-width: 220px;
.tour-step__inner { .tour-step__inner {
position: absolute; position: absolute;
background-color: $tour-step-background; background-color: $tour-step-background;
padding: 1.25em; padding: 1.5em 1em 1em;
font-size: 0.9em; font-size: 0.9em;
line-height: 1.33; line-height: 1.33;
width: $tour-step-width; width: $tour-step-width;
@ -175,7 +175,7 @@ $tour-step-width: 220px;
.tour-step--welcome &, .tour-step--welcome &,
.tour-step--end & { .tour-step--end & {
left: -$tour-step-width/2; left: -$tour-step-width/2;
top: 30px; top: 36px;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
&::before { &::before {

1
src/components/menus/WorkspacesMenu.vue
View File

@ -15,7 +15,6 @@
<icon-provider slot="icon" provider-id="couchdbWorkspace"></icon-provider> <icon-provider slot="icon" provider-id="couchdbWorkspace"></icon-provider>
<span>Add CouchDB workspace</span> <span>Add CouchDB workspace</span>
</menu-entry> </menu-entry>
<hr>
<menu-entry @click.native="manageWorkspaces"> <menu-entry @click.native="manageWorkspaces">
<icon-database slot="icon"></icon-database> <icon-database slot="icon"></icon-database>
<span>Manage workspaces</span> <span>Manage workspaces</span>

2
src/data/emptyTemplateHelpers.js
View File

@ -11,6 +11,6 @@ Handlebars.registerHelper('transform', function (options) {
Then use the helper in your template: Then use the helper in your template:
{{#transform}}{{{file.content.html}}}{{/transform}} {{#transform}}{{{files.0.content.html}}}{{/transform}}
*/ */

2
src/services/templateWorker.js
View File

@ -59,7 +59,6 @@ const whiteList = {
undefined: 1, undefined: 1,
safeEval: 1, safeEval: 1,
close: 1, close: 1,
Handlebars: 1,
}; };
let global = self; let global = self;
@ -80,6 +79,7 @@ while (global !== Object.prototype) {
}); });
global = Object.getPrototypeOf(global); global = Object.getPrototypeOf(global);
} }
self.Handlebars = Handlebars;
function safeEval(code) { function safeEval(code) {
eval(`"use strict";\n${code}`); // eslint-disable-line no-eval eval(`"use strict";\n${code}`); // eslint-disable-line no-eval