X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FClientJS.pm;h=d4775b83083160f97054e8cd324be8992367f7cd;hb=7ff7dd017542c32a8f8111167fda69857de50910;hp=fcc2c146c18546db465c4dc6dd9c917560e4c2fb;hpb=551d4b787115605d6b12ef199ea52ac6a5a2ad0c;p=kivitendo-erp.git

diff --git a/SL/ClientJS.pm b/SL/ClientJS.pm
index fcc2c146c..d4775b830 100644
--- a/SL/ClientJS.pm
+++ b/SL/ClientJS.pm
@@ -9,6 +9,7 @@ use SL::JSON ();
 
 use Rose::Object::MakeMethods::Generic
 (
+  scalar                  => [ qw(controller) ],
   'scalar --get_set_init' => [ qw(_actions _flash _error) ],
 );
 
@@ -74,7 +75,8 @@ my %supported_methods = (
 
   # ## 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 ##
@@ -116,6 +118,8 @@ my %supported_methods = (
   reinit_widgets         => 0,  # kivi.reinit_widgets()
   run                    => -1, # kivi.run(<TARGET>, <ARGS>)
   run_once_for           => 3,  # kivi.run_once_for(<TARGET>, <ARGS>)
+
+  scroll_into_view       => 1,  # $(<TARGET>)[0].scrollIntoView()
 );
 
 sub AUTOLOAD {
@@ -188,6 +192,7 @@ sub to_array {
 
 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' });
 }
@@ -269,7 +274,7 @@ Now some Perl code:
     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');
@@ -295,7 +300,7 @@ Now some Perl code:
 
     # Rendering can also be chained, e.g.
     $js->html('#selector', $html)
-       ->render($self);
+       ->render;
   }
 
 =head1 OVERVIEW
@@ -345,13 +350,16 @@ are the function parameters.
 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' });
 
+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