moving old dependencies to composer, related to #684

NatLibFi · Jan 12, 2018 · 20a21fa · 20a21fa
1 parent fa60727
commit 20a21fa
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 29 deletions.
diff --git a/composer.json b/composer.json
@@ -35,6 +35,7 @@
     "components/handlebars.js": "v4.0.11",
     "davidstutz/bootstrap-multiselect": "v0.9.13",
     "easyrdf/easyrdf": "0.10.0-alpha.1",
+    "etdsolutions/waypoints": "4.0.0",
     "twig/twig": "2.4.*",
     "twig/extensions": "1.5.*",
     "twitter/bootstrap": "3.3.*",
@@ -45,7 +46,9 @@
     "ml/json-ld": "1.*",
     "medialize/uri.js": "1.19.0",
     "ext-gettext": "*",
-    "monolog/monolog": "1.23.*"
+    "monolog/monolog": "1.23.*",
+    "newerton/jquery-mousewheel": "dev-master",
+    "grimmlink/qtip2": "3.0.3"
   },
   "require-dev": {
     "phpunit/phpunit": "4.8 - 6.5.5",

diff --git a/resource/js/jquery.mousewheel.min.js b/resource/js/jquery.mousewheel.min.js
diff --git a/resource/js/jquery.qtip.min.js b/resource/js/jquery.qtip.min.js
diff --git a/resource/js/waypoints.min.js b/resource/js/waypoints.min.js
diff --git a/view/scripts.twig b/view/scripts.twig
@@ -34,14 +34,14 @@ var showNotation = {% if request.vocab and request.vocab.config.showNotation ==
 <script type="text/javascript" src="vendor/twitter/typeahead.js/dist/typeahead.bundle.min.js"></script>
 <script type="text/javascript" src="vendor/medialize/uri.js/src/URI.min.js"></script>
 <script type="text/javascript" src="vendor/davidstutz/bootstrap-multiselect/dist/js/bootstrap-multiselect.js"></script>
-<script type="text/javascript" src="resource/js/waypoints.min.js"></script>
+<script type="text/javascript" src="vendor/twitter/bootstrap/dist/js/bootstrap.js"></script>
+<script type="text/javascript" src="vendor/grimmlink/qtip2/dist/jquery.qtip.min.js"></script>
+<script type="text/javascript" src="vendor/etdsolutions/waypoints/jquery.waypoints.min.js"></script>
+<script type="text/javascript" src="vendor/newerton/jquery-mousewheel/jquery.mousewheel.min.js"></script>
 <script type="text/javascript" src="resource/js/config.js"></script>
 <script type="text/javascript" src="resource/js/hierarchy.js"></script>
 <script type="text/javascript" src="resource/js/groups.js"></script>
-<script type="text/javascript" src="vendor/twitter/bootstrap/dist/js/bootstrap.js"></script>
-<script type="text/javascript" src="resource/js/jquery.mousewheel.min.js"></script>
 <script type="text/javascript" src="resource/js/jquery.mCustomScrollbar.min.js"></script>
-<script type="text/javascript" src="resource/js/jquery.qtip.min.js"></script>
 <script type="text/javascript" src="resource/js/lscache.min.js"></script>
 <script type="text/javascript" src="resource/js/scripts.js"></script>
 {% for files in request.plugins.pluginsJS %}{% for file in files %}<script type="text/javascript" src="{{ file }}"></script>{% endfor %}{% endfor %}