Skip to content

Commit

Permalink
[#2618] Goodbye html5shim block in stats extension
Browse files Browse the repository at this point in the history
  • Loading branch information
tobes committed Aug 16, 2012
1 parent da13d17 commit 6ab4ea0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
1 change: 1 addition & 0 deletions ckan/lib/helpers.py
Expand Up @@ -1113,6 +1113,7 @@ def remove_url_param(key, value=None, replace=None, controller=None,
action=action, extras=extras)

def include_resource(resource):
print '###', resource
r = getattr(html_resources, resource)
r.need()

Expand Down
15 changes: 6 additions & 9 deletions ckanext/stats/templates/ckanext/stats/index.html
@@ -1,14 +1,5 @@
{% extends "page.html" %}

{%- block html5shim -%}
{#
Hellish hack to get excanvas to work in IE8. We disable html5shiv from
overriding the createElement() method on this page.
See: http://stackoverflow.com/questions/10208062/using-flot-with-bootstrap-ie8-incompatibility
#}
<!--[if lte IE 8 ]><script>var html5 = {shivMethods: false};</script><![endif]-->
{{ super() }}
{%- endblock -%}

{% block styles %}
{{ super() }}
Expand Down Expand Up @@ -208,4 +199,10 @@ <h2 class="module-heading"><i class="icon-bar-chart icon-medium"></i> {{ _('Stat
<script src="{% url_for_static "/ckanext/stats/vendor/jquery.flot.js" %}"></script>
<script src="{% url_for_static "/ckanext/stats/javascript/modules/plot.js" %}"></script>
<script src="{% url_for_static "/ckanext/stats/javascript/modules/stats-nav.js" %}"></script>
{#
Hellish hack to get excanvas to work in IE8. We disable html5shiv from
overriding the createElement() method on this page.
See: http://stackoverflow.com/questions/10208062/using-flot-with-bootstrap-ie8-incompatibility
#}
{% resource "vendor/block_html5_shim" %}
{% endblock %}

0 comments on commit 6ab4ea0

Please sign in to comment.