From a32c1e24dbb447e18e3e335c16cc0577f4809ff8 Mon Sep 17 00:00:00 2001 From: Andriy Chaika Date: Mon, 4 Jan 2016 23:28:29 +0200 Subject: [PATCH] Fix line breaks --- cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js b/cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js index 471efee96c..4187ce57e1 100644 --- a/cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js +++ b/cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js @@ -26,11 +26,11 @@ cc.LabelTTF.wrapInspection = true; //Support: English French German //Other as Oriental Language -cc.LabelTTF._wordRex = /([a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]+|\S)/; +cc.LabelTTF._wordRex = /(\S+)/; cc.LabelTTF._symbolRex = /^[!,.:;}\]%\?>、‘“》?。,!]/; -cc.LabelTTF._lastWordRex = /([a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]+|\S)$/; -cc.LabelTTF._lastEnglish = /[a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]+$/; -cc.LabelTTF._firsrEnglish = /^[a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]/; +cc.LabelTTF._lastWordRex = /(\S+)$/; +cc.LabelTTF._lastEnglish = /\S+$/; +cc.LabelTTF._firsrEnglish = /^\S/; (function() { cc.LabelTTF.RenderCmd = function () {