Merge remote-tracking branch 'origin/master'

Author: pavle-goloskokovic

v3/src/gameobjects/text/TextStyle.js

@@ -24,7 +24,11 @@ var propertyMap = {
     fixedWidth: [ 'fixedWidth', false ],
     fixedHeight: [ 'fixedHeight', false ],
     rtl: [ 'rtl', false ],
-    testString: [ 'testString', '|MÉqgy' ]
+    testString: [ 'testString', '|MÉqgy' ],
+    wordWrapWidth: [ 'wordWrap.width', null ],
+    wordWrapCallback: [ 'wordWrap.callback', null ],
+    wordWrapCallbackScope: [ 'wordWrap.callbackScope', null ],
+    wordWrapUseAdvanced: [ 'wordWrap.useAdvancedWrap', false ]
 };
 
 var TextStyle = new Class({
@@ -90,7 +94,15 @@ var TextStyle = new Class({
 
         for (var key in propertyMap)
         {
-            this[key] = GetAdvancedValue(style, propertyMap[key][0], propertyMap[key][1]);
+            if (key === 'wordWrapCallback' || key === 'wordWrapCallbackScope')
+            {
+                // Callback & scope should be set without processing the values
+                this[key] = GetValue(style, propertyMap[key][0], propertyMap[key][1]);
+            }
+            else
+            {
+                this[key] = GetAdvancedValue(style, propertyMap[key][0], propertyMap[key][1]);
+            }
         }
 
         //  Allow for 'font' override
@@ -124,6 +136,10 @@ var TextStyle = new Class({
     syncFont: function (canvas, context)
     {
         context.font = this._font;
+    },
+
+    syncStyle: function (canvas, context)
+    {
         context.textBaseline = 'alphabetic';
 
         context.fillStyle = this.color;
@@ -335,6 +351,47 @@ var TextStyle = new Class({
         return this.update(false);
     },
 
+    /**
+     * Set the width (in pixels) to use for wrapping lines. Pass in null to remove wrapping by
+     * width.
+     *
+     * @param {number|null} width - The maximum width of a line in pixels. Set to null to remove
+     * wrapping.
+     * @param {boolean} [useAdvancedWrap=false] - Whether or not to use the advanced wrapping
+     * algorithm. If true, spaces are collapsed and whitespace is trimmed from lines. If false,
+     * spaces and whitespace are left as is.
+     * @return {this}
+     */
+    setWordWrapWidth: function (width, useAdvancedWrap)
+    {
+        if (useAdvancedWrap === undefined) { useAdvancedWrap = false; }
+
+        this.wordWrapWidth = width;
+        this.wordWrapUseAdvanced = useAdvancedWrap;
+
+        return this.update(false);
+    },
+
+    /**
+     * Set a custom callback for wrapping lines. Pass in null to remove wrapping by callback.
+     *
+     * @param {function} callback - A custom function that will be responsible for wrapping the
+     * text. It will receive two arguments: text (the string to wrap), textObject (this Text
+     * instance). It should return the wrapped lines either as an array of lines or as a string with
+     * newline characters in place to indicate where breaks should happen.
+     * @param {object} [scope=null] - The scope that will be applied when the callback is invoked.
+     * @return {this}
+     */
+    setWordWrapCallback: function (callback, scope)
+    {
+        if (scope === undefined) { scope = null; }
+
+        this.wordWrapCallback = callback;
+        this.wordWrapCallbackScope = scope;
+
+        return this.update(false);
+    },
+
     setAlign: function (align)
     {
         if (align === undefined) { align = 'left'; }