Commit 12f1d183 authored by Boris A. Burkov's avatar Boris A. Burkov
Browse files

#377 Moved genoverse scripts into compressor.

parent 941057c6
......@@ -155,6 +155,15 @@ limitations under the License.
<script src="{% static "node_modules/angularjs-slider/dist/rzslider.js" %}"></script>
<!-- warning, feature-viewer.bundle.js includes jquery, so it breaks slick and everything else -->
<script src="{% static "node_modules/@burkov/feature-viewer/src/feature-viewer.js" %}"></script>
<!-- Genoverse bundle contains jquery, avoid conflict with our jquery - let Genoverse go first -->
<script src="{% static "node_modules/@burkov/genoverse/dist/js/genoverse.concat.nodeps.js" %}"></script>
<script src="{% static "node_modules/jquery-ui-bundle/jquery-ui.js" %}"></script>
<script src="{% static "node_modules/jquery.mousehold/jquery.mousehold.js" %}"></script>
<script src="{% static "node_modules/jquery.mousewheel/jquery.mousewheel.js" %}"></script>
<script src="{% static "node_modules/tipsy-1a/src/javascripts/jquery.tipsy.js" %}"></script>
<!-- New genoverse contains tooltip from jquery ui, it conflicts with bootstrap - bridge it! -->
<!-- Bridge doesn't work now
<!-- <script>$.widget.bridge('uitooltip', $.ui.tooltip);</script> -->
<script src="{% static "js/d3/d3.ExpertDatabaseSequenceDistribution.js" %}"></script>
<script src="{% static "js/d3/d3.speciesSunburst.js" %}"></script>
......@@ -188,6 +197,11 @@ limitations under the License.
<script src="{% static "js/components/sequence-search/nhmmer.sequence.search.js" %}"></script>
<script src="{% static "js/components/genome-browser/genome-browser.module.js" %}"></script>
<script src="{% static "js/components/genome-browser/genoverse-utils.service.js" %}"></script>
<script src="{% static "js/components/genome-browser/genome-browser.controller.js" %}"></script>
<script src="{% static "js/components/genome-browser/genoverse.component.js" %}"></script>
<script src="{% static "js/components/text-search/text-search.module.js" %}"></script>
<script src="{% static "js/components/text-search/text-search.service.js" %}"></script>
<script src="{% static "js/components/text-search/sanitize.filter.js" %}"></script>
......@@ -201,23 +215,6 @@ limitations under the License.
{% endblock extra_js %}
{% endcompress %}
<!-- import genoverse plugin or angularjs-genoverse directive OUTSIDE (!) compress block -->
<!-- Genoverse bundle contains jquery, avoid conflict with our jquery - let Genoverse go first -->
<script src="{% static "node_modules/@burkov/genoverse/dist/js/genoverse.concat.nodeps.js" %}"></script>
<script src="{% static "node_modules/jquery-ui-bundle/jquery-ui.js" %}"></script>
<script src="{% static "node_modules/jquery.mousehold/jquery.mousehold.js" %}"></script>
<script src="{% static "node_modules/jquery.mousewheel/jquery.mousewheel.js" %}"></script>
<script src="{% static "node_modules/tipsy-1a/src/javascripts/jquery.tipsy.js" %}"></script>
<!-- New genoverse contains tooltip from jquery ui, it conflicts with bootstrap - bridge it! -->
<!-- Bridge doesn't work now
<!-- <script>$.widget.bridge('uitooltip', $.ui.tooltip);</script> -->
<!-- Angular parts of Genoverse outside compress block -->
<script src="{% static "js/components/genome-browser/genome-browser.module.js" %}"></script>
<script src="{% static "js/components/genome-browser/genoverse-utils.service.js" %}"></script>
<script src="{% static "js/components/genome-browser/genome-browser.controller.js" %}"></script>
<script src="{% static "js/components/genome-browser/genoverse.component.js" %}"></script>
<!-- bootstrap conflicts with jquery-ui tooltip, so it should go after datatables and genoverse -->
<script src="{% static "node_modules/bootstrap/dist/js/bootstrap.js" %}"></script>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment