From 86b4e8305435d4b2f174c992b8c7dfadf08c8a32 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Tue, 26 Nov 2013 14:42:08 +0100
Subject: [PATCH] Fix #1590 IE popup Error message: "A script on this page is
 causing Internet Explorer to run slowly"

---
 bower.json                                       | 2 +-
 templates/web/common/index_bootstrap.html.twig   | 2 +-
 templates/web/login/layout/base-layout.html.twig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bower.json b/bower.json
index e7c108c0c8..f32f9c81ef 100644
--- a/bower.json
+++ b/bower.json
@@ -9,7 +9,7 @@
     "underscore": "~1.4.4",
     "modernizr": "~2.6.2",
     "normalize-css" : "~2.1.0",
-    "json3" : "3.2.4",
+    "json2" : "latest",
     "humane-js": "~3.0.6",
     "qunit": "https://github.com/jquery/qunit.git#1.11.0",
     "jquery-file-upload": "~8.3.2",
diff --git a/templates/web/common/index_bootstrap.html.twig b/templates/web/common/index_bootstrap.html.twig
index e27232ceb0..e82a695c61 100644
--- a/templates/web/common/index_bootstrap.html.twig
+++ b/templates/web/common/index_bootstrap.html.twig
@@ -12,7 +12,7 @@
 
         <!--[if lte IE 8]>
             <link rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/font-awesome/css/font-awesome-ie7.min.css' }) }}">
-            <script type="text/javascript" src="{{ path('minifier', {'f' : 'assets/json3/lib/json3.js'}) }}"></script>
+            <script type="text/javascript" src="{{ path('minifier', {'f' : 'assets/json2/json2.js'}) }}"></script>
         <![endif]-->
 
         <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig
index bacdf737f7..91add9e4a7 100644
--- a/templates/web/login/layout/base-layout.html.twig
+++ b/templates/web/login/layout/base-layout.html.twig
@@ -36,7 +36,7 @@
 
             {% block header_javascript %}
                  <!--[if lte IE 8]>
-                    <script type="text/javascript" src="{{ path('minifier', {'f' : 'assets/json3/lib/json3.js'}) }}"></script>
+                    <script type="text/javascript" src="{{ path('minifier', {'f' : 'assets/json2/json2.js'}) }}"></script>
                 <![endif]-->
 
                 {# include backbone templates #}