diff --git a/src/assets/font/icomoon.eot b/src/assets/font/icomoon.eot old mode 100755 new mode 100644 index 193a1c0..18f8871 Binary files a/src/assets/font/icomoon.eot and b/src/assets/font/icomoon.eot differ diff --git a/src/assets/font/icomoon.svg b/src/assets/font/icomoon.svg old mode 100755 new mode 100644 index 0ccc1e2..30a7cac --- a/src/assets/font/icomoon.svg +++ b/src/assets/font/icomoon.svg @@ -6,8 +6,10 @@ - - - - + + + + + + \ No newline at end of file diff --git a/src/assets/font/icomoon.ttf b/src/assets/font/icomoon.ttf old mode 100755 new mode 100644 index fad4a33..71872e6 Binary files a/src/assets/font/icomoon.ttf and b/src/assets/font/icomoon.ttf differ diff --git a/src/assets/font/icomoon.woff b/src/assets/font/icomoon.woff old mode 100755 new mode 100644 index 2984ac0..3cc8af8 Binary files a/src/assets/font/icomoon.woff and b/src/assets/font/icomoon.woff differ diff --git a/src/creator.scss b/src/creator.scss index c4c6be2..1cfa0b3 100644 --- a/src/creator.scss +++ b/src/creator.scss @@ -158,7 +158,7 @@ body { content: ' '; } &:after { - content: "\e600"; + content: "\e984"; font-family: 'icomoon'; position:absolute; top: 50%; @@ -221,11 +221,11 @@ h1 { } .icon-spinner2:before { - content: "\e600"; + content: "\e984"; } .icon-close { &:before { - content: "\e602"; + content: "\ea0f"; font-size: 20px; } @@ -237,7 +237,7 @@ h1 { } } .icon-plus:before { - content: "\e601"; + content: "\ea0a"; } div.criticism { @@ -608,4 +608,4 @@ input[type=checkbox]:checked + label.checktoggle { 100% { transform: translate(0px,0px); } -} \ No newline at end of file +} diff --git a/src/player.coffee b/src/player.coffee index ebbd778..6bc8149 100644 --- a/src/player.coffee +++ b/src/player.coffee @@ -84,12 +84,10 @@ Namespace('WordSearch').Engine = do -> document.getElementById('intro-instructions').addEventListener 'keypress', -> _showKeyboardInstructions() - document.getElementById('tutorial-dismiss').focus() + document.getElementById('instructions-dismiss').focus() document.getElementById('intro-instructions').addEventListener 'click', _showKeyboardInstructions - document.getElementById('intro-dismiss').addEventListener 'keypress', (e) -> - e.preventDefault() - e.stopPropagation() + document.getElementById('intro-dismiss').addEventListener 'keypress', -> _introDismissed = true _makeBoardUsable() # questionable timeout to avoid this keypress being picked up by the board after it receives focus @@ -97,20 +95,31 @@ Namespace('WordSearch').Engine = do -> document.getElementById('board').focus() ), 100 - document.getElementById('intro-dismiss').addEventListener 'click', () -> + document.getElementById('intro-dismiss').addEventListener 'click', -> _introDismissed = true _makeBoardUsable() - document.getElementById('tutorial-dismiss').addEventListener 'keypress', (e) -> - e.preventDefault() - e.stopPropagation() + document.getElementById('instructions-dismiss').addEventListener 'keypress', -> _hideKeyboardInstructions() - document.getElementById('intro-instructions').focus() + if _introDismissed + document.getElementById('show-instructions').focus() + else + document.getElementById('intro-instructions').focus() - document.getElementById('tutorial-dismiss').addEventListener 'click', _hideKeyboardInstructions + document.getElementById('instructions-dismiss').addEventListener 'click', _hideKeyboardInstructions document.getElementById('board').addEventListener 'keyup', _handleBoardKeyupEvent + document.getElementById('show-intro').addEventListener 'keypress', -> + _showIntro() + document.getElementById('intro-instructions').focus() + document.getElementById('show-intro').addEventListener 'click', _showIntro + + document.getElementById('show-instructions').addEventListener 'keypress', -> + _showKeyboardInstructions() + document.getElementById('instructions-dismiss').focus() + document.getElementById('show-instructions').addEventListener 'click', _showKeyboardInstructions + document.getElementById('checkbtn').addEventListener 'click', _confirmDone document.getElementById('checkbtn').addEventListener 'keyup', _doneButtonKeyupEvent @@ -123,19 +132,24 @@ Namespace('WordSearch').Engine = do -> # once everything is drawn, set the height of the player Materia.Engine.setHeight() + _showIntro = -> + _introDismissed = false + _showbyId 'intro' + _showKeyboardInstructions = -> - document.getElementById('tutorial').removeAttribute('inert') - document.getElementById('tutorial').classList.add 'show' + # document.getElementById('instructions').removeAttribute('inert') + # document.getElementById('instructions').classList.add 'show' + _showbyId 'instructions' # this isn't strictly necessary but doing it every time doesn't hurt document.getElementById('intro').setAttribute('inert', 'true') _hideKeyboardInstructions = -> if _introDismissed - _makeBoardUsable + _makeBoardUsable() else document.getElementById('intro').removeAttribute 'inert' - _hideById 'tutorial' + _hideById 'instructions' # show confirmation menu and autofocus the cancel button _doneButtonKeyupEvent = (e) -> @@ -302,10 +316,10 @@ Namespace('WordSearch').Engine = do -> # show the "are you done" warning _confirmDone = -> - document.getElementById('game').setAttribute('inert', 'true') _showbyId 'confirm' _showbyId = (targetId) -> + document.getElementById('game').setAttribute('inert', 'true') document.getElementById(targetId).removeAttribute 'inert' document.getElementById(targetId).classList.add 'show' document.getElementById('backgroundcover').classList.add 'show' @@ -315,14 +329,14 @@ Namespace('WordSearch').Engine = do -> document.getElementById(targetId).classList.remove 'show' _makeBoardUsable = -> - document.getElementById('game').removeAttribute('inert') - # rather than have multiple functions to do the same thing, inert all the dialogs + # rather than have multiple functions to do the same thing, hide/inert all the dialogs _hideById 'confirm' _hideById 'intro' - _hideById 'tutorial' - + _hideById 'instructions' document.getElementById('backgroundcover').classList.remove 'show' + document.getElementById('game').removeAttribute('inert') + _hideConfirmationDialog = (e) -> _makeBoardUsable() # a keyboard event triggered this, autofocus the 'done' button diff --git a/src/player.html b/src/player.html index 258d622..368b512 100644 --- a/src/player.html +++ b/src/player.html @@ -22,6 +22,14 @@