From 3db528bd5c0cb00fb802e59808a76ff3bf36c826 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 20 Apr 2009 06:15:31 -0400
Subject: [PATCH] Use compressed version of jQuery.js
---
program/include/rcube_json_output.php | 56 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php
index a633f85..a14f4ae 100644
--- a/program/include/rcube_json_output.php
+++ b/program/include/rcube_json_output.php
@@ -5,7 +5,7 @@
| program/include/rcube_json_output.php |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2008, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -34,7 +34,7 @@
private $texts = array();
private $commands = array();
- public $task = '';
+ public $type = 'js';
public $ajax_call = true;
@@ -43,7 +43,6 @@
*/
public function __construct($task)
{
- $this->task = $task;
$this->config = rcmail::get_instance()->config;
}
@@ -60,12 +59,14 @@
}
/**
- * @ignore
+ * Issue command to set page title
+ *
+ * @param string New page title
*/
public function set_pagetitle($title)
{
- $name = $this->config->get('product_name');
- $this->command('set_pagetitle', JQ(empty($name) ? $title : $name.' :: '.$title));
+ $name = $this->config->get('product_name');
+ $this->command('set_pagetitle', JQ(empty($name) ? $title : $name.' :: '.$title));
}
/**
@@ -156,11 +157,24 @@
/**
* Delete all stored env variables and commands
*/
- public public function reset()
+ public function reset()
{
$this->env = array();
$this->texts = array();
$this->commands = array();
+ }
+
+ /**
+ * Redirect to a certain url
+ *
+ * @param mixed Either a string with the action or url parameters as key-value pairs
+ * @see rcmail::url()
+ */
+ public function redirect($p = array(), $delay = 1)
+ {
+ $location = rcmail::get_instance()->url($p);
+ $this->remote_response("window.setTimeout(\"location.href='{$location}'\", $delay);");
+ exit;
}
@@ -182,26 +196,33 @@
* @return void
* @deprecated
*/
- public function remote_response($add='', $flush=false)
+ public function remote_response($add='')
{
static $s_header_sent = false;
if (!$s_header_sent) {
$s_header_sent = true;
send_nocacheing_headers();
- header('Content-Type: application/x-javascript; charset=' . $this->get_charset());
+ header('Content-Type: text/plain; charset=' . $this->get_charset());
print '/** ajax response ['.date('d/M/Y h:i:s O')."] **/\n";
}
// unset default env vars
unset($this->env['task'], $this->env['action'], $this->env['comm_path']);
- // send response code
- echo $this->get_js_commands() . $add;
+ $rcmail = rcmail::get_instance();
+ $response = array('action' => $rcmail->action, 'unlock' => (bool)$_REQUEST['_unlock']);
+
+ if (!empty($this->env))
+ $response['env'] = $this->env;
+
+ if (!empty($this->texts))
+ $response['texts'] = $this->texts;
- // flush the output buffer
- if ($flush)
- flush();
+ // send response code
+ $response['exec'] = $this->get_js_commands() . $add;
+
+ echo json_serialize($response);
}
@@ -213,14 +234,7 @@
private function get_js_commands()
{
$out = '';
-
- if (sizeof($this->env))
- $out .= 'this.set_env('.json_serialize($this->env).");\n";
- foreach($this->texts as $name => $text) {
- $out .= sprintf("this.add_label('%s', '%s');\n", $name, JQ($text));
- }
-
foreach ($this->commands as $i => $args) {
$method = array_shift($args);
foreach ($args as $i => $arg) {
--
Gitblit v1.9.1