@@ -1,3 +1,4 @@
*.sw[op]
IWL-*
Makefile
+install
.gitignore
@@ -563,8 +563,8 @@ sub getContent {
my $content = '';
if (!$self->{_realized}) {
- $self->{_realized} = 1;
- $self->_realize;
+ $self->{_realized} = 1;
+ $self->_realize;
$self->_shareResources;
$self->__addInitScripts;
}
@@ -659,16 +659,17 @@ sub getObject {
my $scripts = [];
if (!$self->{_realized}) {
- $self->{_realized} = 1;
- $self->_realize;
+ $self->{_realized} = 1;
+ $self->_realize;
$self->_shareResources;
+ $self->__addInitScripts;
}
return {} if $self->bad;
return
if (!@{$self->{childNodes}} && ($self->{_removeEmpty})
- || $self->{_ignore});
+ || $self->{_ignore});
foreach my $child (@{$self->{childNodes}}) {
push @$children, $child->getObject if $child;
@@ -679,16 +680,16 @@ sub getObject {
my $attributes = {};
foreach my $key (keys %{$self->{_attributes}}) {
my $value = $self->{_attributes}{$key};
- if (defined $self->{_escapings}{$key} && $self->{_escapings}{$key} eq 'uri') {
- $value = encodeURI($value);
- } elsif (defined $self->{_escapings}{$key} && $self->{_escapings}{$key} eq 'escape') {
- $value = escape($value);
- } elsif (defined $self->{_escapings}{$key} && $self->{_escapings}{$key} eq 'none') {
- # No need to do anything here
- } else {
- $value = escapeHTML($value);
- }
- $attributes->{$key} = $value;
+ if (defined $self->{_escapings}{$key} && $self->{_escapings}{$key} eq 'uri') {
+ $value = encodeURI($value);
+ } elsif (defined $self->{_escapings}{$key} && $self->{_escapings}{$key} eq 'escape') {
+ $value = escape($value);
+ } elsif (defined $self->{_escapings}{$key} && $self->{_escapings}{$key} eq 'none') {
+ # No need to do anything here
+ } else {
+ $value = escapeHTML($value);
+ }
+ $attributes->{$key} = $value;
}
$attributes->{style} = $self->{_style} if keys %{$self->{_style}};
lib/IWL/Object.pm
@@ -205,7 +205,7 @@ Object.extend(IWL, (function() {
} else if (json.tag == 'script' && json.attributes && json.attributes.src) {
var url = json.attributes.src;
++script_urls;
- document.insertScript(url,
+ return document.insertScript(url,
{onComplete: evalScript, removeScriptElement: !IWL.Config.DEBUG, skipCache: IWL.Config.DEBUG});
} else {
var attributes = {};
share/jscript/base.js
52aca7f816a6c325dabaa025f6591c079e05bb3e
urandom
vkojouharov@gmail.com
http://github.com/urandom/iwl/commit/9ffbfbe47bab8e38b90443c04c5b3d3680a1ae67
9ffbfbe47bab8e38b90443c04c5b3d3680a1ae67
2008-04-25T13:27:46-07:00
2008-04-25T13:27:46-07:00
forgot to place the init scripts when getting the object
7c96f909e4d1dd1a974f6b4827300fdf21e69e86
urandom
vkojouharov@gmail.com