hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1590 IE popup Error message: "A script on this page is causing Internet Explorer to run slowly"

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-11-26 14:42:08 +01:00
parent b98c321c0c
commit 86b4e83054
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@@ -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",

2
templates/web/common/index_bootstrap.html.twig
View File

@@ -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>

2
templates/web/login/layout/base-layout.html.twig
View File

@@ -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 #}