|
|
@ -146,7 +146,6 @@ EOF;
|
|
|
|
|
|
|
|
|
|
|
|
// set blankpage (watermark) url
|
|
|
|
// set blankpage (watermark) url
|
|
|
|
$blankpage = $this->config->get('blankpage_url', '/watermark.html');
|
|
|
|
$blankpage = $this->config->get('blankpage_url', '/watermark.html');
|
|
|
|
$blankpage = $this->abs_url($blankpage);
|
|
|
|
|
|
|
|
$this->set_env('blankpage', $blankpage);
|
|
|
|
$this->set_env('blankpage', $blankpage);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -555,6 +554,11 @@ EOF;
|
|
|
|
$this->set_env('request_token', $this->app->get_request_token());
|
|
|
|
$this->set_env('request_token', $this->app->get_request_token());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Fix assets path on blankpage
|
|
|
|
|
|
|
|
if ($this->js_env['blankpage']) {
|
|
|
|
|
|
|
|
$this->js_env['blankpage'] = $this->asset_url($this->abs_url($this->js_env['blankpage'], true));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$commands = $this->get_js_commands($framed);
|
|
|
|
$commands = $this->get_js_commands($framed);
|
|
|
|
|
|
|
|
|
|
|
|
// if all js commands go to parent window we can ignore all
|
|
|
|
// if all js commands go to parent window we can ignore all
|
|
|
|