Fix

etienne-dldc · Nov 4, 2018 · 0bf290d · 0bf290d
1 parent c56a322
commit 0bf290d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "gulp-util": "^3.0.7",
     "gulp-webpack": "^1.5.0",
     "jade": "^1.11.0",
-    "lodash": "^3.10.1",
+    "lodash": ">=4.17.5",
     "node-sass": "^3.4.2",
     "require-dir": "^0.3.0",
     "run-sequence": "^1.1.5",

diff --git a/src/app.vue b/src/app.vue
@@ -172,6 +172,7 @@ export default {
     },
     playSound() {
       this.sound = true;
+      this.music.pause();
       this.music.play();
       this.$broadcast('sound-status', this.sound);
     },

diff --git a/src/components/Intro.vue b/src/components/Intro.vue
@@ -102,7 +102,7 @@
       </video>
     </div>
     <p @click="skipIntro" class="skip-intro">Passer l'intro</p>
-    <p v-if="!playing" @click="playIntro" class="play-intro">Play Intro</p>
+    <p v-if="!playing" @click="playIntro" class="play-intro">Lancer l'intro</p>
   </div>
 </template>
 

diff --git a/yarn.lock b/yarn.lock
@@ -3185,6 +3185,7 @@ jade@^1.11.0:
     jstransformer "0.0.2"
     mkdirp "~0.5.0"
     transformers "2.1.0"
+    uglify-js "^2.4.19"
     void-elements "~2.0.1"
     with "~4.0.0"
 
@@ -3646,6 +3647,11 @@ lodash.words@^3.0.0:
   dependencies:
     lodash._root "^3.0.0"
 
+lodash@>=4.17.5:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+
 lodash@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"