Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some concord updates that are helpful, but generic and robust. #12

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Some concord updates that are helpful, but generic and robust. #12

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da40151
Update concord.js
Oct 16, 2016
c6efc62
Update concord.js
Oct 16, 2016
3f2131a
Update concord.js
Oct 17, 2016
73ea03b
listeners should not listen to entire doc
Oct 18, 2016
cf9f905
Reverse some changes and add backspace function
Oct 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 99 additions & 19 deletions concord.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,19 +548,31 @@ function ConcordEditor(root, concordInstance) {
}

var subheads;

if (!flsubsonly) { //8/5/13 by DW
opml += '<outline text="' + ConcordUtil.escapeXml(text) + '"';
var attributes = node.data("attributes");
var attributes = node.context.attributes; //node.data("attributes"); // didn't grab attributes

if(attributes===undefined){
attributes={};
}
for(var name in attributes){
if((name!==undefined) && (name!="") && (name != "text")) {
if(attributes[name]!==undefined){
opml += ' ' + name + '="' + ConcordUtil.escapeXml(attributes[name]) + '"';
}
}

// didn't grab attributes
// for(var name in attributes){
// if((name!==undefined) && (name!="") && (name != "text")) {
// if(attributes[name]!==undefined){
// opml += ' ' + name + '="' + ConcordUtil.escapeXml(attributes[name]) + '"';
// }
// }
// }

//attributes grabber replaced with this ...
$(attributes).each(function(i, item) {
if (item.name != 'class') {
opml += ' ' + item.name + '="' + ConcordUtil.escapeXml(item.value) + '"';
}
})

subheads = node.children("ol").children(".concord-node");
if(subheads.length==0){
opml+="/>\n";
Expand Down Expand Up @@ -677,6 +689,12 @@ function ConcordEditor(root, concordInstance) {
level = 1;
}
var node = $("<li></li>");

// allow outside callback function to manipulate dom
if (this.createNodeFromOutlineItem) {
node = this.createNodeFromOutlineItem($(outline[0].attributes));
}

node.addClass("concord-node");
node.addClass("concord-level-"+level);
var attributes = {};
Expand Down Expand Up @@ -1459,13 +1477,15 @@ function ConcordOp(root, concordInstance, _cursor) {
}
};
this.deleteLine = function() {

this.saveState();
if(this.inTextMode()){
var cursor = this.getCursor();
var p = cursor.prev();
if(p.length==0){
p = cursor.parents(".concord-node:first");
}

cursor.remove();
if(p.length==1) {
this.setCursor(p);
Expand All @@ -1478,6 +1498,21 @@ function ConcordOp(root, concordInstance, _cursor) {
}
}else{
var selected = root.find(".selected");

// get attributes for each element
// since they may not be referencable once deleted
var nodeAttribues = []
selected.each(function(){
var attribs = {}
for (var i = 0; i < this.attributes.length; i++) {
var attrib = this.attributes[i];
attribs[attrib.name] = attrib.value;
}
nodeAttribues.push(attribs);
});

concordInstance.fireCallback("opDeleteLine", nodeAttribues);

if(selected.length == 1) {
var p = selected.prev();
if(p.length==0){
Expand Down Expand Up @@ -1517,6 +1552,7 @@ function ConcordOp(root, concordInstance, _cursor) {
var node = this.insert("", down);
this.setCursor(node);
}

this.markChanged();
};
this.deleteSubs = function() {
Expand All @@ -1530,6 +1566,7 @@ function ConcordOp(root, concordInstance, _cursor) {
this.markChanged();
};
this.demote = function() {
console.log("Demote was called.", 1539);
var node = this.getCursor();
var movedSiblings = false;
if(node.nextAll().length>0){
Expand All @@ -1542,6 +1579,7 @@ function ConcordOp(root, concordInstance, _cursor) {
});
concordInstance.editor.recalculateLevels(node.find(".concord-node"));
this.markChanged();

}
};
this.expand = function(triggerCallbacks) {
Expand Down Expand Up @@ -1577,11 +1615,13 @@ function ConcordOp(root, concordInstance, _cursor) {
}
};
this.expandAllLevels = function() {
var node = this.getCursor();
if(node.length == 1) {
node.removeClass("collapsed");
node.find(".concord-node").removeClass("collapsed");
}
root.find(".concord-node").removeClass("collapsed");
// if expand all levels then why are you only expanding based on cursor?
// var node = this.getCursor();
// if(node.length == 1) {
// node.removeClass("collapsed");
// node.find(".concord-node").removeClass("collapsed");
// }
};
this.focusCursor = function(){
this.getCursor().children(".concord-wrapper").children(".concord-text").focus();
Expand Down Expand Up @@ -2141,6 +2181,7 @@ function ConcordOp(root, concordInstance, _cursor) {
clonedMove.insertAfter(parent);
concordInstance.editor.recalculateLevels(parent.nextAll(".concord-node"));
ableToMoveInDirection = true;
concordInstance.fireCallback("opDemote", clonedMove);
}
break;
case right:
Expand Down Expand Up @@ -2173,6 +2214,7 @@ function ConcordOp(root, concordInstance, _cursor) {
prev.removeClass("collapsed");
concordInstance.editor.recalculateLevels(prev.find(".concord-node"));
ableToMoveInDirection = true;
concordInstance.fireCallback("opPromote", clonedMove);
}
break;
}
Expand Down Expand Up @@ -2724,11 +2766,34 @@ function Op(opmltext){
fakeDom.concord().op.xmlToOutline(opmltext);
return fakeDom.concord().op;
}

/************************
*
* LISTENERS
*
*******************/

(function($) {
$.fn.concord = function(options) {
return new ConcordOutline($(this), options);
};
$(document).on("keydown", function(event) {
}; // should be part of init function

// signal key up on node text
$(document).on("keyup", ".concord-node",function(event) {
var focusRoot = concord.getFocusRoot();
if(focusRoot==null){
return;
}
var context = focusRoot;
var concordInstance = new ConcordOutline(context.parent());
if ( !((event.which>=37) && (event.which <=40)) && !(event.which == 9 || event.which == 16) ){
concordInstance.fireCallback("opTextChange", event);
}
concordInstance.fireCallback("opKeyUp", event);
});

$(document).on("keydown", function(event) {

if(!concord.handleEvents){
return;
}
Expand Down Expand Up @@ -2762,6 +2827,7 @@ function Op(opmltext){
switch(event.which) {
case 8:
//Backspace

if(concord.mobile){
if((concordInstance.op.getLineText()=="") || (concordInstance.op.getLineText()=="<br>")){
event.preventDefault();
Expand All @@ -2774,6 +2840,15 @@ function Op(opmltext){
concordInstance.op.saveState();
concordInstance.op.getCursor().addClass("dirty");
}

// if user is backspacing in an empty node
// switch to select mode so they may use backspace again
// to delete the node
if (concordInstance.op.getLineText() == "") {

concordInstance.op.setTextMode(false)
}

}else{
keyCaptured = true;
event.preventDefault();
Expand Down Expand Up @@ -2832,11 +2907,12 @@ function Op(opmltext){
break;
case 82:
//CMD+R
if(commandKey) {
keyCaptured = true;
event.preventDefault();
concordInstance.op.reorg(right);
}
//this ruins refresh on most browsers
// if(commandKey) {
// keyCaptured = true;
// event.preventDefault();
// concordInstance.op.reorg(right);
// }
break;
case 219:
//CMD+[
Expand Down Expand Up @@ -3144,5 +3220,9 @@ function Op(opmltext){
}
}
});




concord.ready=true;
})(jQuery);