Make fields extra work properly

bebraw · Jul 11, 2012 · 77ddd84 · 77ddd84
1 parent 59e9b5e
commit 77ddd84
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/dist/colorjoe.js b/dist/colorjoe.js
@@ -1072,6 +1072,7 @@ function fields(p, joe, o) {
     var col = [cs];
 
     elems.forEach(function(o) {col.push(o.e.input.value / fac);});
+    col.push(1); // alpha
 
     chg = true;
     joe.set(onecolor(col));
@@ -1312,13 +1313,16 @@ function setup(o) {
 }
 
 function getColor(c) {
-   var ret = onecolor(c);
+  if(!isDefined(c)) return onecolor('black');
+  if(c.isColor) return c;
 
-   if(ret) return ret;
+  var ret = onecolor(c);
 
-   if(isDefined(c)) console.warn('Passed invalid color to colorjoe, using black instead');
+  if(ret) return ret;
 
-   return onecolor('black');
+  if(isDefined(c)) console.warn('Passed invalid color to colorjoe, using black instead');
+
+  return onecolor('black');
 }
 
 function setupExtras(p, joe, extras) {

diff --git a/dist/colorjoe.min.js b/dist/colorjoe.min.js
diff --git a/src/colorjoe.js b/src/colorjoe.js
@@ -190,13 +190,16 @@ function setup(o) {
 }
 
 function getColor(c) {
-   var ret = onecolor(c);
+  if(!isDefined(c)) return onecolor('black');
+  if(c.isColor) return c;
 
-   if(ret) return ret;
+  var ret = onecolor(c);
 
-   if(isDefined(c)) console.warn('Passed invalid color to colorjoe, using black instead');
+  if(ret) return ret;
 
-   return onecolor('black');
+  if(isDefined(c)) console.warn('Passed invalid color to colorjoe, using black instead');
+
+  return onecolor('black');
 }
 
 function setupExtras(p, joe, extras) {

diff --git a/src/extras.js b/src/extras.js
@@ -51,6 +51,7 @@ function fields(p, joe, o) {
     var col = [cs];
 
     elems.forEach(function(o) {col.push(o.e.input.value / fac);});
+    col.push(1); // alpha
 
     chg = true;
     joe.set(onecolor(col));