Skip to content

Commit

Permalink
add caja resources to lib/vendor/Shindig/external/resources (fixes #2…
Browse files Browse the repository at this point in the history
…394)
  • Loading branch information
upsilon committed Sep 5, 2011
1 parent 52c33a2 commit 91f66d4
Show file tree
Hide file tree
Showing 6 changed files with 1,283 additions and 0 deletions.
1 change: 1 addition & 0 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ The Apache Software Foundation (http://www.apache.org/).
- config/* => vendor/Shindig/config
- php/config/* => vendor/Shindig/config
- php/external/jsmin-php => vendor/Shindig/external/jsmin-php
- php/external/resources => vendor/Shindig/external/recources
- php/src => vendor/Shindig/src
- Some class names have been changed by the following script.
- https://gist.github.com/659536
Expand Down
12 changes: 12 additions & 0 deletions apps/pc_frontend/modules/gadgets/actions/actions.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@ protected function check()
}
}

/**
* Execute resources action
*
* @param sfWebRequest $request A request object
*/
public function executeResources(sfWebRequest $request)
{
$class = new ResourcesFilesServlet();
self::servletExecute($class);
exit;
}

/**
* Execute js action
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ protected function generateRoutes()
array('model' => 'Application', 'type' => 'object')
),

'gadgets_resources' => new sfRoute(
'/gadgets/resources/*',
array('module' => 'gadgets', 'action' => 'resources')
),
'gadgets_js' => new sfRoute(
'/gadgets/js/*',
array('module' => 'gadgets', 'action' => 'js')
Expand Down
Loading

0 comments on commit 91f66d4

Please sign in to comment.