diff options
| author | Be <be@mixxx.org> | 2020-04-23 06:38:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 06:38:50 -0500 |
| commit | ebcd24e3f86547e5dda8798a237bf95b2026e323 (patch) | |
| tree | 9e3bf481dd2cef5f007ef5437c8ed599dff416b4 /res | |
| parent | 6f4fc0ba35d5a5dd63fb388b119dc2e81adb814b (diff) | |
| parent | 24b0e51b7790cd1259e999fb4cfae861901609c5 (diff) | |
Merge pull request #2685 from Be-ing/remove_colormapper_string_hack
ColorMapperJSProxy: remove hack for using strings as keys
Diffstat (limited to 'res')
| -rw-r--r-- | res/controllers/Roland_DJ-505-scripts.js | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js index 89264bf625..926491d922 100644 --- a/res/controllers/Roland_DJ-505-scripts.js +++ b/res/controllers/Roland_DJ-505-scripts.js @@ -1017,22 +1017,22 @@ DJ505.PadColor = { }; DJ505.PadColorMap = new ColorMapper({ - "#CC0000": DJ505.PadColor.RED, - "#CC4400": DJ505.PadColor.CORAL, - "#CC8800": DJ505.PadColor.ORANGE, - "#CCCC00": DJ505.PadColor.YELLOW, - "#88CC00": DJ505.PadColor.GREEN, - "#00CC00": DJ505.PadColor.APPLEGREEN, - "#00CC88": DJ505.PadColor.AQUAMARINE, - "#00CCCC": DJ505.PadColor.TURQUOISE, - "#0088CC": DJ505.PadColor.CELESTE, - "#0000CC": DJ505.PadColor.BLUE, - "#4400CC": DJ505.PadColor.AZURE, - "#8800CC": DJ505.PadColor.PURPLE, - "#CC00CC": DJ505.PadColor.MAGENTA, - "#CC0044": DJ505.PadColor.RED, - "#FFCCCC": DJ505.PadColor.APRICOT, - "#FFFFFF": DJ505.PadColor.WHITE, + 0xCC0000: DJ505.PadColor.RED, + 0xCC4400: DJ505.PadColor.CORAL, + 0xCC8800: DJ505.PadColor.ORANGE, + 0xCCCC00: DJ505.PadColor.YELLOW, + 0x88CC00: DJ505.PadColor.GREEN, + 0x00CC00: DJ505.PadColor.APPLEGREEN, + 0x00CC88: DJ505.PadColor.AQUAMARINE, + 0x00CCCC: DJ505.PadColor.TURQUOISE, + 0x0088CC: DJ505.PadColor.CELESTE, + 0x0000CC: DJ505.PadColor.BLUE, + 0x4400CC: DJ505.PadColor.AZURE, + 0x8800CC: DJ505.PadColor.PURPLE, + 0xCC00CC: DJ505.PadColor.MAGENTA, + 0xCC0044: DJ505.PadColor.RED, + 0xFFCCCC: DJ505.PadColor.APRICOT, + 0xFFFFFF: DJ505.PadColor.WHITE, }); DJ505.PadSection = function(deck, offset) { |