EBernhardson has submitted this change and it was merged.
Change subject: Hide deck when empty
......................................................................
Hide deck when empty
This adds a css class that gets added/removed to the main deck of cards
when it is empty. I'm not sure what to do about the cards in the
"discard" pile though, it's not particularly obvious that there are
multiple cards there ... i dunno.
Change-Id: I2a205df330780365f9e513e09791816acaaec2ea
---
M public/css/deck.css
M public/js/discernadeck.js
2 files changed, 19 insertions(+), 2 deletions(-)
Approvals:
EBernhardson: Verified; Looks good to me, approved
diff --git a/public/css/deck.css b/public/css/deck.css
index 3e4fc15..e10940b 100644
--- a/public/css/deck.css
+++ b/public/css/deck.css
@@ -107,6 +107,10 @@
cursor: pointer;
}
+.card-deck.empty {
+ background-image: none;
+}
+
.card.active {
z-index: 1111 !important;
box-shadow: 0 4px 5px 0px rgba(0,0,0,0.15);
diff --git a/public/js/discernadeck.js b/public/js/discernadeck.js
index f374665..232ee43 100644
--- a/public/js/discernadeck.js
+++ b/public/js/discernadeck.js
@@ -37,7 +37,7 @@
card.setCardXY( stackXY.x, stackXY.y + stack.gap - ((
reverseIndex - 1) * stack.DROP_GAP ));
}
},
- onTap: function tapOnDropArea( stack ) {
+ onTap: function ( stack ) {
return function( ev ) {
if ( stack.deck.currentCard ) {
stack.deck.currentCard.moveCardToStack( false,
stack );
@@ -136,14 +136,23 @@
if ( droppedArea ) {
card.moveCardToStack( card.stack,
droppedArea.stack );
} else {
+
// jump back to deck
if ( card.stack ) {
card.stack.removeCard();
card.stack = false;
}
+ if ( deck.currentCard ) {
+ deck.moveCardToBottom();
+ }
+ deck.currentCard = card;
+ deck.cardsInDeck.unshift(card.cardData);
card.setCardXY( 0, 0 );
TweenLite.to( card.domEl, 0.8,{ x:"0", y:"0",
ease:Elastic.easeOut } );
- this.formEl.value = "";
+ card.formEl.value = "";
+ if (deck.cardsInDeck.length > 1) {
+ deck.domEl.classList.remove( 'empty' );
+ }
}
}
},
@@ -218,6 +227,10 @@
var card = deck.createCard(deck, 0);
deck.currentCard = card;
}
+ if ( deck.cardsInDeck.length <= 1 ) {
+ deck.domEl.classList.add( 'empty' );
+ }
+
}
},
removeFromDeck: function( card ) {
--
To view, visit https://gerrit.wikimedia.org/r/310173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a205df330780365f9e513e09791816acaaec2ea
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/discovery/discernatron
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
