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

Bind missing events #964

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+25 −12
Open

Bind missing events #964

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e12e9e8
Bind missing events
live627 May 8, 2024
06f369b
do not hotwire custom events through a dom node
live627 May 8, 2024
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
37 changes: 25 additions & 12 deletions src/lib/SCEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as dom from './dom.js';
import * as dom from './dom.js';
import * as utils from './utils.js';
import defaultOptions from './defaultOptions.js';
import defaultCommands from './defaultCommands.js';
Expand Down Expand Up @@ -333,6 +333,7 @@ export default function SCEditor(original, userOptions) {
handleMouseDown,
handleComposition,
handleEvent,
handleManualEvent,
handleDocumentClick,
updateToolBar,
updateActiveButtons,
Expand Down Expand Up @@ -498,6 +499,7 @@ export default function SCEditor(original, userOptions) {
appendNewLine();
// TODO: use editor doc and window?
pluginManager.call('ready');
handleManualEvent('ready');
if ('onReady' in format) {
format.onReady.call(base);
}
Expand Down Expand Up @@ -705,12 +707,6 @@ export default function SCEditor(original, userOptions) {

dom.on(editorContainer, 'selectionchanged', checkNodeChanged);
dom.on(editorContainer, 'selectionchanged', updateActiveButtons);
// Custom events to forward
dom.on(
editorContainer,
'selectionchanged valuechanged nodechanged pasteraw paste',
handleEvent
);
};

/**
Expand Down Expand Up @@ -1632,7 +1628,7 @@ export default function SCEditor(original, userOptions) {
var pasteArea = dom.createElement('div', {}, wysiwygDocument);

pluginManager.call('pasteRaw', data);
dom.trigger(editorContainer, 'pasteraw', data);
handleManualEvent('pasteraw', data);

if (data.html) {
// Sanitize again in case plugins modified the HTML
Expand All @@ -1654,14 +1650,15 @@ export default function SCEditor(original, userOptions) {
}

pluginManager.call('paste', paste);
dom.trigger(editorContainer, 'paste', paste);
handleManualEvent('paste', paste);

if ('fragmentToHtml' in format) {
paste.val = format
.fragmentToHtml(paste.val, currentNode);
}

pluginManager.call('pasteHtml', paste);
handleManualEvent('pastehtml', paste);

var parent = rangeHelper.getFirstBlockParent();
base.wysiwygEditorInsertHtml(paste.val, null, true);
Expand Down Expand Up @@ -2369,7 +2366,8 @@ export default function SCEditor(original, userOptions) {
}
}

dom.trigger(editorContainer, 'selectionchanged');
pluginManager.call('selectionchanged');
handleManualEvent('selectionchanged');
}

isSelectionCheckPending = false;
Expand Down Expand Up @@ -2404,7 +2402,11 @@ export default function SCEditor(original, userOptions) {
currentNode = node;
currentBlockNode = rangeHelper.getFirstBlockParent(node);

dom.trigger(editorContainer, 'nodechanged', {
pluginManager.call('nodechanged', {
oldNode: oldNode,
newNode: currentNode
});
handleManualEvent('nodechanged', {
oldNode: oldNode,
newNode: currentNode
});
Expand Down Expand Up @@ -2639,7 +2641,15 @@ export default function SCEditor(original, userOptions) {

// convert the event into a custom event to send
var name = (e.target === sourceEditor ? 'scesrc' : 'scewys') + e.type;
handleManualEvent(name, e);
};

/**
* Passes events on to any handlers
* @private
* @return void
*/
handleManualEvent = function(name, e) {
if (eventHandlers[name]) {
eventHandlers[name].forEach(function (fn) {
fn.call(base, e);
Expand Down Expand Up @@ -3431,7 +3441,10 @@ export default function SCEditor(original, userOptions) {
if (currentHtml !== triggerValueChanged.lastVal) {
triggerValueChanged.lastVal = currentHtml;

dom.trigger(editorContainer, 'valuechanged', {
pluginManager.call('valuechanged', {
rawValue: sourceMode ? base.val() : currentHtml
});
handleManualEvent('valuechanged', {
rawValue: sourceMode ? base.val() : currentHtml
});
}
Expand Down
Loading