From 83bfeedc638d1bc27641b42b63be968e52d9cd5e Mon Sep 17 00:00:00 2001 From: Brandon Stull Date: Mon, 20 Feb 2017 16:35:49 -0500 Subject: [PATCH 1/2] #985 Necessary JS is now present on the LTI embed success page to handle the sitewide alert properly. --- fuel/app/modules/lti/classes/controller/lti.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fuel/app/modules/lti/classes/controller/lti.php b/fuel/app/modules/lti/classes/controller/lti.php index e8c620546..ec05ed1b7 100644 --- a/fuel/app/modules/lti/classes/controller/lti.php +++ b/fuel/app/modules/lti/classes/controller/lti.php @@ -87,6 +87,10 @@ public function action_success($inst_id) $this->insert_analytics(); + \Js::push_group(['angular', 'ng_modal', 'materia']); + \Js::push_inline('var BASE_URL = "'.\Uri::base().'";'); + \Js::push_inline('var STATIC_CROSSDOMAIN = "'.\Config::get('materia.urls.static_crossdomain').'";'); + \Css::push_group('lti'); return \Response::forge($this->theme->render()); From 7403e2d295b3a1c0ffa824412bfc7f08cd83710c Mon Sep 17 00:00:00 2001 From: Brandon Stull Date: Tue, 21 Feb 2017 10:29:49 -0500 Subject: [PATCH 2/2] #985 Added fix to LTI error controller, as well. --- fuel/app/modules/lti/classes/controller/error.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fuel/app/modules/lti/classes/controller/error.php b/fuel/app/modules/lti/classes/controller/error.php index dd94717ef..4efdef252 100644 --- a/fuel/app/modules/lti/classes/controller/error.php +++ b/fuel/app/modules/lti/classes/controller/error.php @@ -32,7 +32,10 @@ public function after($response) \Js::push_inline($this->theme->view('partials/google_analytics', array('id' => $gid))); } - \Js::push_group('core'); + \Js::push_group(['core', 'angular', 'ng_modal', 'materia']); + \Js::push_inline('var BASE_URL = "'.\Uri::base().'";'); + \Js::push_inline('var STATIC_CROSSDOMAIN = "'.\Config::get('materia.urls.static_crossdomain').'";'); + \Css::push_group('lti'); return \Response::forge(\Theme::instance()->render());