Skip to content

Commit

Permalink
Adding default-passive-events which hides some unhelpful Javascript
Browse files Browse the repository at this point in the history
console warnings from angular-material.
Described here: angular/components#4221
We are using https://github.com/angular/material/ (the AngularJS 1.x version)
for My Publications.

Updating AngularJS dependency versions slightly.
  • Loading branch information
wettenhj committed Aug 5, 2018
1 parent eccec4f commit 08579b0
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
5 changes: 5 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"backbone-forms": "^0.10.0",
"blueimp-file-upload": "^9.22.0",
"clipboard": "^1.5.10",
"default-passive-events": "^1.0.10",
"jquery": "^3.3.1",
"jquery-migrate": "^3.0.1",
"jquery-ui-dist": "^1.12.1",
Expand Down
21 changes: 10 additions & 11 deletions tardis/apps/publication_workflow/templates/my_publications.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,17 @@

{% block content %}

{% verbatim %}

<script type="text/javascript">
var use_figshare = '{{ use_figshare }}' === 'True';
var figshare_url = '{{ figshare_url }}';
var figshare_categories_json = '{{ figshare_categories_json }}';
</script>
<script type="text/javascript" src="{% static 'my-publications/my_publications.js'%}"></script>
<script type="text/javascript" src="{% static 'publication-actions/publication_actions.js'%}"></script>
<script type="text/javascript" src="{% static 'publication-tokens/publication_tokens.js'%}"></script>
<script type="text/javascript" src="{% static 'publication-form/publication_form.js'%}"></script>
<script type="text/javascript" src="{% static 'default-passive-events/dist/index.js'%}"></script>

<script type="text/javascript" src="/static/my-publications/my_publications.js"></script>
<script type="text/javascript" src="/static/publication-actions/publication_actions.js"></script>
<script type="text/javascript" src="/static/publication-tokens/publication_tokens.js"></script>
<script type="text/javascript" src="/static/publication-form/publication_form.js"></script>
{% comment %}
Verbatim tells Django to stop interpreting {{ }} as Django template variables,
and leave them to be interpreted by AngularJS instead.
{% endcomment %}
{% verbatim %}

<div id="content" ng-controller="MyPublicationsController as myPubsCtrl">
<div class="row-fluid">
Expand Down
1 change: 1 addition & 0 deletions tardis/default_settings/static_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'backbone-forms': ['*'],
'blueimp-file-upload': ['*'],
'clipboard': ['*'],
'default-passive-events': ['dist/index.js'],
'jquery': ['*'],
'jquery-migrate': ['*'],
'jquery-ui-dist': ['jquery-ui.min.js'],
Expand Down

0 comments on commit 08579b0

Please sign in to comment.