Skip to content

Commit

Permalink
Merge pull request #217 from mikagenic/fixInsertHtmlNewline
Browse files Browse the repository at this point in the history 
fix set html inserts extra new line at the end
  • Loading branch information
@mikelehen
mikelehen committed Dec 15, 2015
2 parents cc458e4 + 6d7ae30 commit b4801ea
Show file tree
Hide file tree
Showing 2 changed files with 133 additions and 44 deletions.
171 changes: 130 additions & 41 deletions examples/firepad.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/*
* Firepad http://www.firepad.io/
/*!
* Firepad is an open-source, collaborative code and text editor. It was designed
* to be embedded inside larger applications. Since it uses Firebase as a backend,
* it requires no server-side code and can be added to any web app simply by
* including a couple JavaScript files.
*
* Copyright 2014 Firebase
* with code from ot.js (Copyright 2012-2013 Tim Baumann)
*
* Version 0.0.0
* Firepad 1.2.0
* http://www.firepad.io/
* License: MIT
* Copyright: 2014 Firebase
* With code from ot.js (Copyright 2012-2013 Tim Baumann)
*/

(function (name, definition, context) {
Expand Down Expand Up @@ -1375,10 +1379,22 @@ firepad.FirebaseAdapter = (function (global) {
utils.makeEventEmitter(FirebaseAdapter, ['ready', 'cursor', 'operation', 'ack', 'retry']);

FirebaseAdapter.prototype.dispose = function() {
var self = this;

if (!this.ready_) {
// TODO: this completes loading the text even though we're no longer interested in it.
this.on('ready', function() {
self.dispose();
});
return;
}

this.removeFirebaseCallbacks_();

this.userRef_.child('cursor').remove();
this.userRef_.child('color').remove();
if (this.userRef_) {
this.userRef_.child('cursor').remove();
this.userRef_.child('color').remove();
}

this.ref_ = null;
this.document_ = null;
Expand All @@ -1387,7 +1403,8 @@ firepad.FirebaseAdapter = (function (global) {

FirebaseAdapter.prototype.setUserId = function(userId) {
if (this.userRef_) {
// clean up existing data.
// Clean up existing data. Avoid nuking another user's data
// (if a future user takes our old name).
this.userRef_.child('cursor').remove();
this.userRef_.child('cursor').onDisconnect().cancel();
this.userRef_.child('color').remove();
Expand Down Expand Up @@ -2408,15 +2425,15 @@ firepad.EditorClient = (function () {

firepad.utils.makeEventEmitter(firepad.EditorClient, ['synced']);

var ACEAdapter, firepad,
var firepad,
__bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
__slice = [].slice;

if (typeof firepad === "undefined" || firepad === null) {
firepad = {};
}

firepad.ACEAdapter = ACEAdapter = (function() {
firepad.ACEAdapter = (function() {
ACEAdapter.prototype.ignoreChanges = false;

function ACEAdapter(aceInstance) {
Expand Down Expand Up @@ -2472,9 +2489,9 @@ firepad.ACEAdapter = ACEAdapter = (function() {

ACEAdapter.prototype.onCursorActivity = function() {
var _this = this;
return setTimeout((function() {
return setTimeout(function() {
return _this.trigger('cursorActivity');
}), 0);
}, 0);
};

ACEAdapter.prototype.operationFromACEChange = function(change) {
Expand Down Expand Up @@ -2900,7 +2917,7 @@ firepad.RichTextCodeMirror = (function () {
bind(this, 'onCodeMirrorChange_');
bind(this, 'onCursorActivity_');

if (/^4\./.test(CodeMirror.version)) {
if (parseInt(CodeMirror.version) >= 4) {
this.codeMirror.on('changes', this.onCodeMirrorChange_);
} else {
this.codeMirror.on('change', this.onCodeMirrorChange_);
Expand Down Expand Up @@ -3198,6 +3215,7 @@ firepad.RichTextCodeMirror = (function () {
while (newNodesLen--) {
var newNode = newNodes[newNodesLen];
if (oldNode.pos == newNode.pos &&
oldNode.length == newNode.length &&
oldNode.annotation.attributes['ent'] &&
oldNode.annotation.attributes['ent'] == newNode.annotation.attributes['ent']) {
var entityType = newNode.annotation.attributes['ent'];
Expand Down Expand Up @@ -3754,9 +3772,7 @@ firepad.RichTextCodeMirror = (function () {

RichTextCodeMirror.prototype.onCursorActivity_ = function() {
var self = this;

clearTimeout(self.cursorTimeout);
self.cursorTimeout = setTimeout(function() {
setTimeout(function() {
self.updateCurrentAttributes_();
}, 1);
};
Expand Down Expand Up @@ -3890,9 +3906,7 @@ firepad.RichTextCodeMirror = (function () {
delete attributes[ATTR.LINE_INDENT];
});
} else if (backspaceAtStartOfLine && indent && indent > 0) {
this.updateLineAttributes(cursorPos.line, cursorPos.line, function(attributes) {
attributes[ATTR.LINE_INDENT]--;
});
this.unindent();
} else {
cm.deleteH(-1, "char");
}
Expand Down Expand Up @@ -4181,7 +4195,13 @@ firepad.RichTextCodeMirrorAdapter = (function () {
};

RichTextCodeMirrorAdapter.prototype.onCursorActivity = function () {
this.trigger('cursorActivity');
// We want to push cursor changes to Firebase AFTER edits to the history,
// because the cursor coordinates will already be in post-change units.
// Sleeping for 1ms ensures that sendCursor happens after sendOperation.
var self = this;
setTimeout(function() {
self.trigger('cursorActivity');
}, 1);
}

RichTextCodeMirrorAdapter.prototype.onFocus = function () {
Expand Down Expand Up @@ -4266,7 +4286,13 @@ firepad.RichTextCodeMirrorAdapter = (function () {
} else {
// show selection
var selectionClassName = 'selection-' + color.replace('#', '');
var rule = '.' + selectionClassName + ' { background: ' + color + '; }';
var transparency = 0.4;
var rule = '.' + selectionClassName + ' {' +
// fallback for browsers w/out rgba (rgb w/ transparency)
' background: ' + hex2rgb(color) + ';\n' +
// rule with alpha takes precedence if supported
' background: ' + hex2rgb(color, transparency) + ';' +
'}';
this.addStyleRule(rule);

var fromPos, toPos;
Expand Down Expand Up @@ -4374,6 +4400,29 @@ firepad.RichTextCodeMirrorAdapter = (function () {
return true;
}

function hex2rgb (hex, transparency) {
if (typeof hex !== 'string') {
throw new TypeError('Expected a string');
}
hex = hex.replace(/^#/, '');
if (hex.length === 3) {
hex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2];
}
var num = parseInt(hex, 16);
var rgb = [num >> 16, num >> 8 & 255, num & 255];
var type = 'rgb';
if (exists(transparency)) {
type = 'rgba';
rgb.push(transparency);
}
// rgb(r, g, b) or rgba(r, g, b, t)
return type + '(' + rgb.join(',') + ')';
}

function exists (val) {
return val !== null && val !== undefined;
}

return RichTextCodeMirrorAdapter;
}());

Expand Down Expand Up @@ -5092,7 +5141,7 @@ firepad.textPiecesToInserts = function(atNewLine, textPieces) {
atNewLine = string[string.length-1] === '\n';
}

function insertLine(line) {
function insertLine(line, withNewline) {
// HACK: We should probably force a newline if there isn't one already. But due to
// the way this is used for inserting HTML, we end up inserting a "line" in the middle
// of text, in which case we don't want to actually insert a newline.
Expand All @@ -5104,12 +5153,12 @@ firepad.textPiecesToInserts = function(atNewLine, textPieces) {
insert(line.textPieces[i]);
}

insert('\n');
if (withNewline) insert('\n');
}

for(var i = 0; i < textPieces.length; i++) {
if (textPieces[i] instanceof firepad.Line) {
insertLine(textPieces[i]);
insertLine(textPieces[i], i<textPieces.length-1);
} else {
insert(textPieces[i]);
}
Expand All @@ -5130,29 +5179,46 @@ firepad.Headless = (function() {
var EntityManager = firepad.EntityManager;
var ParseHtml = firepad.ParseHtml;

function Headless(ref) {
function Headless(refOrPath) {
// Allow calling without new.
if (!(this instanceof Headless)) { return new Headless(ref); }
if (!(this instanceof Headless)) { return new Headless(refOrPath); }

this.adapter = new FirebaseAdapter(ref);
this.ready = false;
this.entityManager = new EntityManager();
if (typeof refOrPath === 'string') {
if (typeof Firebase !== 'function') {
var firebase = require('firebase');
} else {
var firebase = Firebase;
}
var ref = new firebase(refOrPath);
} else {
var ref = refOrPath;
}

this.entityManager_ = new EntityManager();

this.firebaseAdapter_ = new FirebaseAdapter(ref);
this.ready_ = false;
this.zombie_ = false;
}

Headless.prototype.getDocument = function(callback) {
var self = this;

if (self.ready) {
return callback(self.adapter.getDocument());
if (self.ready_) {
return callback(self.firebaseAdapter_.getDocument());
}

self.adapter.on('ready', function() {
self.ready = true;
callback(self.adapter.getDocument());
self.firebaseAdapter_.on('ready', function() {
self.ready_ = true;
callback(self.firebaseAdapter_.getDocument());
});
}

Headless.prototype.getText = function(callback) {
if (this.zombie_) {
throw new Error('You can\'t use a firepad.Headless after calling dispose()!');
}

this.getDocument(function(doc) {
var text = doc.apply('');

Expand All @@ -5165,6 +5231,10 @@ firepad.Headless = (function() {
}

Headless.prototype.setText = function(text, callback) {
if (this.zombie_) {
throw new Error('You can\'t use a firepad.Headless after calling dispose()!');
}

var op = TextOperation().insert(text);
this.sendOperationWithRetry(op, callback);
}
Expand All @@ -5190,18 +5260,26 @@ firepad.Headless = (function() {
Headless.prototype.getHtml = function(callback) {
var self = this;

if (this.zombie_) {
throw new Error('You can\'t use a firepad.Headless after calling dispose()!');
}

self.initializeFakeDom(function() {
self.getDocument(function(doc) {
callback(firepad.SerializeHtml(doc, this.entityManager));
callback(firepad.SerializeHtml(doc, self.entityManager_));
});
});
}

Headless.prototype.setHtml = function(html, callback) {
var self = this;

if (this.zombie_) {
throw new Error('You can\'t use a firepad.Headless after calling dispose()!');
}

self.initializeFakeDom(function() {
var textPieces = ParseHtml(html, self.entityManager);
var textPieces = ParseHtml(html, self.entityManager_);
var inserts = firepad.textPiecesToInserts(true, textPieces);
var op = new TextOperation();

Expand All @@ -5218,7 +5296,7 @@ firepad.Headless = (function() {

self.getDocument(function(doc) {
var op = operation.clone()['delete'](doc.targetLength);
self.adapter.sendOperation(op, function(err, committed) {
self.firebaseAdapter_.sendOperation(op, function(err, committed) {
if (committed) {
if (typeof callback !== "undefined") {
callback(null, committed);
Expand All @@ -5230,6 +5308,12 @@ firepad.Headless = (function() {
});
}

Headless.prototype.dispose = function() {
this.zombie_ = true; // We've been disposed. No longer valid to do anything.

this.firebaseAdapter_.dispose();
};

return Headless;
})();

Expand Down Expand Up @@ -5259,6 +5343,8 @@ firepad.Firepad = (function(global) {
throw new Error('Couldn\'t find CodeMirror or ACE. Did you forget to include codemirror.js or ace.js?');
}

this.zombie_ = false;

if (CodeMirror && place instanceof CodeMirror) {
this.codeMirror_ = this.editor_ = place;
var curValue = this.codeMirror_.getValue();
Expand Down Expand Up @@ -5409,6 +5495,7 @@ firepad.Firepad = (function(global) {
};

Firepad.prototype.setText = function(textPieces) {
this.assertReady_('setText');
if (this.ace_) {
return this.ace_.getSession().getDocument().setValue(textPieces);
} else {
Expand All @@ -5419,6 +5506,7 @@ firepad.Firepad = (function(global) {
this.codeMirror_.getWrapperElement().setAttribute('style', '');
this.codeMirror_.refresh();
}
this.editorAdapter_.setCursor({position: 0, selectionEnd: 0});
};

Firepad.prototype.insertTextAtCursor = function(textPieces) {
Expand Down Expand Up @@ -5471,6 +5559,7 @@ firepad.Firepad = (function(global) {
};

Firepad.prototype.getHtmlFromRange = function(start, end) {
this.assertReady_('getHtmlFromRange');
var doc = (start != null && end != null) ?
this.getOperationForSpan(start, end) :
this.getOperationForSpan(0, this.codeMirror_.getValue().length);
Expand Down Expand Up @@ -5610,7 +5699,7 @@ firepad.Firepad = (function(global) {
throw new Error('You must wait for the "ready" event before calling ' + funcName + '.');
}
if (this.zombie_) {
throw new Error('You can\'t use a Firepad after calling dispose()!');
throw new Error('You can\'t use a Firepad after calling dispose()! [called ' + funcName + ']');
}
};

Expand Down Expand Up @@ -5721,7 +5810,7 @@ firepad.Firepad = (function(global) {
}
var hue = a/360;

return hsl2hex(hue, 1, 0.85);
return hsl2hex(hue, 1, 0.75);
}

function rgb2hex (r, g, b) {
Expand Down Expand Up @@ -5763,4 +5852,4 @@ firepad.Firepad.Headless = firepad.Headless;
firepad.Firepad.RichTextCodeMirrorAdapter = firepad.RichTextCodeMirrorAdapter;
firepad.Firepad.ACEAdapter = firepad.ACEAdapter;

return firepad.Firepad; }, this);
return firepad.Firepad; }, this);
Loading

0 comments on commit b4801ea

Please sign in to comment.