raphael.js

[raphael] / raphael.js

diff --git a/raphael.js b/raphael.js
index bf6e741..75728ff 100644 (file)
--- a/raphael.js
+++ b/raphael.js
@@ -227,6 +227,7 @@
 // │ Copyright (c) 2008-2011 Sencha Labs (http://sencha.com)             │ \\
 // │ Licensed under the MIT (http://raphaeljs.com/license.html) license. │ \\
 // └─────────────────────────────────────────────────────────────────────┘ \\
+
 (function () {
     
     function R(first) {
@@ -2018,37 +2019,7 @@
     
     elproto = R.el = {};
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+     
     for (var i = events.length; i--;) {
         (function (eventName) {
             R[eventName] = elproto[eventName] = function (fn, scope) {
@@ -3909,6 +3880,9 @@ window.Raphael.svg && function (R) {
                             break;
                         }
                         clr[has]("opacity") && $(node, {"fill-opacity": clr.opacity > 1 ? clr.opacity / 100 : clr.opacity});
+                        // falls through (this is where setting is done...)
+                        
+                        
                     case "stroke":
                         clr = R.getRGB(value);
                         node.setAttribute(att, clr.hex);
@@ -4208,11 +4182,13 @@ window.Raphael.svg && function (R) {
         for (var key in params) {
             eve("attr." + key + "." + this.id, this, params[key]);
         }
-        for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
-            var par = this.paper.customAttributes[key].apply(this, [].concat(params[key]));
-            this.attrs[key] = params[key];
-            for (var subkey in par) if (par[has](subkey)) {
-                params[subkey] = par[subkey];
+        for (key in this.paper.customAttributes) {
+            if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
+                var par = this.paper.customAttributes[key].apply(this, [].concat(params[key]));
+                this.attrs[key] = params[key];
+                for (var subkey in par) if (par[has](subkey)) {
+                    params[subkey] = par[subkey];
+                }
             }
         }
         setFillAndStroke(this, params);
@@ -4495,6 +4471,8 @@ window.Raphael.svg && function (R) {
 // │ Copyright (c) 2008-2011 Sencha Labs (http://sencha.com)             │ \\
 // │ Licensed under the MIT (http://raphaeljs.com/license.html) license. │ \\
 // └─────────────────────────────────────────────────────────────────────┘ \\
+
+
 window.Raphael.vml && function (R) {
     var has = "hasOwnProperty",
         Str = String,
@@ -4633,6 +4611,7 @@ window.Raphael.vml && function (R) {
         stroke[se + "arrowwidth"] = h;
     },
     setFillAndStroke = function (o, params) {
+        //Roo.log( ['setFillAndStroke' , o, params]);
         // o.paper.canvas.style.display = "none";
         o.attrs = o.attrs || {};
         var node = o.node,