From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/js/editor.dev.js | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/main/js/editor.dev.js b/src/main/js/editor.dev.js
index 62b6b4c..bbe67d3 100644
--- a/src/main/js/editor.dev.js
+++ b/src/main/js/editor.dev.js
@@ -70,19 +70,19 @@
var selection = pm.selection;
var from = selection.from;
var to = selection.to;
- var attr = {name:"make", level:1};
+ var attr = {name:"make", level:"1"};
- var node = pm.doc.path(from.path);
+ var node = pm.doc.resolve(from).parent;
if (node && node.hasMarkup(pm.schema.nodes.heading, attr)) {
- return pm.tr.setBlockType(from, to, pm.schema.nodes.paragraph, {}).apply(pm.apply.scroll);
+ return pm.tr.setBlockType(from, to, pm.schema.defaultTextblockType(), {}).apply(pm.apply.scroll);
} else {
return pm.tr.setBlockType(from, to, pm.schema.nodes.heading, attr).apply(pm.apply.scroll);
}
},
active: function active(pm) {
- var node = pm.doc.path(pm.selection.from.path);
- if (node && node.hasMarkup(pm.schema.nodes.heading, {name:"make", level:1})) {
+ var node = pm.doc.resolve(pm.selection.from).parent;
+ if (node && node.hasMarkup(pm.schema.nodes.heading, {name:"make", level:"1"})) {
return true;
}
return false;
@@ -102,19 +102,19 @@
var selection = pm.selection;
var from = selection.from;
var to = selection.to;
- var attr = {name:"make", level:2};
+ var attr = {name:"make", level:"2"};
- var node = pm.doc.path(from.path);
+ var node = pm.doc.resolve(from).parent;
if (node && node.hasMarkup(pm.schema.nodes.heading, attr)) {
- return pm.tr.setBlockType(from, to, pm.schema.nodes.paragraph, {}).apply(pm.apply.scroll);
+ return pm.tr.setBlockType(from, to, pm.schema.defaultTextblockType(), {}).apply(pm.apply.scroll);
} else {
return pm.tr.setBlockType(from, to, pm.schema.nodes.heading, attr).apply(pm.apply.scroll);
}
},
active: function active(pm) {
- var node = pm.doc.path(pm.selection.from.path);
- if (node && node.hasMarkup(pm.schema.nodes.heading, {name:"make", level:2})) {
+ var node = pm.doc.resolve(pm.selection.from).parent;
+ if (node && node.hasMarkup(pm.schema.nodes.heading, {name:"make", level:"2"})) {
return true;
}
return false;
@@ -134,19 +134,19 @@
var selection = pm.selection;
var from = selection.from;
var to = selection.to;
- var attr = {name:"make", level:3};
+ var attr = {name:"make", level:"3"};
- var node = pm.doc.path(from.path);
+ var node = pm.doc.resolve(from).parent;
if (node && node.hasMarkup(pm.schema.nodes.heading, attr)) {
- return pm.tr.setBlockType(from, to, pm.schema.nodes.paragraph, {}).apply(pm.apply.scroll);
+ return pm.tr.setBlockType(from, to, pm.schema.defaultTextblockType(), {}).apply(pm.apply.scroll);
} else {
return pm.tr.setBlockType(from, to, pm.schema.nodes.heading, attr).apply(pm.apply.scroll);
}
},
active: function active(pm) {
- var node = pm.doc.path(pm.selection.from.path);
- if (node && node.hasMarkup(pm.schema.nodes.heading, {name:"make", level:3})) {
+ var node = pm.doc.resolve(pm.selection.from).parent;
+ if (node && node.hasMarkup(pm.schema.nodes.heading, {name:"make", level:"3"})) {
return true;
}
return false;
@@ -199,6 +199,15 @@
}
};
+ updateCmd["selectParentNode"] = {
+ menu: {
+ group: "insertCommands", rank: 10,
+ display: {
+ render: function(cmd, pm) { return renderFontAwesomeIcon(cmd, pm, "fa-arrow-circle-o-left"); }
+ }
+ }
+ };
+
var pm = window.pm = new edit.ProseMirror({
place: document.querySelector('#visualEditor'),
autoInput: true,
@@ -235,7 +244,6 @@
var icon = document.createElement("i");
icon.setAttribute("class", "fa fa-fw " + classNames);
- //TODO: try modify parent to simplify css border etc
var active = cmd.active(pm);
if (active || cmd.spec.invert) node.classList.add("ProseMirror-menu-active");
--
Gitblit v1.9.1