diff --git a/CHANGE.md b/CHANGE.md index 069ff04..cddc635 100644 --- a/CHANGE.md +++ b/CHANGE.md @@ -3,12 +3,13 @@ Change Log: `yii2-widget-colorinput` ## Version 1.0.3 -**Date:** 10-Jan-2016 +**Date:** 14-Jan-2016 - (enh #18): Add Ukranian Translations. - (enh #19): Update Ukranian Translations. - (bug #20): Fix minified JS `spectrum-kv.min.js`. - (enh #21): Enhancements for PJAX based reinitialization. Complements enhancements in kartik-v/yii2-krajee-base#52 and kartik-v/yii2-krajee-base#53. +- (enh #22): Add branch alias for dev-master latest release. ## Version 1.0.2 diff --git a/README.md b/README.md index 7333384..d3903d1 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ to the ```require``` section of your `composer.json` file. ## Latest Release -> NOTE: The latest version of the module is v1.0.2 released on 27-Dec-2015. Refer the [CHANGE LOG](https://github.com/kartik-v/yii2-widget-colorinput/blob/master/CHANGE.md) for details. +> NOTE: The latest version of the module is v1.0.3. Refer the [CHANGE LOG](https://github.com/kartik-v/yii2-widget-colorinput/blob/master/CHANGE.md) for details. ## Demo diff --git a/assets/js/spectrum-kv.js b/assets/js/spectrum-kv.js index afcb792..d6c638c 100644 --- a/assets/js/spectrum-kv.js +++ b/assets/js/spectrum-kv.js @@ -14,8 +14,8 @@ $('.spectrum-group').on('change', 'input', function (e, color) { var $el = $(this), $group = $el.closest('.spectrum-group'), val = $el.val(); if ($el.is('.spectrum-source')) { - $group.find('.spectrum-input').val(color.toString()); - val = color.toHslString(); + val = color.toString(); + $group.find('.spectrum-input').val(val); } $group.find('.spectrum-source').spectrum('set', val); }); diff --git a/assets/js/spectrum-kv.min.js b/assets/js/spectrum-kv.min.js index 067158c..5bdbbcb 100644 --- a/assets/js/spectrum-kv.min.js +++ b/assets/js/spectrum-kv.min.js @@ -7,4 +7,4 @@ * Author: Kartik Visweswaran * Copyright: 2015, Kartik Visweswaran, Krajee.com * For more Yii related demos visit http://demos.krajee.com - */!function(t){"use strict";t(document).on("ready",function(){t(".spectrum-group").on("change","input",function(u,n){var r=t(this),s=r.closest(".spectrum-group"),c=r.val();r.is(".spectrum-source")&&(s.find(".spectrum-input").val(n.toString()),c=n.toHslString()),s.find(".spectrum-source").spectrum("set",c)})})}(window.jQuery); \ No newline at end of file + */!function(t){"use strict";t(document).on("ready",function(){t(".spectrum-group").on("change","input",function(u,n){var c=t(this),e=c.closest(".spectrum-group"),r=c.val();c.is(".spectrum-source")&&(r=n.toString(),e.find(".spectrum-input").val(r)),e.find(".spectrum-source").spectrum("set",r)})})}(window.jQuery); \ No newline at end of file diff --git a/composer.json b/composer.json index e720b00..962f855 100644 --- a/composer.json +++ b/composer.json @@ -19,5 +19,10 @@ "psr-4": { "kartik\\color\\": "" } + }, + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } } }