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

comparison src/formats/bbcode.js @ 41:7491026f7623

remove isSelfClosing

author	Franklin Schmidt <fschmidt@gmail.com>
date	Fri, 19 Aug 2022 19:27:03 -0600
parents	0c4e4b5ef40d
children	ab2dc8736d88

comparison

equal deleted inserted replaced

-:eaecca025287
+:7491026f7623
 		},
 		table: {
 			txtExec: ['[table][tr][td]', '[/td][/tr][/table]']
 		},
 		horizontalrule: {
-			txtExec: ['[hr]']
+			txtExec: ['[hr][/hr]']
 		},
 		code: {
 			txtExec: ['[code]', '[/code]']
 		},
 		image: {
 		hr: {
 			tags: {
 				hr: null
 			},
 			allowsEmpty: true,
-			isSelfClosing: true,
 			isInline: false,
-			format: '[hr]{0}',
+			format: '[hr][/hr]',
 			html: '<hr />'
 		},
 		// END_COMMAND
 		// START_COMMAND: Image
 						}
 						addTag(token);
 						bbcode = bbcodeHandlers[token.name];
-						// If this tag is not self closing and it has a closing
+						// If this tag has a closing
 						// tag then it is open and has children so add it to the
 						// list of open tags. If has the closedBy property then
 						// it is closed by other tags so include everything as
 						// it's children until one of those tags is reached.
-						if (bbcode && !bbcode.isSelfClosing &&
+						if (bbcode &&
 							(bbcode.closedBy ||
 								hasTag(token.name, TOKEN_CLOSE, toks))) {
 							openTags.push(token);
-						} else if (!bbcode || !bbcode.isSelfClosing) {
+						} else {
 							token.type = TOKEN_CONTENT;
 						}
 						break;
 					case TOKEN_CLOSE:
 					right  = i < childrenLength - 1 ? children[i + 1] : null;
 					remove = false;
 					// Handle the start and end new lines
 					// e.g. [tag]\n and \n[/tag]
-					if (!onlyRemoveBreakAfter && parentBBCode &&
+					if (!onlyRemoveBreakAfter && parentBBCode) {
-						parentBBCode.isSelfClosing !== true) {
 						// First child of parent so must be opening line break
 						// (breakStartBlock, breakStart) e.g. [tag]\n
 						if (!left) {
 							if (parentBBCode.isInline === false &&
 								base.opts.breakStartBlock &&
 				// Remove any empty children of this tag first so that if they
 				// are all removed this one doesn't think it's not empty.
 				removeEmpty(token.children);
-				if (isTokenWhiteSpace(token.children) && bbcode &&
+				if (isTokenWhiteSpace(token.children) && bbcode && !bbcode.allowsEmpty) {
-					!bbcode.isSelfClosing && !bbcode.allowsEmpty) {
 					tokens.splice.apply(tokens, [i, 1].concat(token.children));
 				}
 			}
 		}
 		 * @param  {array} toks Array of parsed tokens from base.parse()
 		 * @return {string}
 		 * @private
 		 */
 		function convertToBBCode(toks) {
-			var	token, attr, bbcode, isBlock, isSelfClosing, quoteType,
+			var	token, attr, bbcode, isBlock, quoteType,
 				breakBefore, breakStart, breakEnd, breakAfter,
 				ret = '';
 			while (toks.length > 0) {
 				if (!(token = toks.shift())) {
 					continue;
 				}
 				// TODO: tidy this
 				bbcode        = bbcodeHandlers[token.name];
 				isBlock       = !(!bbcode || bbcode.isInline !== false);
-				isSelfClosing = bbcode && bbcode.isSelfClosing;
 				breakBefore = (isBlock && base.opts.breakBeforeBlock &&
 						bbcode.breakBefore !== false) ||
 					(bbcode && bbcode.breakBefore);
-				breakStart = (isBlock && !isSelfClosing &&
+				breakStart = (isBlock &&
 						base.opts.breakStartBlock &&
 						bbcode.breakStart !== false) ||
 					(bbcode && bbcode.breakStart);
 				breakEnd = (isBlock && base.opts.breakEndBlock &&
 					if (token.children) {
 						ret += convertToBBCode(token.children);
 					}
 					// add closing tag if not self closing
-					if (!isSelfClosing && !bbcode.excludeClosing) {
+					if (!bbcode.excludeClosing) {
 						if (breakEnd) {
 							ret += '\n';
 						}
 						ret += '[/' + token.name + ']';
 					}
 					if (breakAfter) {
 						ret += '\n';
-					}
-					// preserve whatever was recognized as the
-					// closing tag if it is a self closing tag
-					if (token.closing && isSelfClosing) {
-						ret += token.closing.val;
 					}
 				} else {
 					ret += token.val;
 				}
 			}