add richtext br

tickbh · tickbh · commit b296d16c7f4d · 2016-12-16T18:02:54.000+08:00
diff --git a/ext/NodeRichText.js b/ext/NodeRichText.js
@@ -26,6 +26,12 @@ let NodeRichText = ccui.RichText.extend({
     this.parseText(this._text)
   },
 
+  addNewLineElement: function() {
+    var re = ccui.RichElementNewLine.create(1, this._curConfig.color, 255)
+    this.pushBackElement(re)
+  },
+
+
   addRichElement: function (str) {
 
 //     cc.FontDefinition = function (properties) {
@@ -144,6 +150,8 @@ let NodeRichText = ccui.RichText.extend({
       this._curConfig.fontSize = this._originConfig.fontSize
     } else if (value == '/of') {
       this._curConfig.osize = this._originConfig.osize
+    } else if (value == 'br') {
+      this.addNewLineElement()
     }
   },
 
diff --git a/third/html5/cocos2d-js.js b/third/html5/cocos2d-js.js
@@ -53660,6 +53660,17 @@ ccui.RichElementCustomNode = ccui.RichElement.extend({
 ccui.RichElementCustomNode.create = function (tag, color, opacity, customNode) {
     return new ccui.RichElementCustomNode(tag, color, opacity, customNode);
 };
+
+ccui.RichElementNewLine = ccui.RichElement.extend({
+    ctor: function (tag, color, opacity) {
+        ccui.RichElement.prototype.ctor.call(this, tag, color, opacity);
+        this._type = ccui.RichElement.NEWLINE;
+    }
+});
+
+ccui.RichElementNewLine.create = function (tag, color, opacity) {
+    return new ccui.RichElementNewLine(tag, color, opacity);
+};
 ccui.RichText = ccui.Widget.extend({
     _formatTextDirty: false,
     _richElements: null,
@@ -53723,6 +53734,9 @@ ccui.RichText = ccui.Widget.extend({
                         case ccui.RichElement.CUSTOM:
                             elementRenderer = element._customNode;
                             break;
+                        case ccui.RichElement.NEWLINE:
+                            this._addNewLine();
+                            continue;
                         default:
                             break;
                     }
@@ -53747,6 +53761,9 @@ ccui.RichText = ccui.Widget.extend({
                         case ccui.RichElement.CUSTOM:
                             this._handleCustomRenderer(element._customNode);
                             break;
+                        case ccui.RichElement.NEWLINE:
+                            this._addNewLine();
+                            continue;
                         default:
                             break;
                     }
@@ -53989,6 +54006,7 @@ ccui.RichText.create = function(){
 ccui.RichElement.TEXT = 0;
 ccui.RichElement.IMAGE = 1;
 ccui.RichElement.CUSTOM = 2;
+ccui.RichElement.NEWLINE = 3;
 ccui.ScrollViewBar = ccui.ProtectedNode.extend({
     _parentScroll: null,
     _direction: null,
