Skip to content

Commit

Permalink
cleanup some complexity
Browse files Browse the repository at this point in the history
  • Loading branch information
@gpoitch
gpoitch committed Aug 26, 2014
1 parent 19a2464 commit 074f846
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 150 deletions.
144 changes: 57 additions & 87 deletions dist/content-kit-editor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ define("content-kit-editor/constants",
var RegEx = {
NEWLINE : /[\r\n]/g,
HTTP_PROTOCOL : /^https?:\/\//i,
HEADING_TAG : /^(H1|H2|H3|H4|H5|H6)$/i,
HEADING_TAG : /^(h1|h2|h3|h4|h5|h6)$/i,
UL_START : /^[-*]\s/,
OL_START : /^1\.\s/
};
Expand All @@ -140,6 +140,7 @@ define("content-kit-editor/constants",
RIGHT : 2
};

// TODO: remove, get from Compiler DefaultBlockTypeSet
var RootTags = [
Type.TEXT.tag,
Type.HEADING.tag,
Expand Down Expand Up @@ -1364,7 +1365,6 @@ define("content-kit-editor/commands/base",
var prompt = options.prompt;
command.name = name;
command.button = options.button || name;
command.editorContext = null;
if (prompt) { command.prompt = prompt; }
}

Expand Down Expand Up @@ -1400,52 +1400,6 @@ define("content-kit-editor/commands/bold",

__exports__["default"] = BoldCommand;
});
define("content-kit-editor/commands/commands",
["./bold","./italic","./link","./quote","./heading","./subheading","./image","./embed","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
"use strict";
// TODO: eliminate this file
var BoldCommand = __dependency1__["default"];
var ItalicCommand = __dependency2__["default"];
var LinkCommand = __dependency3__["default"];
var QuoteCommand = __dependency4__["default"];
var HeadingCommand = __dependency5__["default"];
var SubheadingCommand = __dependency6__["default"];
var ImageCommand = __dependency7__["default"];
var EmbedCommand = __dependency8__["default"];

function createCommandIndex(commands) {
var index = {};
var len = commands.length, i, command;
for(i = 0; i < len; i++) {
command = commands[i];
index[command.name] = command;
}
return index;
}

var TextFormatCommands = {};
TextFormatCommands.all = [
new BoldCommand(),
new ItalicCommand(),
new LinkCommand(),
new QuoteCommand(),
new HeadingCommand(),
new SubheadingCommand()
];

TextFormatCommands.index = createCommandIndex(TextFormatCommands.all);

var EmbedCommands = {};
EmbedCommands.all = [
new ImageCommand(),
new EmbedCommand()
];
EmbedCommands.index = createCommandIndex(EmbedCommands.all);

__exports__.TextFormatCommands = TextFormatCommands;
__exports__.EmbedCommands = EmbedCommands;
});
define("content-kit-editor/commands/embed",
["./base","../views/prompt","../views/message","../../content-kit-compiler/models/embed","../../content-kit-utils/object-utils","../constants","../../ext/content-kit-services","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
Expand Down Expand Up @@ -1832,25 +1786,17 @@ define("content-kit-editor/commands/unordered-list",
__exports__["default"] = UnorderedListCommand;
});
define("content-kit-editor/editor/editor-factory",
["./editor","../commands/commands","../../content-kit-utils/object-utils","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
["./editor","exports"],
function(__dependency1__, __exports__) {
"use strict";
var Editor = __dependency1__["default"];
var TextFormatCommands = __dependency2__.TextFormatCommands;
var EmbedCommands = __dependency2__.EmbedCommands;
var merge = __dependency3__.merge;

var defaults = {
placeholder: 'Write here...',
spellcheck: true,
autofocus: true,
textFormatCommands: TextFormatCommands.all,
embedCommands: EmbedCommands.all
};

/**
* Publically expose this class which sets up indiviual `Editor` classes
* depending if user passes string selector, Node, or NodeList
* @class EditorFactory
* @private
* `EditorFactory` is publically exposed as `Editor`
* It takes an `element` param which can be a css selector, Node, or NodeList
* and sets up indiviual `Editor` instances
*/
function EditorFactory(element, options) {
var editors = [];
Expand All @@ -1865,7 +1811,6 @@ define("content-kit-editor/editor/editor-factory",
}

if (elements) {
options = merge(defaults, options);
elementsLen = elements.length;
for (i = 0; i < elementsLen; i++) {
editors.push(new Editor(elements[i], options));
Expand Down Expand Up @@ -1924,30 +1869,59 @@ define("content-kit-editor/editor/editor-html-renderer",
__exports__["default"] = EditorHTMLRenderer;
});
define("content-kit-editor/editor/editor",
["./editor-html-renderer","../views/text-format-toolbar","../views/tooltip","../views/embed-intent","../commands/unordered-list","../commands/ordered-list","../commands/text-format","../constants","../utils/selection-utils","../utils/paste-utils","../../content-kit-compiler/compiler","../../content-kit-compiler/models/text","../../content-kit-compiler/types/type","../../content-kit-utils/array-utils","../../content-kit-utils/object-utils","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
["./editor-html-renderer","../views/text-format-toolbar","../views/tooltip","../views/embed-intent","../commands/bold","../commands/italic","../commands/link","../commands/quote","../commands/heading","../commands/subheading","../commands/unordered-list","../commands/ordered-list","../commands/image","../commands/embed","../commands/text-format","../constants","../utils/selection-utils","../utils/paste-utils","../../content-kit-compiler/compiler","../../content-kit-compiler/models/text","../../content-kit-compiler/types/type","../../content-kit-utils/array-utils","../../content-kit-utils/object-utils","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __exports__) {
"use strict";
var EditorHTMLRenderer = __dependency1__["default"];
var TextFormatToolbar = __dependency2__["default"];
var Tooltip = __dependency3__["default"];
var EmbedIntent = __dependency4__["default"];
var UnorderedListCommand = __dependency5__["default"];
var OrderedListCommand = __dependency6__["default"];
var TextFormatCommand = __dependency7__["default"];
var RootTags = __dependency8__.RootTags;
var Keycodes = __dependency8__.Keycodes;
var RegEx = __dependency8__.RegEx;
var moveCursorToBeginningOfSelection = __dependency9__.moveCursorToBeginningOfSelection;
var getSelectionTagName = __dependency9__.getSelectionTagName;
var getSelectionBlockElement = __dependency9__.getSelectionBlockElement;
var getSelectionBlockTagName = __dependency9__.getSelectionBlockTagName;
var cleanPastedContent = __dependency10__.cleanPastedContent;
var Compiler = __dependency11__["default"];
var TextModel = __dependency12__["default"];
var Type = __dependency13__["default"];
var toArray = __dependency14__.toArray;
var merge = __dependency15__.merge;
var BoldCommand = __dependency5__["default"];
var ItalicCommand = __dependency6__["default"];
var LinkCommand = __dependency7__["default"];
var QuoteCommand = __dependency8__["default"];
var HeadingCommand = __dependency9__["default"];
var SubheadingCommand = __dependency10__["default"];
var UnorderedListCommand = __dependency11__["default"];
var OrderedListCommand = __dependency12__["default"];
var ImageCommand = __dependency13__["default"];
var EmbedCommand = __dependency14__["default"];
var TextFormatCommand = __dependency15__["default"];
var RootTags = __dependency16__.RootTags;
var Keycodes = __dependency16__.Keycodes;
var RegEx = __dependency16__.RegEx;
var moveCursorToBeginningOfSelection = __dependency17__.moveCursorToBeginningOfSelection;
var getSelectionTagName = __dependency17__.getSelectionTagName;
var getSelectionBlockElement = __dependency17__.getSelectionBlockElement;
var getSelectionBlockTagName = __dependency17__.getSelectionBlockTagName;
var cleanPastedContent = __dependency18__.cleanPastedContent;
var Compiler = __dependency19__["default"];
var TextModel = __dependency20__["default"];
var Type = __dependency21__["default"];
var toArray = __dependency22__.toArray;
var mergeWithOptions = __dependency23__.mergeWithOptions;

var defaults = {
placeholder: 'Write here...',
spellcheck: true,
autofocus: true,
textFormatCommands: [
new BoldCommand(),
new ItalicCommand(),
new LinkCommand(),
new QuoteCommand(),
new HeadingCommand(),
new SubheadingCommand()
],
embedCommands: [
new ImageCommand(),
new EmbedCommand()
],
compiler: new Compiler({
includeTypeNames: true, // output type names for easier debugging
renderer: new EditorHTMLRenderer()
})
};

var editorClassName = 'ck-editor';
var editorClassNameRegExp = new RegExp(editorClassName);
Expand Down Expand Up @@ -2016,7 +1990,7 @@ define("content-kit-editor/editor/editor",
*/
function Editor(element, options) {
var editor = this;
merge(editor, options);
mergeWithOptions(editor, defaults, options);

if (element) {
var className = element.className;
Expand All @@ -2037,10 +2011,6 @@ define("content-kit-editor/editor/editor",
element.setAttribute('contentEditable', true);
editor.element = element;

var compiler = editor.compiler = options.compiler || new Compiler({
includeTypeNames: true, // output type names for easier debugging
renderer: new EditorHTMLRenderer()
});
editor.syncModel();

bindTypingEvents(editor);
Expand Down
3 changes: 1 addition & 2 deletions src/js/content-kit-editor/commands/base.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ function Command(options) {
var prompt = options.prompt;
command.name = name;
command.button = options.button || name;
command.editorContext = null;
if (prompt) { command.prompt = prompt; }
}

Command.prototype.exec = function(){};

export default Command;
export default Command;
40 changes: 0 additions & 40 deletions src/js/content-kit-editor/commands/commands.js
View file

This file was deleted.

3 changes: 2 additions & 1 deletion src/js/content-kit-editor/constants.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var Keycodes = {
var RegEx = {
NEWLINE : /[\r\n]/g,
HTTP_PROTOCOL : /^https?:\/\//i,
HEADING_TAG : /^(H1|H2|H3|H4|H5|H6)$/i,
HEADING_TAG : /^(h1|h2|h3|h4|h5|h6)$/i,
UL_START : /^[-*]\s/,
OL_START : /^1\.\s/
};
Expand All @@ -26,6 +26,7 @@ var ToolbarDirection = {
RIGHT : 2
};

// TODO: remove, get from Compiler DefaultBlockTypeSet
var RootTags = [
Type.TEXT.tag,
Type.HEADING.tag,
Expand Down
18 changes: 5 additions & 13 deletions src/js/content-kit-editor/editor/editor-factory.js
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
import Editor from './editor';
import { TextFormatCommands, EmbedCommands } from '../commands/commands';
import { merge } from '../../content-kit-utils/object-utils';

var defaults = {
placeholder: 'Write here...',
spellcheck: true,
autofocus: true,
textFormatCommands: TextFormatCommands.all,
embedCommands: EmbedCommands.all
};

/**
* Publically expose this class which sets up indiviual `Editor` classes
* depending if user passes string selector, Node, or NodeList
* @class EditorFactory
* @private
* `EditorFactory` is publically exposed as `Editor`
* It takes an `element` param which can be a css selector, Node, or NodeList
* and sets up indiviual `Editor` instances
*/
function EditorFactory(element, options) {
var editors = [];
Expand All @@ -27,7 +20,6 @@ function EditorFactory(element, options) {
}

if (elements) {
options = merge(defaults, options);
elementsLen = elements.length;
for (i = 0; i < elementsLen; i++) {
editors.push(new Editor(elements[i], options));
Expand Down
39 changes: 32 additions & 7 deletions src/js/content-kit-editor/editor/editor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,16 @@ import EditorHTMLRenderer from './editor-html-renderer';
import TextFormatToolbar from '../views/text-format-toolbar';
import Tooltip from '../views/tooltip';
import EmbedIntent from '../views/embed-intent';
import BoldCommand from '../commands/bold';
import ItalicCommand from '../commands/italic';
import LinkCommand from '../commands/link';
import QuoteCommand from '../commands/quote';
import HeadingCommand from '../commands/heading';
import SubheadingCommand from '../commands/subheading';
import UnorderedListCommand from '../commands/unordered-list';
import OrderedListCommand from '../commands/ordered-list';
import ImageCommand from '../commands/image';
import EmbedCommand from '../commands/embed';
import TextFormatCommand from '../commands/text-format';
import { RootTags, Keycodes, RegEx } from '../constants';
import { moveCursorToBeginningOfSelection, getSelectionTagName, getSelectionBlockElement, getSelectionBlockTagName } from '../utils/selection-utils';
Expand All @@ -12,8 +20,29 @@ import Compiler from '../../content-kit-compiler/compiler';
import TextModel from '../../content-kit-compiler/models/text';
import Type from '../../content-kit-compiler/types/type';
import { toArray } from '../../content-kit-utils/array-utils';
import { merge } from '../../content-kit-utils/object-utils';

import { mergeWithOptions } from '../../content-kit-utils/object-utils';

var defaults = {
placeholder: 'Write here...',
spellcheck: true,
autofocus: true,
textFormatCommands: [
new BoldCommand(),
new ItalicCommand(),
new LinkCommand(),
new QuoteCommand(),
new HeadingCommand(),
new SubheadingCommand()
],
embedCommands: [
new ImageCommand(),
new EmbedCommand()
],
compiler: new Compiler({
includeTypeNames: true, // output type names for easier debugging
renderer: new EditorHTMLRenderer()
})
};

var editorClassName = 'ck-editor';
var editorClassNameRegExp = new RegExp(editorClassName);
Expand Down Expand Up @@ -82,7 +111,7 @@ function bindTypingEvents(editor) {
*/
function Editor(element, options) {
var editor = this;
merge(editor, options);
mergeWithOptions(editor, defaults, options);

if (element) {
var className = element.className;
Expand All @@ -103,10 +132,6 @@ function Editor(element, options) {
element.setAttribute('contentEditable', true);
editor.element = element;

var compiler = editor.compiler = options.compiler || new Compiler({
includeTypeNames: true, // output type names for easier debugging
renderer: new EditorHTMLRenderer()
});
editor.syncModel();

bindTypingEvents(editor);
Expand Down

0 comments on commit 074f846

Please sign in to comment.