projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HTML::Entities in InstallationCheck aufgenommen
[kivitendo-erp.git]
/
SL
/
ClientJS.pm
diff --git
a/SL/ClientJS.pm
b/SL/ClientJS.pm
index
fcc2c14
..
2eedbee
100644
(file)
--- a/
SL/ClientJS.pm
+++ b/
SL/ClientJS.pm
@@
-9,6
+9,7
@@
use SL::JSON ();
use Rose::Object::MakeMethods::Generic
(
use Rose::Object::MakeMethods::Generic
(
+ scalar => [ qw(controller) ],
'scalar --get_set_init' => [ qw(_actions _flash _error) ],
);
'scalar --get_set_init' => [ qw(_actions _flash _error) ],
);
@@
-74,7
+75,8
@@
my %supported_methods = (
# ## jQuery UI dialog plugin ## pattern: $(<TARGET>).dialog('<FUNCTION>')
# ## jQuery UI dialog plugin ## pattern: $(<TARGET>).dialog('<FUNCTION>')
- # Closing and removing the popup
+ # Opening and closing and closing a popup
+ 'dialog:open' => 1, # kivi.popup_dialog(<TARGET>)
'dialog:close' => 1,
# ## jQuery Form plugin ##
'dialog:close' => 1,
# ## jQuery Form plugin ##
@@
-188,6
+190,7
@@
sub to_array {
sub render {
my ($self, $controller) = @_;
sub render {
my ($self, $controller) = @_;
+ $controller ||= $self->controller;
$self->reinit_widgets if $::request->presenter->need_reinit_widgets;
return $controller->render(\$self->to_json, { type => 'json' });
}
$self->reinit_widgets if $::request->presenter->need_reinit_widgets;
return $controller->render(\$self->to_json, { type => 'json' });
}
@@
-269,7
+272,7
@@
Now some Perl code:
my ($self) = @_;
# Create a new client-side JS object and do stuff with it!
my ($self) = @_;
# Create a new client-side JS object and do stuff with it!
- my $js = SL::ClientJS->new;
+ my $js = SL::ClientJS->new
(controller => $self)
;
# Show some element on the page:
$js->show('#usually_hidden');
# Show some element on the page:
$js->show('#usually_hidden');
@@
-295,7
+298,7
@@
Now some Perl code:
# Rendering can also be chained, e.g.
$js->html('#selector', $html)
# Rendering can also be chained, e.g.
$js->html('#selector', $html)
- ->render
($self)
;
+ ->render;
}
=head1 OVERVIEW
}
=head1 OVERVIEW
@@
-345,13
+348,16
@@
are the function parameters.
Returns the actions gathered so far as a JSON string ready to be sent
to the client.
Returns the actions gathered so far as a JSON string ready to be sent
to the client.
-=item C<render
$controller
>
+=item C<render
[$controller]
>
Renders C<$self> via the controller. Useful for chaining. Equivalent
to the following:
$controller->render(\$self->to_json, { type => 'json' });
Renders C<$self> via the controller. Useful for chaining. Equivalent
to the following:
$controller->render(\$self->to_json, { type => 'json' });
+The controller instance to use can be set during object creation (see
+synopsis) or as an argument to C<render>.
+
=item C<dialog>
Tells C<$self> that the next action is to be called on a jQuery UI
=item C<dialog>
Tells C<$self> that the next action is to be called on a jQuery UI