h.makeColorObj: fix the new chrome issue

mojs · Nov 19, 2015 · 332c1bc · 332c1bc
1 parent ec0f9c1
commit 332c1bc
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 46 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "mojs",
   "description": "motion graphics toolbelt for the web",
-  "version": "0.147.3",
+  "version": "0.147.4",
   "license": "MIT",
   "homepage": "https://github.com/legomushroom/mojs",
   "authors": [

diff --git a/build/mo.js b/build/mo.js
@@ -1,7 +1,7 @@
 /*! 
 	:: mo · js :: motion graphics toolbelt for the web
 	Oleg Solomka @LegoMushroom 2015 MIT
-	0.147.3 
+	0.147.4 
 */
 
 (function(f){
@@ -1441,7 +1441,7 @@ Helpers = (function() {
   };
 
   Helpers.prototype.makeColorObj = function(color) {
-    var alpha, b, colorObj, g, isRgb, r, regexString1, regexString2, result, rgbColor, style;
+    var alpha, b, colorObj, g, isRgb, r, regexString1, regexString2, result, rgbColor;
     if (color[0] === '#') {
       result = /^#?([a-f\d]{1,2})([a-f\d]{1,2})([a-f\d]{1,2})$/i.exec(color);
       colorObj = {};
@@ -1463,7 +1463,7 @@ Helpers = (function() {
         rgbColor = color;
       }
       if (!isRgb) {
-        rgbColor = !this.shortColors[color] ? (this.div.style.color = color, this.isFF || this.isIE || this.isOldOpera ? (style = this.computedStyle(this.div), this.computedStyle(this.div).color) : this.div.style.color) : this.shortColors[color];
+        rgbColor = !this.shortColors[color] ? (this.div.style.color = color, this.computedStyle(this.div).color) : this.shortColors[color];
       }
       regexString1 = '^rgba?\\((\\d{1,3}),\\s?(\\d{1,3}),';
       regexString2 = '\\s?(\\d{1,3}),?\\s?(\\d{1}|0?\\.\\d{1,})?\\)$';
@@ -1705,7 +1705,7 @@ module.exports = h;
 
 },{}],7:[function(require,module,exports){
 window.mojs = {
-  revision: '0.147.3',
+  revision: '0.147.4',
   isDebug: true,
   helpers: require('./h'),
   Bit: require('./shapes/bit'),

diff --git a/build/mo.min.js b/build/mo.min.js
diff --git a/docs/index.html b/docs/index.html
@@ -32,9 +32,8 @@
       <div class="segment">
 
         <div class="comments ">
-          <div class="wrapper"><h1 id="mo-js-"><a href="#mo-js-" class="anchor"></a>mo · js <a href="https://travis-ci.org/legomushroom/mojs"><img src="https://travis-ci.org/legomushroom/mojs.svg?branch=master" alt="Build Status"></a> <a href="https://coveralls.io/r/legomushroom/mojs?branch=master"><img src="https://coveralls.io/repos/legomushroom/mojs/badge.svg?branch=master" alt="Coverage Status"></a> <a href="http://github.com/badges/stability-badges"><img src="https://img.shields.io/badge/stability-unstable-yellow.svg" alt="unstable"></a> <a href="https://mojs.slack.com/messages/mojs/"><img src="https://img.shields.io/badge/slack-mojs%20channel-61DAAA.svg?style=flat" alt="mojs channel on slack"></a></h1><h4 id="motion-graphics-toolbelt-for-the-web"><a href="#motion-graphics-toolbelt-for-the-web" class="anchor"></a>motion graphics toolbelt for the web</h4><p><a href="https://saucelabs.com/u/legomushroom"><img src="https://saucelabs.com/browser-matrix/legomushroom.svg" alt="Sauce Test Status"></a></p>
-<h2 id="demos"><a href="#demos" class="anchor"></a>Demos</h2><p>[<a href="http://codepen.io/sol0mka/full/ogOYJj/">motion graphics for the web</a>]
-[<a href="http://codepen.io/sol0mka/full/yNOage/">bubble layout</a>]</p>
+          <div class="wrapper"><h1 id="mo-js-"><a href="#mo-js-" class="anchor"></a>mo · js <a href="https://travis-ci.org/legomushroom/mojs"><img src="https://travis-ci.org/legomushroom/mojs.svg?branch=dev" alt="Build Status"></a> <a href="https://coveralls.io/r/legomushroom/mojs?branch=dev"><img src="https://coveralls.io/repos/legomushroom/mojs/badge.svg?branch=dev" alt="Coverage Status"></a> <a href="http://github.com/badges/stability-badges"><img src="https://img.shields.io/badge/stability-unstable-yellow.svg" alt="unstable"></a> <a href="https://mojs.slack.com/messages/mojs/"><img src="https://img.shields.io/badge/slack-mojs%20channel-61DAAA.svg?style=flat" alt="mojs channel on slack"></a></h1><h4 id="motion-graphics-toolbelt-for-the-web"><a href="#motion-graphics-toolbelt-for-the-web" class="anchor"></a>motion graphics toolbelt for the web</h4><p><a href="https://saucelabs.com/u/legomushroom-dev"><img src="https://saucelabs.com/browser-matrix/legomushroom-dev.svg" alt="Sauce Test Status"></a></p>
+<h2 id="demos"><a href="#demos" class="anchor"></a>Demos</h2><p>[<a href="http://codepen.io/sol0mka/full/ogOYJj/">motion graphics for the web</a>]</p>
 <h2 id="important-note"><a href="#important-note" class="anchor"></a>Important note</h2><p>The library is under active development. APIs should be considered <code>[unstable]</code> and can be changed drastically.</p>
 <h2 id="installation"><a href="#installation" class="anchor"></a>Installation</h2><h3 id="cdn"><a href="#cdn" class="anchor"></a>CDN</h3><p><code>&lt;script src=&quot;//cdn.jsdelivr.net/mojs/latest/mo.min.js&quot;&gt;&lt;/script&gt;</code>  </p>
 <h3 id="bower"><a href="#bower" class="anchor"></a>Bower</h3><p><code>bower install mojs</code></p>

diff --git a/docs/js/h.coffee.html b/docs/js/h.coffee.html
@@ -557,10 +557,7 @@
         <div class="code"><div class="wrapper">      <span class="hljs-keyword">if</span> !isRgb
         rgbColor = <span class="hljs-keyword">if</span> !<span class="hljs-property">@shortColors</span>[color]
           <span class="hljs-property">@div</span>.style.color = color
-          <span class="hljs-keyword">if</span> <span class="hljs-property">@isFF</span> <span class="hljs-keyword">or</span> <span class="hljs-property">@isIE</span> <span class="hljs-keyword">or</span> <span class="hljs-property">@isOldOpera</span>
-            style = <span class="hljs-property">@computedStyle</span>(<span class="hljs-property">@div</span>)
-            <span class="hljs-property">@computedStyle</span>(<span class="hljs-property">@div</span>).color
-          <span class="hljs-keyword">else</span> <span class="hljs-property">@div</span>.style.color
+          <span class="hljs-property">@computedStyle</span>(<span class="hljs-property">@div</span>).color
         <span class="hljs-keyword">else</span> <span class="hljs-property">@shortColors</span>[color]
 
       regexString1 = <span class="hljs-string">'^rgba?\\((\\d{1,3}),\\s?(\\d{1,3}),'</span>

diff --git a/docs/js/mojs.coffee.html b/docs/js/mojs.coffee.html
@@ -33,7 +33,7 @@
 
 
         <div class="code"><div class="wrapper"><span class="hljs-built_in">window</span>.mojs =
-  <span class="hljs-attribute">revision</span>:   <span class="hljs-string">'0.147.3'</span>, <span class="hljs-attribute">isDebug</span>: <span class="hljs-literal">true</span>
+  <span class="hljs-attribute">revision</span>:   <span class="hljs-string">'0.147.4'</span>, <span class="hljs-attribute">isDebug</span>: <span class="hljs-literal">true</span>
   helpers     : <span class="hljs-built_in">require</span> <span class="hljs-string">'./h'</span>
   Bit         : <span class="hljs-built_in">require</span> <span class="hljs-string">'./shapes/bit'</span>
   bitsMap     : <span class="hljs-built_in">require</span> <span class="hljs-string">'./shapes/bitsMap'</span>

diff --git a/docs/toc.js b/docs/toc.js
@@ -134,22 +134,6 @@ window.files = [
     }
   ]
 },
-{
-  "path": "js/polyfills/performance.coffee.html",
-  "originalName": "performance.coffee",
-  "originalPath": "js/polyfills/performance.coffee",
-  "name": "performance.coffee.html",
-  "lang": "coffeescript",
-  "toc": []
-},
-{
-  "path": "js/polyfills/raf.coffee.html",
-  "originalName": "raf.coffee",
-  "originalPath": "js/polyfills/raf.coffee",
-  "name": "raf.coffee.html",
-  "lang": "coffeescript",
-  "toc": []
-},
 {
   "path": "js/shapes/bit.coffee.html",
   "originalName": "bit.coffee",
@@ -222,6 +206,22 @@ window.files = [
   "lang": "coffeescript",
   "toc": []
 },
+{
+  "path": "js/polyfills/performance.coffee.html",
+  "originalName": "performance.coffee",
+  "originalPath": "js/polyfills/performance.coffee",
+  "name": "performance.coffee.html",
+  "lang": "coffeescript",
+  "toc": []
+},
+{
+  "path": "js/polyfills/raf.coffee.html",
+  "originalName": "raf.coffee",
+  "originalPath": "js/polyfills/raf.coffee",
+  "name": "raf.coffee.html",
+  "lang": "coffeescript",
+  "toc": []
+},
 {
   "path": "js/tween/timeline.coffee.html",
   "originalName": "timeline.coffee",

diff --git a/js/h.coffee b/js/h.coffee
@@ -298,10 +298,7 @@ class Helpers
       if !isRgb
         rgbColor = if !@shortColors[color]
           @div.style.color = color
-          if @isFF or @isIE or @isOldOpera
-            style = @computedStyle(@div)
-            @computedStyle(@div).color
-          else @div.style.color
+          @computedStyle(@div).color
         else @shortColors[color]
 
       regexString1 = '^rgba?\\((\\d{1,3}),\\s?(\\d{1,3}),'

diff --git a/js/mojs.coffee b/js/mojs.coffee
@@ -1,6 +1,6 @@
 
 window.mojs =
-  revision:   '0.147.3', isDebug: true
+  revision:   '0.147.4', isDebug: true
   helpers     : require './h'
   Bit         : require './shapes/bit'
   bitsMap     : require './shapes/bitsMap'
@@ -33,4 +33,3 @@ if (typeof module is "object") and (typeof module.exports is "object")
   module.exports = mojs
 # ### istanbul ignore next ###
 # return window?.mojs = mojs
-
diff --git a/lib/h.js b/lib/h.js
diff --git a/lib/mojs.js b/lib/mojs.js
@@ -1,6 +1,6 @@
 (function() {
   window.mojs = {
-    revision: '0.147.3',
+    revision: '0.147.4',
     isDebug: true,
     helpers: require('./h'),
     Bit: require('./shapes/bit'),

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mo-js",
   "description": "motion graphics toolbelt for the web",
-  "version": "0.147.3",
+  "version": "0.147.4",
   "license": "MIT",
   "private": false,
   "scripts": {

diff --git a/spec/mo.spec.js b/spec/mo.spec.js
@@ -1439,7 +1439,7 @@ Helpers = (function() {
   };
 
   Helpers.prototype.makeColorObj = function(color) {
-    var alpha, b, colorObj, g, isRgb, r, regexString1, regexString2, result, rgbColor, style;
+    var alpha, b, colorObj, g, isRgb, r, regexString1, regexString2, result, rgbColor;
     if (color[0] === '#') {
       result = /^#?([a-f\d]{1,2})([a-f\d]{1,2})([a-f\d]{1,2})$/i.exec(color);
       colorObj = {};
@@ -1461,7 +1461,7 @@ Helpers = (function() {
         rgbColor = color;
       }
       if (!isRgb) {
-        rgbColor = !this.shortColors[color] ? (this.div.style.color = color, this.isFF || this.isIE || this.isOldOpera ? (style = this.computedStyle(this.div), this.computedStyle(this.div).color) : this.div.style.color) : this.shortColors[color];
+        rgbColor = !this.shortColors[color] ? (this.div.style.color = color, this.computedStyle(this.div).color) : this.shortColors[color];
       }
       regexString1 = '^rgba?\\((\\d{1,3}),\\s?(\\d{1,3}),';
       regexString2 = '\\s?(\\d{1,3}),?\\s?(\\d{1}|0?\\.\\d{1,})?\\)$';
@@ -1703,7 +1703,7 @@ module.exports = h;
 
 },{}],7:[function(require,module,exports){
 window.mojs = {
-  revision: '0.147.3',
+  revision: '0.147.4',
   isDebug: true,
   helpers: require('./h'),
   Bit: require('./shapes/bit'),