can't close practice widget in a practice study

Author: ornicar

ui/analyse/src/ctrl.js

@@ -452,7 +452,7 @@ module.exports = function(opts) {
             this.setAutoShapes();
             if (this.retro) this.retro.onCeval();
             if (this.practice) this.practice.onCeval();
-            if (this.study && this.study.practice) this.study.practice.onCeval();
+            if (this.studyPractice) this.studyPractice.onCeval();
             m.redraw();
           }
         }.bind(this));
@@ -634,6 +634,7 @@ module.exports = function(opts) {
   this.startCeval();
   this.explorer.setNode();
   this.study = opts.study ? makeStudy(opts.study, this, (opts.tagTypes || '').split(','), opts.practice) : null;
+  this.studyPractice = this.study ? this.study.practice : null;
 
   this.retro = null;
 

ui/analyse/src/main.js

@@ -22,7 +22,7 @@ module.exports = {
         m.redraw.strategy("diff"); // prevents double full redraw on page load
         return controller.study;
       },
-      view: controller.study.practice ? studyPracticeView.main : studyView.main
+      view: controller.studyPractice ? studyPracticeView.main : studyView.main
     });
 
     return {

ui/analyse/src/practice/practiceView.js

@@ -4,9 +4,9 @@ var opposite = require('chessground').util.opposite;
 function renderTitle(close) {
   return m('div.title', [
     m('span', 'Practice with the computer'),
-    m('span.close[data-icon=L]', {
+    close ? m('span.close[data-icon=L]', {
       onclick: close
-    })
+    }) : null
   ]);
 }
 
@@ -116,7 +116,7 @@ module.exports = function(root) {
   return m('div', {
     class: 'practice_box ' + (comment ? comment.verdict : '')
   }, [
-    renderTitle(root.togglePractice),
+    renderTitle(root.studyPractice ? null : root.togglePractice),
     m('div.feedback', !running ? renderOffTrack(ctrl) : (end ? renderEnd(root, end) : renderRunning(root))),
     running ? m('div.comment', comment ? [
       m('span.verdict', commentText[comment.verdict]),

ui/analyse/src/study/studyView.js

@@ -172,7 +172,7 @@ module.exports = {
   },
 
   underboard: function(ctrl) {
-    if (ctrl.study && ctrl.study.practice) return practiceView.underboard(ctrl.study);
+    if (ctrl.studyPractice) return practiceView.underboard(ctrl.study);
     if (ctrl.embed) return;
     var glyphForm = glyphFormView(ctrl.study.glyphForm);
     var commentForm = commentFormView(ctrl.study.commentForm);

ui/analyse/src/view.js

@@ -173,7 +173,6 @@ function dataAct(e) {
 function buttons(ctrl) {
   var canJumpPrev = ctrl.vm.path !== '';
   var canJumpNext = !!ctrl.vm.node.children[0];
-  var isStudyPractice = ctrl.study && ctrl.study.practice;
   return m('div.game_control', {
     config: bindOnce('mousedown', function(e) {
       var action = dataAct(e);
@@ -186,7 +185,7 @@ function buttons(ctrl) {
       else if (action === 'menu') ctrl.actionMenu.toggle();
     })
   }, [
-    (isStudyPractice || ctrl.embed) ? null : m('div.features', [
+    (ctrl.studyPractice || ctrl.embed) ? null : m('div.features', [
       m('button', {
         'data-hint': ctrl.trans('openingExplorer'),
         'data-act': 'explorer',
@@ -208,7 +207,7 @@ function buttons(ctrl) {
       jumpButton('X', 'next', canJumpNext),
       jumpButton('V', 'last', canJumpNext)
     ]),
-    isStudyPractice ? null : m('button', {
+    ctrl.studyPractice ? null : m('button', {
       class: 'hint--bottom' + (ctrl.actionMenu.open ? ' active' : ''),
       'data-hint': 'Menu',
       'data-act': 'menu'