Changeset 25060 for gs3-extensions

Timestamp:

2012-02-08T18:04:13+13:00 (12 years ago)

Author:

davidb

Message:

'attr' as an attribute in HTML, passed straight through to Expeditee added in

Location:

gs3-extensions/html-to-expeditee/trunk/src

Files:

• perllib/ExpediteeFrameIO.pm (modified) (1 diff)
• src/js/html-to-expeditee.js (modified) (2 diffs)

gs3-extensions/html-to-expeditee/trunk/src/perllib/ExpediteeFrameIO.pm

@@ -467 +467 @@
     my $attr = convertStyleToAttr($html_node->{'style'});
 
+    if (defined $html_node->{'attr'}) {
+        # values provided in 'attr' explicitly overwrite any values 
+        # derived from CSS style
+
+        my $direct_attr_str = $html_node->{'attr'};
+        my @direct_attr_array = split(/\s*;\s*/,$direct_attr_str);
+        foreach my $da (@direct_attr_array) {
+        my ($key,$val) = ($da =~ m/^(.)\s*(.*)$/);
+        $attr->{$key} = $val;
+        }
+    }
+
     $self->addRect($xl,$yt,$xr,$yb,$attr);
 

gs3-extensions/html-to-expeditee/trunk/src/src/js/html-to-expeditee.js

@@ -139 +139 @@
             }
         }
-
     }
     }
@@ -184 +183 @@
         // console.log("font size = " + style["font-size"]);
  
-        jsonNode.style = style
+        jsonNode.style = style;
+
+        var attr = node.attributes["attr"];
+        if (attr != null) {
+        // console.log("attr = " + attr.value);
+        jsonNode.attr = attr.value;
+        }
+
 
             var jsonChildNodes = [];