From b3228243546905857486054df680804f47f9edc6 Mon Sep 17 00:00:00 2001 From: Georg Welzel Date: Fri, 20 Mar 2020 23:06:31 +0100 Subject: [PATCH] add custom deck --- app/js/controllers.js | 8 +++++++- app/partials/room.html | 20 +++++++++++++++----- package.json | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/app/js/controllers.js b/app/js/controllers.js index ec73c91..2b13f69 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -214,7 +214,7 @@ function RoomCtrl($scope, $routeParams, $timeout, socket) { case ('tshirt'): return tshirt; default: - return []; + return val.split(" "); } }; @@ -344,6 +344,7 @@ function RoomCtrl($scope, $routeParams, $timeout, socket) { }; $scope.setCardPack = function (cardPack) { + $scope.showCustom = false; $scope.cardPack = cardPack; $scope.resetVote(); @@ -351,6 +352,10 @@ function RoomCtrl($scope, $routeParams, $timeout, socket) { socket.emit('set card pack', { roomUrl: $scope.roomId, cardPack: cardPack }); }; + $scope.setCustomPack = function () { + $scope.showCustom = true; + } + $scope.vote = function (vote) { if ($scope.myVote !== vote) { if (!votingFinished() && $scope.voter) { @@ -403,6 +408,7 @@ function RoomCtrl($scope, $routeParams, $timeout, socket) { $scope.humanCount = 0; $scope.voterCount = 0; $scope.showAdmin = false; + $scope.showCustom = false; $scope.voter = true; $scope.connections = {}; $scope.votes = []; diff --git a/app/partials/room.html b/app/partials/room.html index 79e6149..3f2ff59 100644 --- a/app/partials/room.html +++ b/app/partials/room.html @@ -21,19 +21,29 @@ + +
-
- {{card}} -
-
- No cards found +
+
+ + +
+
+
+ {{card}} +
+
+ No cards found +
+
diff --git a/package.json b/package.json index d8ccb9a..3523a73 100644 --- a/package.json +++ b/package.json @@ -23,4 +23,4 @@ "devDependencies": { "socket.io-client": "*" } -} \ No newline at end of file +}