MDL-44912 libraries: Allow empty values in admin setting colour picker

2014-04-02 17:20:58 +08:00
parent c790670d77
commit 907a6737fc
2 changed files with 18 additions and 7 deletions
@@ -8142,6 +8142,11 @@ class admin_setting_configcolourpicker extends admin_setting {
     */
    protected $previewconfig = null;

+    /**
+     * Use default when empty.
+     */
+    protected $usedefaultwhenempty = true;
+
    /**
     *
     * @param string $name
@@ -8150,8 +8155,10 @@ class admin_setting_configcolourpicker extends admin_setting {
     * @param string $defaultsetting
     * @param array $previewconfig Array('selector'=>'.some .css .selector','style'=>'backgroundColor');
     */
-    public function __construct($name, $visiblename, $description, $defaultsetting, array $previewconfig=null) {
+    public function __construct($name, $visiblename, $description, $defaultsetting, array $previewconfig = null,
+            $usedefaultwhenempty = true) {
        $this->previewconfig = $previewconfig;
+        $this->usedefaultwhenempty = $usedefaultwhenempty;
        parent::__construct($name, $visiblename, $description, $defaultsetting);
    }

@@ -8242,7 +8249,11 @@ class admin_setting_configcolourpicker extends admin_setting {
        } else if (($data == 'transparent') || ($data == 'currentColor') || ($data == 'inherit')) {
            return $data;
        } else if (empty($data)) {
-            return $this->defaultsetting;
+            if ($this->usedefaultwhenempty){
+                return $this->defaultsetting;
+            } else {
+                return '';
+            }
        } else {
            return false;
        }