Merge pull request #2212 from DennisKehrig/dk/issue-2050

Add support for percentage based RGB colors to the inline color editor

Author: RaymondLim

src/extensions/default/InlineColorEditor/ColorEditor.js

@@ -218,7 +218,7 @@ define(function (require, exports, module) {
             _this = this;
         handler = function (event) {
             var colorObject, newColor, newFormat;
-            newFormat = $(event.currentTarget).html().toLowerCase();
+            newFormat = $(event.currentTarget).html().toLowerCase().replace("%", "p");
             newColor = _this.getColor();
             colorObject = tinycolor(newColor);
             switch (newFormat) {
@@ -228,6 +228,9 @@ define(function (require, exports, module) {
             case "rgba":
                 newColor = colorObject.toRgbString();
                 break;
+            case "prgba":
+                newColor = colorObject.toPercentageRgbString();
+                break;
             case "hex":
                 newColor = colorObject.toHexString();
                 _this._hsv.a = 1;
@@ -266,10 +269,10 @@ define(function (require, exports, module) {
         }
         return color;
     };
-                    
+    
     /**
      * Normalize the given color string into the format used by tinycolor, by adding a space 
-     * after commas and converting RGB colors from percentages to integers.
+     * after commas.
      * @param {string} color The color to be corrected if it looks like an RGB or HSL color.
      * @return {string} a normalized color string.
      */
@@ -285,7 +288,7 @@ define(function (require, exports, module) {
             normalizedColor = normalizedColor.replace(/\(\s+/, "(");
             normalizedColor = normalizedColor.replace(/\s+\)/, ")");
         }
-        return this._convertToNormalRGB(normalizedColor.toLowerCase());
+        return normalizedColor.toLowerCase();
     };
 
     /** Handle changes in text field */
@@ -385,6 +388,9 @@ define(function (require, exports, module) {
         case "rgb":
             colorVal = newColor.toRgbString();
             break;
+        case "prgb":
+            colorVal = newColor.toPercentageRgbString();
+            break;
         case "hex":
         case "name":
             colorVal = this._hsv.a < 1 ? newColor.toRgbString() : newColor.toHexString();