repo/sceditor: src/formats/bbcode.js comparison

comparison src/formats/bbcode.js @ 33:c23475f3f466

improve emoticons

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

comparison

equal deleted inserted replaced

-:98f11d0cbbd8
+:c23475f3f466
 			}
 		},
 		quote: {
 			txtExec: ['[quote]', '[/quote]']
 		},
+		emoticon: {
+			txtExec: function (editor, caller) {
+				editor.commands.emoticon.base(editor, caller, function(target) {
+					return '[emoticon]' + target.getAttribute(EMOTICON_DATA_ATTR) + '[/emoticon]';
+				} );
+			},
+		},
 		youtube: {
 			txtExec: function (editor, caller) {
 				getEditorCommand('youtube')._dropDown(
 					editor,
 					caller,
 				}
 			},
 			format: function (element, content) {
 				return attr(element, EMOTICON_DATA_ATTR) + content;
 			},
-			html: '{0}'
+			html: function (token, attrs, content, editor) {
+				return editor.allEmoticons[content] || token.val + content + token.closing.val;
+			}
 		},
 		// END_COMMAND
 		// START_COMMAND: Horizontal Rule
 		hr: {
 						return element.style ? element.style[name] : null;
 					};
 				// check if this is an emoticon image
 				if (attr(element, EMOTICON_DATA_ATTR)) {
-					return content;
+					return '[emoticon]' + content + '[/emoticon]';
 				}
 				width = attr(element, 'width') || style('width');
 				height = attr(element, 'height') || style('height');
 	 * @param {Object} options
 	 * @class BBCodeParser
 	 * @name BBCodeParser
 	 * @since v1.4.0
 	 */
-	function newBBCodeParser(options) {
+	function newBBCodeParser(editor) {
 		var base = {};
-		base.opts = extend({}, BBCodeParser.defaults, options);
+		base.opts = extend({}, BBCodeParser.defaults, editor.opts.parserOptions);
 		/**
 		 * Takes a BBCode string and splits it into open,
 		 * content and close tags.
 		 *
 							);
 						} else {
 							html = bbcode.html(
 								token,
 								token.attrs,
-								content
+								content,
+								editor
 							);
 						}
 					} else {
 						html = token.val + content +
 							(token.closing ? token.closing.val : '');
 		/**
 		 * Initializer
 		 * @private
 		 */
 		base.init = function (editor) {
+			base.editor = editor;
 			base.opts = editor.opts;
 			base.elementToBbcode = elementToBbcode;
 			// build the BBCode cache
 			buildBbcodeCache();
 			editor.commands = extendDeep(
-				{}, defaultCommandsOverrides, editor.commands
+				{}, editor.commands, defaultCommandsOverrides
 			);
 			// Add BBCode helper methods
 			editor.toBBCode   = base.toSource;
 			editor.fromBBCode = base.toHtml;
 		 * @param {string} source
 		 * @param {boolean} [legacyAsFragment] Used by fromBBCode() method
 		 */
 		function toHtml(asFragment) {
 			return function(source, legacyAsFragment) {
-				var	parser = newBBCodeParser(base.opts.parserOptions);
+				var	parser = newBBCodeParser(base.editor);
 				var html = parser.toHTML(
 					base.opts.bbcodeTrim ? source.trim() : source
 				);
 				return (asFragment || legacyAsFragment) ?
 				context = context || document;
 				var	bbcode, elements;
 				var containerParent = context.createElement('div');
 				var container = context.createElement('div');
-				var parser = newBBCodeParser(base.opts.parserOptions);
+				var parser = newBBCodeParser(base.editor);
 				container.innerHTML = html;
 				css(containerParent, 'visibility', 'hidden');
 				containerParent.appendChild(container);
 				context.body.appendChild(containerParent);