repo/sceditor: src/sceditor.js comparison

comparison src/sceditor.js @ 33:c23475f3f466

improve emoticons

author	Franklin Schmidt <fschmidt@gmail.com>
date	Sun, 14 Aug 2022 20:36:17 -0600
parents	98f11d0cbbd8
children	21090996a131

comparison

equal deleted inserted replaced

-:98f11d0cbbd8
+:c23475f3f466
 		},
 		// END_COMMAND
 		// START_COMMAND: Emoticons
 		emoticon: {
-			exec: function (editor, caller) {
+			base: function (editor, caller, targetToHtml) {
 				var createContent = function (includeMore) {
 					var	moreLink,
 						opts            = editor.opts,
 						emoticonsRoot   = opts.emoticonsRoot || '',
 						emoticonsCompat = opts.emoticonsCompat,
-						rangeHelper     = editor.getRangeHelper(),
-						startSpace      = emoticonsCompat &&
-							rangeHelper.getOuterText(true, 1) !== ' ' ? ' ' : '',
-						endSpace        = emoticonsCompat &&
-							rangeHelper.getOuterText(false, 1) !== ' ' ? ' ' : '',
 						content         = createElement('div'),
 						line            = createElement('div'),
 						perLine         = 0,
 						emoticons       = extend(
 							{},
 					appendChild(content, line);
 					perLine = Math.sqrt(Object.keys(emoticons).length);
 					onEvent1(content, 'click', 'img', function (target, e) {
-						editor.insert(startSpace + attr(target, 'alt') + endSpace,
+						editor.insert(targetToHtml(target), null, false);
-							null, false).closeDropDown(true);
+						editor.closeDropDown(true);
 						e.preventDefault();
 					});
 					each(emoticons, function (code, emoticon) {
 						appendChild(line, createElement('img', {
 							src: emoticonsRoot + (emoticon.url || emoticon),
+							'data-sceditor-emoticon': code,
 							alt: code,
 							title: emoticon.tooltip || code
 						}));
 						if (line.children.length >= perLine) {
 					return content;
 				};
 				editor.createDropDown(caller, 'emoticons', createContent(false));
 			},
+			exec: function (editor, caller) {
+				editor.commands.emoticon.base(editor, caller
+					, function(target) { return target.outerHTML; }
+				);
+			},
 			txtExec: function (editor, caller) {
-				defaultCmds.emoticon.exec(editor, caller);
+				editor.commands.emoticon.exec(editor, caller);
 			},
 			tooltip: 'Insert an emoticon'
 		},
 		// END_COMMAND
 	 * @param {HTMLElement} root
 	 * @param {Object<string, string>} emoticons
 	 * @param {boolean} emoticonsCompat
 	 * @return {void}
 	 */
-	function replace(root, emoticons, emoticonsCompat) {
+	function doReplaceEmoticons(root, emoticons, emoticonsCompat) {
 		var	doc           = root.ownerDocument;
 		var space         = '(^|\\s|\xA0|\u2002|\u2003|\u2009|$)';
 		var emoticonCodes = [];
 		var emoticonRegex = {};
 		 * The editors locale
 		 *
 		 * @private
 		 */
 		var locale;
-		/**
-		 * Stores a cache of preloaded images
-		 *
-		 * @private
-		 * @type {Array.<HTMLImageElement>}
-		 */
-		var preLoadCache = [];
 		/**
 		 * The editors rangeHelper instance
 		 *
 		 * @type {RangeHelper}
 					key: key,
 					// Prefix emoticon root to emoticon urls
 					url: root + (url.url || url),
 					tooltip: url.tooltip || key
 				});
-				// Preload the emoticon
-				if (options.emoticonsEnabled) {
-					preLoadCache.push(createElement('img', {
-						src: root + (url.url || url)
-					}));
-				}
 			});
 		};
 		/**
 		 * Autofocus the editor
 			wysiwygBody.contentEditable = !readOnly;
 			sourceEditor.readonly = !readOnly;
 			updateToolBar(readOnly);
-			return base;
 		};
 		/**
 		 * Gets if the editor is in RTL mode
 		 *
 			addClass(editorContainer, dir);
 			if (icons.rtl) {
 				icons.rtl(rtl);
 			}
-			return base;
 		};
 		/**
 		 * Updates the toolbar to disable/enable the appropriate buttons
 		 * @private
 			if (!width$1 && width$1 !== 0) {
 				return width(editorContainer);
 			}
 			base.dimensions(width$1, null, saveWidth);
-			return base;
 		};
 		/**
 		 * Returns an object with the properties width and height
 		 * which are the width and height of the editor in px.
 					options.height = height$1;
 				}
 				height(editorContainer, height$1);
 			}
-			return base;
 		};
 		/**
 		 * Gets the height of the editor in px
 		 *
 			if (!height$1 && height$1 !== 0) {
 				return height(editorContainer);
 			}
 			base.dimensions(null, height$1, saveHeight);
-			return base;
 		};
 		/**
 		 * Gets if the editor is maximised or not
 		 *
 			if (!maximize) {
 				globalWin.scrollTo(0, maximizeScrollPosition);
 			}
 			autoExpand();
-			return base;
 		};
 		autoExpand = function () {
 			if (options.autoExpand) {
 				base.expandToContent();
 			if (base.inSourceMode()) {
 				base.sourceEditorInsertText(text, endText);
 			} else {
 				base.wysiwygEditorInsertText(text, endText);
 			}
-			return base;
 		};
 		/**
 		 * Like wysiwygEditorInsertHtml but inserts text into the
 		 * source mode editor instead.
 			sourceEditor.focus();
 			if (position) {
 				sourceEditor.selectionStart = position.start;
 				sourceEditor.selectionEnd = position.end;
+				return;
-				return base;
 			}
 			return {
 				start: sourceEditor.selectionStart,
 				end: sourceEditor.selectionEnd
 				base.setWysiwygEditorValue(val);
 			} else {
 				base.setSourceEditorValue(val);
 			}
-			return base;
 		};
 		/**
 		 * Inserts HTML/BBCode into the editor
 		 *
 		base.insert = function (
 			start, end, filter, convertEmoticons, allowMixed
 		) {
 			if (base.inSourceMode()) {
 				base.sourceEditorInsertText(start, end);
-				return base;
+				return;
 			}
 			// Add the selection between start and end
 			if (end) {
 				var	html = rangeHelper.selectedHtml();
 					.replace(/&gt;/g, '>')
 					.replace(/&amp;/g, '&');
 			}
 			base.wysiwygEditorInsertHtml(start);
-			return base;
 		};
 		/**
 		 * Gets the WYSIWYG editors HTML value.
 		 *
 			if (!value) {
 				value = '<p><br /></p>';
 			}
 			wysiwygBody.innerHTML = value;
-			replaceEmoticons();
+			//replaceEmoticons();
 			appendNewLine();
 			triggerValueChanged();
 			autoExpand();
 		};
 		 * with their emoticon images
 		 * @private
 		 */
 		replaceEmoticons = function () {
 			if (options.emoticonsEnabled) {
-				replace(wysiwygBody, allEmoticons, options.emoticonsCompat);
+				doReplaceEmoticons(wysiwygBody, allEmoticons, options.emoticonsCompat);
 			}
 		};
 		/**
 		 * If the editor is in source code mode
 			}
 			if ((inSourceMode && !enable) || (!inSourceMode && enable)) {
 				base.toggleSourceMode();
 			}
-			return base;
 		};
 		/**
 		 * Switches between the WYSIWYG and source modes
 		 *
 					if (events[i] === 'valuechanged') {
 						triggerValueChanged.hasHandler = true;
 					}
 				}
 			}
-			return base;
 		};
 		/**
 		 * Unbinds an event that was bound using bind().
 		 *
 						arrayRemove(
 							eventHandlers['scesrc' + events[i]] || [], handler);
 					}
 				}
 			}
-			return base;
 		};
 		/**
 		 * Blurs the editors input area
 		 *
 			} else if (!base.sourceMode()) {
 				wysiwygBody.blur();
 			} else {
 				sourceEditor.blur();
 			}
-			return base;
 		};
 		/**
 		 * Focuses the editors input area
 		 *
 			} else {
 				sourceEditor.focus();
 			}
 			updateActiveButtons();
-			return base;
 		};
 		/**
 		 * Adds a handler to the key down event
 		 *
 				offEvent(wysiwygBody, 'keypress', emoticonsKeyPress);
 				triggerValueChanged();
 			}
-			return base;
 		};
 		/**
 		 * Gets the current WYSIWYG editors inline CSS
 		 *
 			if (inlineCss.styleSheet) {
 				inlineCss.styleSheet.cssText = css;
 			} else {
 				inlineCss.innerHTML = css;
 			}
-			return base;
 		};
 		/**
 		 * Handles the keydown event, used for shortcuts
 		 * @private
 				};
 			} else {
 				shortcutHandlers[shortcut] = cmd;
 			}
-			return base;
+			return true;
 		};
 		/**
 		 * Removes a shortcut handler
 		 * @param  {string} shortcut
 		 * @return {sceditor}
 		 */
 		base.removeShortcut = function (shortcut) {
 			delete shortcutHandlers[shortcut.toLowerCase()];
-			return base;
 		};
 		/**
 		 * Handles the backspace key press
 		 *
 		 */
 		base.clearBlockFormatting = function (block) {
 			block = block || currentStyledBlockNode();
 			if (!block || is(block, 'body')) {
-				return base;
+				return;
 			}
 			rangeHelper.saveRange();
 			block.className = '';
 			if (!is(block, 'p,div,td')) {
 				convertElement(block, 'p');
 			}
 			rangeHelper.restoreRange();
-			return base;
 		};
 		/**
 		 * Triggers the valueChanged signal if there is
 		 * a plugin that handles it.
 			base.updateOriginal();
 		};
 		// run the initializer
 		init();
+		base.allEmoticons = allEmoticons;
 		return base;
 	}
 	/**