Merge branch 'feature/addon-oembed' into develop

This commit is contained in:
bnu 2014-01-16 13:05:50 +09:00
commit 792712d52f
3 changed files with 1145 additions and 791 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

View file

@ -8,6 +8,7 @@ if(!defined('__XE__'))
if($called_position == 'after_module_proc' && Context::getResponseMethod() == 'HTML')
{
Context::loadFile('./addons/oembed/jquery.oembed.css');
Context::loadFile(array('./addons/oembed/jquery.oembed.js', 'body', '', null), true);
Context::loadFile(array('./addons/oembed/oembed.js', 'body', '', null), true);
}