From f58e15c8fd9462ad451fbe5eb600acf3fd736f73 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Tue, 3 Feb 2015 13:30:20 -0500
Subject: [PATCH] Move btoa polyfill to theme.config.php.
---
themes/bootstrap3/templates/layout/layout.phtml | 2 --
themes/bootstrap3/theme.config.php | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/themes/bootstrap3/templates/layout/layout.phtml b/themes/bootstrap3/templates/layout/layout.phtml
index 0bd3debc78e..8c985b6e75a 100644
--- a/themes/bootstrap3/templates/layout/layout.phtml
+++ b/themes/bootstrap3/templates/layout/layout.phtml
@@ -23,8 +23,6 @@
<?
// Set global path for Javascript code:
$this->headScript()->prependScript("path = '" . rtrim($this->url('home'), '/') . "';");
- // Polyfill btoa
- $this->headScript()->appendFile('vendor/base64.js', 'text/javascript', array('conditional' => 'lt IE 10'));
// Deal with cart stuff:
if (!isset($this->renderingError)) {
diff --git a/themes/bootstrap3/theme.config.php b/themes/bootstrap3/theme.config.php
index cf4fdd8a261..f6eeeb6817f 100644
--- a/themes/bootstrap3/theme.config.php
+++ b/themes/bootstrap3/theme.config.php
@@ -11,6 +11,7 @@ return array(
'print.css:print',
),
'js' => array(
+ 'vendor/base64.js:lt IE 10', // btoa polyfill
'vendor/jquery.min.js',
'vendor/bootstrap.min.js',
'vendor/bootstrap-accessibility.min.js',
--
GitLab