Permalink
Browse files

Added optional GET params array

  • Loading branch information...
1 parent d86d991 commit b12540f43185d8b659f126174af710ff23d25207 @alexeyco alexeyco committed Mar 11, 2012
Showing with 16 additions and 8 deletions.
  1. +14 −6 classes/kohana/controller/filebrowser.php
  2. +2 −2 media/filebrowser/global.js
@@ -513,19 +513,27 @@ public function action_thumb()
->body($image);
}
+ /**
+ * Optional GET params (like session_id etc)
+ *
+ * @var array
+ */
+ protected $_optional_params = array();
+
public function after()
{
if ($this->auto_render)
{
$route = Route::get('wysiwyg/filebrowser');
- $this->template->global_config = array
+ $this->template->global_config = Arr::merge($this->template->global_config, array
(
- 'root' => $this->_config['media_directory'].'/'.Kohana::$config->load('filebrowser.uploads_directory'),
- 'dirs_url' => $route->uri(array('action' => 'dirs')),
- 'files_url' => $route->uri(array('action' => $this->request->action())),
- 'move_url' => $route->uri(array('action' => 'move'))
- );
+ 'root' => $this->_config['media_directory'].'/'.Kohana::$config->load('filebrowser.uploads_directory'),
+ 'dirs_url' => $route->uri(array('action' => 'dirs')),
+ 'files_url' => $route->uri(array('action' => $this->request->action())),
+ 'move_url' => $route->uri(array('action' => 'move')),
+ 'params' => $this->_optional_params
+ ));
}
parent::after();
@@ -49,8 +49,8 @@
zone: 'any',
events: 'closeFolderClick,openFolderClick'
},
- targetSelector : "div",
- containerClass : "contextMenu well",
+ targetSelector: "div",
+ containerClass: "contextMenu well",
listClass: "nav nav-list",
list: [
{

0 comments on commit b12540f

Please sign in to comment.