Only enable 'show and mark mines' when the game is still in progress
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Mon, 21 Jul 2014 15:05:22 +0200
changeset 1761e482b09b814
parent 175 d39729fe7b76
child 177 fce7972a0078
Only enable 'show and mark mines' when the game is still in progress
minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java
minesweeper/src/main/webapp/pages/index.html
     1.1 --- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Sat Jul 19 17:46:12 2014 +0200
     1.2 +++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Mon Jul 21 15:05:22 2014 +0200
     1.3 @@ -88,6 +88,10 @@
     1.4          return state != null;
     1.5      }
     1.6      
     1.7 +    @ComputedProperty static boolean gameInProgress(GameState state) {
     1.8 +        return state == GameState.IN_PROGRESS;
     1.9 +    }
    1.10 +    
    1.11      @Function static void showHelp(Mines model) {
    1.12          model.setState(null);
    1.13      }
     2.1 --- a/minesweeper/src/main/webapp/pages/index.html	Sat Jul 19 17:46:12 2014 +0200
     2.2 +++ b/minesweeper/src/main/webapp/pages/index.html	Mon Jul 21 15:05:22 2014 +0200
     2.3 @@ -60,11 +60,11 @@
     2.4                      <span>&#x21bb;</span>
     2.5                      <span class="hidden-phone">New Game!</span>
     2.6                  </button>
     2.7 -                <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: !fieldShowing(), click: giveUp ">
     2.8 +                <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: !gameInProgress(), click: giveUp ">
     2.9                      <span>&#x2717;</span>
    2.10                      <span class="hidden-phone">Show Mines!</span>
    2.11                  </button>
    2.12 -                <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: !fieldShowing(), click: markMine">
    2.13 +                <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: !gameInProgress(), click: markMine">
    2.14                      <span>&#x26A0;</span>
    2.15                      <span class="hidden-phone">Mark Mine!</span>
    2.16                  </button>