diff options
| author | Greg Roach <fisharebest@gmail.com> | 2015-05-09 20:56:03 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2015-05-09 20:56:03 +0100 |
| commit | 0c0f527d949c06dae66d6f398f72b15b6e430e69 (patch) | |
| tree | 8b8f0b87b7f399c5cdcc0f5e999d0abbf7c4c7ea /app/Controller/PageController.php | |
| parent | 1c1848716cf6edcbf6a072486acd68ba101e0ce6 (diff) | |
| download | webtrees-0c0f527d949c06dae66d6f398f72b15b6e430e69.tar.gz webtrees-0c0f527d949c06dae66d6f398f72b15b6e430e69.tar.bz2 webtrees-0c0f527d949c06dae66d6f398f72b15b6e430e69.zip | |
Use jQuery2 for modern browsers
Diffstat (limited to 'app/Controller/PageController.php')
| -rw-r--r-- | app/Controller/PageController.php | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/app/Controller/PageController.php b/app/Controller/PageController.php index 78f8377b0a..8ad5072f9d 100644 --- a/app/Controller/PageController.php +++ b/app/Controller/PageController.php @@ -33,18 +33,6 @@ class PageController extends BaseController { private $popup; /** - * Startup activity - */ - public function __construct() { - parent::__construct(); - // Every page uses these scripts - $this - ->addExternalJavascript(WT_JQUERY_JS_URL) - ->addExternalJavascript(WT_JQUERYUI_JS_URL) - ->addExternalJavascript(WT_WEBTREES_JS_URL); - } - - /** * What should this page show in the browser’s title bar? * * @param string $page_title @@ -134,6 +122,10 @@ class PageController extends BaseController { public function pageFooter() { echo Theme::theme()->footerContainer() . + '<!--[if lt IE 9]><script src="' . WT_JQUERY_JS_URL . '"></script><![endif]-->' . + '<!--[if gte IE 9]><!--><script src="' . WT_JQUERY2_JS_URL . '"></script><!--<![endif]-->' . + '<script src="' . WT_JQUERYUI_JS_URL . '">"</script>' . + '<script src="' . WT_WEBTREES_JS_URL . '">"</script>' . $this->getJavascript() . Theme::theme()->hookFooterExtraJavascript() . (WT_DEBUG_SQL ? Database::getQueryLog() : '') . @@ -154,6 +146,10 @@ class PageController extends BaseController { public function pageFooterPopupWindow() { echo Theme::theme()->footerContainerPopupWindow() . + '<!--[if lt IE 9]><script src="' . WT_JQUERY_JS_URL . '"></script><![endif]-->' . + '<!--[if gte IE 9]><!--><script src="' . WT_JQUERY2_JS_URL . '"></script><!--<![endif]-->' . + '<script src="' . WT_JQUERYUI_JS_URL . '">"</script>' . + '<script src="' . WT_WEBTREES_JS_URL . '">"</script>' . $this->getJavascript() . Theme::theme()->hookFooterExtraJavascript() . (WT_DEBUG_SQL ? Database::getQueryLog() : '') . |