Commits

Devon O'Dell committed 6beaca5

Fix notices around non-hex colors, and allow use of any CSS3 color.

Comments (0)

Files changed (2)

 namespace org\dh0\a2s;
 
 include 'svg-path.lex.php';
+include 'colors.php';
 
 /*
  * Scale is a singleton class that is instantiated to apply scale
             /* N.B. We may want to make sure it has the while string */
             if ($boxes[$j]->hasPoint($tP->x, $tP->y)) {
               $fill = $boxes[$j]->getOption('fill');
+              if (substr($fill, 0, 1) != '#') {
+                if (!isset($colors[strtolower($fill)])) {
+                  continue;
+                } else {
+                  $fill = $colors[strtolower($fill)];
+                }
+              } else {
+                if (strlen($fill) != 4 && strlen($fill) != 7) {
+                  continue;
+                }
+              }
+                
+
               if ($fill) {
                 /* Attempt to parse the fill color */
                 if (strlen($fill) == 4) {
 #namespace org\dh0\a2s;
 
 include 'svg-path.lex.php';
+include 'colors.php';
 
 /*
  * A2S_Scale is a singleton class that is instantiated to apply scale
             /* N.B. We may want to make sure it has the while string */
             if ($boxes[$j]->hasPoint($tP->x, $tP->y)) {
               $fill = $boxes[$j]->getOption('fill');
+              if (substr($fill, 0, 1) != '#') {
+                if (!isset($colors[strtolower($fill)])) {
+                  continue;
+                } else {
+                  $fill = $colors[strtolower($fill)];
+                }
+              } else {
+                if (strlen($fill) != 4 && strlen($fill) != 7) {
+                  continue;
+                }
+              }
+                
+
               if ($fill) {
                 /* Attempt to parse the fill color */
                 if (strlen($fill) == 4) {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.