Fix code tags including styles from block elements

Improves the special case handling for code tags so they only include
text content.

Fixes #915

Author: samclarke

src/formats/bbcode.js

@@ -2437,7 +2437,7 @@
 		 * @memberOf SCEditor.plugins.bbcode.prototype
 		 */
 		function elementToBbcode(element) {
-			var toBBCode = function (node, vChildren) {
+			var toBBCode = function (node, vChildren, hasCodeParent) {
 				var ret = '';
 
 				dom.traverse(node, function (node) {
@@ -2478,20 +2478,20 @@
 
 						// don't convert iframe contents
 						if (tag !== 'iframe') {
-							content = toBBCode(node, vChild);
+							content = toBBCode(node, vChild,
+								hasCodeParent || tag === 'code');
 						}
 
 						// TODO: isValidChild is no longer needed. Should use
 						// valid children bbcodes instead by creating BBCode
 						// tokens like the parser.
 						if (isValidChild) {
-							// code tags should skip most styles
-							if (tag !== 'code') {
-								// First parse inline codes
+							if (!hasCodeParent) {
+								// Parse inline codes first so they don't
+								// contain block level codes
 								content = handleTags(node, content, false);
+								content = handleTags(node, content, true);
 							}
-
-							content = handleTags(node, content, true);
 							ret += handleBlockNewlines(node, content);
 						} else {
 							ret += content;

tests/unit/formats/bbcode.js

@@ -784,6 +784,47 @@ QUnit.test('Code', function (assert) {
 		'[code]ignore this Testing 1.2.3....[/code]\n',
 		'Code with styling'
 	);
+
+	assert.equal(
+		this.htmlToBBCode(
+			'<code><span style="color:#ff0000">test</span></code>'
+		),
+		'[code]test[/code]\n',
+		'Code with inline styling'
+	);
+
+	assert.equal(
+		this.htmlToBBCode(
+			'<code><div style="color:#ff0000">test</div></code>'
+		),
+		'[code]test[/code]\n',
+		'Code with block styling'
+	);
+
+
+	assert.equal(
+		this.htmlToBBCode(
+			'<code><div><div style="color:#ff0000">test</div></div></code>'
+		),
+		'[code]test[/code]\n',
+		'Code with nested block styling'
+	);
+
+	assert.equal(
+		this.htmlToBBCode(
+			'<code><div>line 1</div><div>line 2</div></code>'
+		),
+		'[code]line 1\nline 2[/code]\n',
+		'Code with block lines'
+	);
+
+	assert.equal(
+		this.htmlToBBCode(
+			'<code style="font-weight:bold">test</code>'
+		),
+		'[code]test[/code]\n',
+		'Code with styling'
+	);
 });