From a5f09112dcba45c7464fdff9525720748e786ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Sat, 21 Apr 2018 12:51:27 +0200 Subject: [PATCH] Fix mobile navigation js error --- package-lock.json | 14 +++++++------- package.json | 16 ++++++++-------- .../ep_theme/Resources/Private/Assets/js/app.js | 4 +++- .../Resources/Private/Assets/scss/main.scss | 2 +- .../Private/Assets/scss/main_boarderweek.scss | 2 +- .../Private/Assets/scss/main_snowzone.scss | 2 +- .../Private/Assets/scss/main_unichamp.scss | 2 +- .../Resources/Private/Partials/Mainnav.html | 2 +- webpack.config.js | 2 +- 9 files changed, 24 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3e193dad..3cb889d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1318,10 +1318,10 @@ "hoek": "2.16.3" } }, - "bootstrap": { + "bootstrap-sass": { "version": "3.3.7", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz", - "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E=" + "resolved": "https://registry.npmjs.org/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz", + "integrity": "sha1-ZZbHq0D2Y3OTMjqwvIDQZPxjBJg=" }, "bourbon": { "version": "4.3.4", @@ -5265,16 +5265,16 @@ "dev": true }, "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz", + "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=" }, "jquery-lazy": { "version": "1.7.7", "resolved": "https://registry.npmjs.org/jquery-lazy/-/jquery-lazy-1.7.7.tgz", "integrity": "sha512-XPPWWMMQ0QPpjv2psFVOT2phmwSCwMQ9G+3QPpnOBFd7mVCnrfqoNKjZgbfKNo+Ely0q3bPCquRMTf99qqn5Dw==", "requires": { - "jquery": "3.3.1" + "jquery": "2.2.4" } }, "js-base64": { diff --git a/package.json b/package.json index f4481ef3..e21659ce 100644 --- a/package.json +++ b/package.json @@ -10,23 +10,23 @@ "build": "./node_modules/.bin/encore production" }, "dependencies": { + "@fancyapps/fancybox": "^3.2.5", "@fengyuanchen/datepicker": "^0.6.4", + "bootstrap-sass": "^3.3.7", "bourbon": "^4.3.2", "cookieconsent": "^3.0.4", - "jquery": "^3.2.1", + "font-awesome": "^4.7.0", + "iframe-resizer": "^3.5.5", + "jquery": "^2.2.4", "jquery-lazy": "^1.7.4", + "moment": "^2.19.4", "normalize.css": "^7.0.0", + "picturefill": "^3.0.2", "sass-mq": "^3.3.2", "slick-carousel": "^1.8.0", "sticky-js": "^1.2.0", "vue": "^2.5.11", - "vue-session": "^0.9.10", - "@fancyapps/fancybox": "^3.2.5", - "bootstrap": "^3.3.7", - "font-awesome": "^4.7.0", - "iframe-resizer": "^3.5.5", - "moment": "^2.19.4", - "picturefill": "^3.0.2" + "vue-session": "^0.9.10" }, "devDependencies": { "@symfony/webpack-encore": "^0.19.0", diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/app.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/app.js index 960dbaf6..debc43f9 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/app.js +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/app.js @@ -23,10 +23,12 @@ import $ from 'jquery' import moment from 'moment' import fancybox from '@fancyapps/fancybox' +global.$ = global.jQuery = $; + require('cookieconsent'); require('slick-carousel'); require('jquery-lazy'); -require('bootstrap/dist/js/bootstrap'); +require('bootstrap-sass/assets/javascripts/bootstrap'); require('picturefill'); require('@fancyapps/fancybox/dist/jquery.fancybox.css'); diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss index 431fd3e2..7a523a14 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss @@ -1,5 +1,5 @@ // vendor styles -@import "~bootstrap/dist/css/bootstrap.min.css"; +@import "~bootstrap-sass/assets/stylesheets/bootstrap"; @import "~cookieconsent/build/cookieconsent.min.css"; @import "mixins"; diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_boarderweek.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_boarderweek.scss index de9e5e70..4e855c9c 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_boarderweek.scss +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_boarderweek.scss @@ -1,5 +1,5 @@ // vendor styles -@import "~bootstrap/dist/css/bootstrap.min.css"; +@import "~bootstrap-sass/assets/stylesheets/bootstrap"; @import "~cookieconsent/build/cookieconsent.min.css"; @import "mixins"; diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_snowzone.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_snowzone.scss index eb868ced..f8873697 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_snowzone.scss +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_snowzone.scss @@ -1,5 +1,5 @@ // vendor styles -@import "~bootstrap/dist/css/bootstrap.min.css"; +@import "~bootstrap-sass/assets/stylesheets/bootstrap"; @import "~cookieconsent/build/cookieconsent.min.css"; @import "mixins"; diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_unichamp.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_unichamp.scss index 22e568fd..1d779b72 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_unichamp.scss +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_unichamp.scss @@ -1,5 +1,5 @@ // vendor styles -@import "~bootstrap/dist/css/bootstrap.min.css"; +@import "~bootstrap-sass/assets/stylesheets/bootstrap"; @import "~cookieconsent/build/cookieconsent.min.css"; @import "mixins"; diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html index 7edb84cc..2646c01a 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html @@ -59,7 +59,7 @@ diff --git a/webpack.config.js b/webpack.config.js index e9520a18..67fbe91d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -11,7 +11,7 @@ Encore .addStyleEntry('unichamp', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_unichamp.scss') .addStyleEntry('rte', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/css/rte.css') .createSharedEntry('vendor', [ - 'jquery', 'vue', 'bootstrap/dist/js/bootstrap', 'slick-carousel', + 'jquery', 'vue', 'bootstrap-sass/assets/javascripts/bootstrap', 'slick-carousel', 'moment', 'cookieconsent', 'picturefill', '@fancyapps/fancybox' ]) .addPlugin(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))