From 9716223f45442b5d48ff6fd2e34a52df8c7f6c15 Mon Sep 17 00:00:00 2001
From: Roman Schmid <bummzack@gmail.com>
Date: Thu, 18 Jan 2018 15:11:14 +0100
Subject: [PATCH] Turn the module into a vendor-module. Some code-style changes
 in docs and classes. Register `'Color'` as alias for easier upgrade-path.

---
 README.md                | 21 +++++++++++---
 _config.php              |  8 -----
 _config/model.yml        |  7 +++++
 composer.json            | 63 ++++++++++++++++++++++------------------
 src/Color.php            |  4 +--
 src/Forms/ColorField.php |  7 +++--
 6 files changed, 65 insertions(+), 45 deletions(-)
 create mode 100644 _config/model.yml

diff --git a/README.md b/README.md
index 38671ed..b952df4 100644
--- a/README.md
+++ b/README.md
@@ -22,11 +22,24 @@ composer require tractorcow/silverstripe-colorpicker ^4@dev
 Here's how you define a DB field to be a color:
 
 ```php
-private static $db = array(
-    'BgColor' => 'TractorCow\Colorpicker\Color'
-);
+private static $db = [
+    'BgColor' => 'Color'
+];
 ```
-    
+
+Alternatively, you can also use the fully qualified classname. 
+The best way to do this is to import the class at the top of your PHP file, like so:
+
+    use TractorCow\Colorpicker\Color;
+
+In your class, you can then use:
+
+```php
+private static $db = [
+    'BgColor' => Color::class
+];
+```
+
 That's all... scaffolding will take care of creating the appropriate form-field.
 
 If you use `getCMSFields` to create your fields yourself, you might want to do something like this:
diff --git a/_config.php b/_config.php
index c868623..b3d9bbc 100644
--- a/_config.php
+++ b/_config.php
@@ -1,9 +1 @@
 <?php
-/**
- * ColorPicker jQuery widget/plugin by http://www.eyecon.ro/colorpicker/
- */
-
-// define colorpicker dir so that the installation doesn't need a fixed directory name
-if (!defined('COLORPICKER_DIR')) {
-    define('COLORPICKER_DIR', basename(__DIR__));
-}
diff --git a/_config/model.yml b/_config/model.yml
new file mode 100644
index 0000000..43adc0e
--- /dev/null
+++ b/_config/model.yml
@@ -0,0 +1,7 @@
+---
+Name: colorpicker-fieldtypes
+After: corefieldtypes
+---
+SilverStripe\Core\Injector\Injector:
+  Color:
+    class: TractorCow\Colorpicker\Color
diff --git a/composer.json b/composer.json
index fc65c9f..2ae5001 100644
--- a/composer.json
+++ b/composer.json
@@ -1,30 +1,37 @@
 {
-	"name": "tractorcow/silverstripe-colorpicker",
-	"description": "Color picker field for Silverstripe CMS using the ColorPicker jQuery plugin",
-    "type": "silverstripe-module",
-    "keywords": ["silverstripe", "color", "colour"],
-	"authors": [
-		{
-			"name": "Damian Mooyman",
-			"email": "damian.mooyman@gmail.com"
-		}
-	],
-	"support": {
-		"issues": "https://github.com/tractorcow/silverstripe-colorpicker/issues"
-	},
-	"require": {
-		"silverstripe/framework": "4.*"
-	},
-	"extra": {
-		"installer-name": "colorpicker",
-		"branch-alias": {
-			"dev-master": "4.0.x-dev"
-		}
-	},
-	"autoload": {
-		"psr-4": {
-			"TractorCow\\Colorpicker\\": "src/",
-			"TractorCow\\Colorpicker\\Tests\\": "tests/php/"
-		}
-	}
+  "name": "tractorcow/silverstripe-colorpicker",
+  "description": "Color picker field for Silverstripe CMS using the ColorPicker jQuery plugin",
+  "type": "silverstripe-vendormodule",
+  "keywords": [
+    "silverstripe",
+    "color",
+    "colour",
+    "colorpicker"
+  ],
+  "authors": [
+    {
+      "name": "Damian Mooyman",
+      "email": "damian.mooyman@gmail.com"
+    }
+  ],
+  "support": {
+    "issues": "https://github.com/tractorcow/silverstripe-colorpicker/issues"
+  },
+  "require": {
+    "silverstripe/framework": "^4.0"
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "4.0.x-dev"
+    },
+    "expose": [
+      "client"
+    ]
+  },
+  "autoload": {
+    "psr-4": {
+      "TractorCow\\Colorpicker\\": "src/",
+      "TractorCow\\Colorpicker\\Tests\\": "tests/php/"
+    }
+  }
 }
diff --git a/src/Color.php b/src/Color.php
index d09c0fa..a090f33 100644
--- a/src/Color.php
+++ b/src/Color.php
@@ -13,7 +13,7 @@ class Color extends DBVarchar
 {
     private static $casting = [
         'Luminance' => 'Float',
-        'AlteredColorHSV' => 'TractorCow\Colorpicker\Color'
+        'AlteredColorHSV' => Color::class
     ];
 
     /**
@@ -168,7 +168,7 @@ public function __construct($name = null, $options = [])
 
     public function scaffoldFormField($title = null, $params = null)
     {
-        $field = new ColorField($this->name, $title);
+        $field = ColorField::create($this->name, $title);
         return $field;
     }
 
diff --git a/src/Forms/ColorField.php b/src/Forms/ColorField.php
index 450385e..87a7e18 100644
--- a/src/Forms/ColorField.php
+++ b/src/Forms/ColorField.php
@@ -27,10 +27,11 @@ public function __construct($name, $title = null, $value = '', $form = null)
 
     public function Field($properties = [])
     {
+        Requirements::javascript('tractorcow/silverstripe-colorpicker: client/javascript/colorfield.js');
+        Requirements::javascript('tractorcow/silverstripe-colorpicker: client/javascript/colorpicker.js');
+        Requirements::css('tractorcow/silverstripe-colorpicker: client/css/colorpicker.css');
+
         $this->addExtraClass('colorfield');
-        Requirements::javascript(COLORPICKER_DIR . '/client/javascript/colorpicker.js');
-        Requirements::javascript(COLORPICKER_DIR . '/client/javascript/colorfield.js');
-        Requirements::css(COLORPICKER_DIR . '/client/css/colorpicker.css');
 
         $this->setAttribute('style', sprintf(
             'background-image: none; background-color: %s; %s',