v3.0.1

istvan-ujjmeszaros · Aug 11, 2014 · cb5b851 · cb5b851
1 parent e6519ae
commit cb5b851
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 16 deletions.
diff --git a/bootstrap-colorpickersliders.jquery.json b/bootstrap-colorpickersliders.jquery.json
@@ -12,7 +12,7 @@
     "widget",
     "colorchooser"
   ],
-  "version": "3.0.0",
+  "version": "3.0.1",
   "author": {
     "name": "István Ujj-Mészáros",
     "url": "https://github.com/istvan-ujjmeszaros"

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-colorpickersliders",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "homepage": "http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/",
   "authors": [
     {

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
   ],
   "description": "Bootstrap 3 optimized responsive color selector with HSV, HSL, RGB and CIE-Lch (which supports human perceived lightness) selectors and color swatches.",
   "homepage": "http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "authors": [
     {
       "name": "István Ujj-Mészáros",

diff --git a/dist/bootstrap.colorpickersliders.css b/dist/bootstrap.colorpickersliders.css
@@ -1,5 +1,5 @@
 /*
- *  Bootstrap Color Picker Sliders - v3.0.0
+ *  Bootstrap Color Picker Sliders - v3.0.1
  *
  *  Bootstrap 3 optimized responsive color selector with HSV, HSL, RGB and CIE-Lch (which supports human perceived lightness) selectors and color swatches.
  *  http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/

diff --git a/dist/bootstrap.colorpickersliders.js b/dist/bootstrap.colorpickersliders.js
@@ -1,5 +1,5 @@
 /*
- *  Bootstrap Color Picker Sliders - v3.0.0
+ *  Bootstrap Color Picker Sliders - v3.0.1
  *
  *  Bootstrap 3 optimized responsive color selector with HSV, HSL, RGB and CIE-Lch (which supports human perceived lightness) selectors and color swatches.
  *  http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/
@@ -1350,7 +1350,12 @@
 
             switch (format) {
               case 'hex':
-                $element.val(color.tiny.toHexString());
+                if (color.hsla.a < 1) {
+                  $element.val(color.tiny.toRgbString());
+                }
+                else {
+                  $element.val(color.tiny.toHexString());
+                }
                 break;
               case 'hsl':
                 $element.val(color.tiny.toHslString());
@@ -1493,7 +1498,12 @@
 
         switch (settings.previewformat) {
           case 'hex':
-            colorstring = color.tiny.toHexString();
+            if (color.hsla.a < 1) {
+              colorstring = color.tiny.toRgbString();
+            }
+            else {
+              colorstring = color.tiny.toHexString();
+            }
             break;
           case 'hsl':
             colorstring = color.tiny.toHslString();

diff --git a/dist/bootstrap.colorpickersliders.min.css b/dist/bootstrap.colorpickersliders.min.css
diff --git a/dist/bootstrap.colorpickersliders.min.js b/dist/bootstrap.colorpickersliders.min.js
diff --git a/dist/bootstrap.colorpickersliders.nocielch.js b/dist/bootstrap.colorpickersliders.nocielch.js
@@ -1,5 +1,5 @@
 /*
- *  Bootstrap Color Picker Sliders - v3.0.0
+ *  Bootstrap Color Picker Sliders - v3.0.1
  *
  *  Bootstrap 3 optimized responsive color selector with HSV, HSL, RGB and CIE-Lch (which supports human perceived lightness) selectors and color swatches.
  *  http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/
@@ -1235,7 +1235,12 @@
 
             switch (format) {
               case 'hex':
-                $element.val(color.tiny.toHexString());
+                if (color.hsla.a < 1) {
+                  $element.val(color.tiny.toRgbString());
+                }
+                else {
+                  $element.val(color.tiny.toHexString());
+                }
                 break;
               case 'hsl':
                 $element.val(color.tiny.toHslString());
@@ -1315,7 +1320,12 @@
 
         switch (settings.previewformat) {
           case 'hex':
-            colorstring = color.tiny.toHexString();
+            if (color.hsla.a < 1) {
+              colorstring = color.tiny.toRgbString();
+            }
+            else {
+              colorstring = color.tiny.toHexString();
+            }
             break;
           case 'hsl':
             colorstring = color.tiny.toHslString();

diff --git a/dist/bootstrap.colorpickersliders.nocielch.min.js b/dist/bootstrap.colorpickersliders.nocielch.min.js
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "url": "http://github.com/istvan-ujjmeszaros/bootstrap-colorpickersliders.git"
   },
   "homepage": "http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-cli": "~0.1.13",