From 844ef71cdb92215a2f10a15646a6b8881051398e Mon Sep 17 00:00:00 2001 From: Is Isilon Date: Sun, 28 Feb 2016 15:08:19 +0800 Subject: [PATCH] Refactored names --- src/css/style.css | 4 +- src/index.js | 2 +- src/index.webpack | 30 +- src/js/app.js | 34 +- src/js/game.js | 42 +- src/js/ui.js | 2 +- src/json/elements.json | 1063 ---------------------------------- test/unit/controllersSpec.js | 4 +- 8 files changed, 59 insertions(+), 1122 deletions(-) delete mode 100644 src/json/elements.json diff --git a/src/css/style.css b/src/css/style.css index 171dbdc..bc66eae 100644 --- a/src/css/style.css +++ b/src/css/style.css @@ -302,7 +302,7 @@ h1 br { .ui-draggable { cursor: move; } -.element { +.card { font-size: 3em; border: 0px; padding: 1px; @@ -310,7 +310,7 @@ h1 br { min-width: 50px; min-height: 50px; } -.element.empty { +.card.empty { opacity: 0.2; } .white-badge.empty { diff --git a/src/index.js b/src/index.js index 1af95c2..d5de62b 100644 --- a/src/index.js +++ b/src/index.js @@ -15,7 +15,7 @@ require("assets/mobile/icon.png"); require("assets/pc32sw.png"); // json -// var element = require("json/elements.json"); +// var cards = require("json/cards.json"); // var acheivements = require("json/achievements.json"); // deps diff --git a/src/index.webpack b/src/index.webpack index c5dd0cc..087689b 100644 --- a/src/index.webpack +++ b/src/index.webpack @@ -59,18 +59,18 @@ -
-
+
-
+
Correct cards. Which card is next?
-
+
-
{{r.key}} @@ -131,8 +131,8 @@
{{r.key}} @@ -187,7 +187,7 @@
-
+
@@ -215,12 +215,12 @@
-
+
diff --git a/src/js/app.js b/src/js/app.js index 79b6027..0c1af19 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -134,16 +134,16 @@ var app = (function (Helpers,analytics,Game,Rules) { // factories to provide services. They serve shared game objects - // app.factory('elements', function () { - // var elements = Helpers.loadFile('json/elements.json'); - // elements = elements.map( + // app.factory('cards', function () { + // var cards = Helpers.loadFile('json/cards.json'); + // cards = cards.map( // function (r) { // return new GameObjects.Card(r); // }); // // put in extended array with helper methods - // Card = new GameObjects.Cards(); - // Card.push.apply(Card,elements); - // return Card; + // Cards = new GameObjects.Cards(); + // Cards.push.apply(Cards,cards); + // return Cards; // }); @@ -206,10 +206,10 @@ var app = (function (Helpers,analytics,Game,Rules) { app.filter('reverse', reverse); // controllers - app.controller('ElementController', ElementController); - ElementController.$inject = ['$scope', '$compile', 'game', 'lab']; + app.controller('CardController', CardController); + CardController.$inject = ['$scope', '$compile', 'game', 'lab']; - function ElementController($scope, $compile, game, lab) { + function CardController($scope, $compile, game, lab) { var vm = this; vm.dataJqyouiOptions = { revert: "invalid", @@ -238,7 +238,7 @@ var app = (function (Helpers,analytics,Game,Rules) { card.state.lastDragged=new Date(); console.log('endDrag'); }; - vm.elements = game.elements; + vm.cards = game.cards; vm.isVisible = function (item) { return item.isVisible(lab); }; @@ -248,9 +248,9 @@ var app = (function (Helpers,analytics,Game,Rules) { }; - function DetectorController($scope, game, lab, $filter) { + function TableController($scope, game, lab, $filter) { var vm = this; - vm.elements = detector.elements; + vm.cards = detector.cards; vm.rule = ''; vm.hints = []; vm.limit = -12; @@ -282,8 +282,8 @@ var app = (function (Helpers,analytics,Game,Rules) { } }; }; - DetectorController.$inject = ['$scope', 'game', 'lab', '$filter']; - app.controller('DetectorController', DetectorController); + TableController.$inject = ['$scope', 'game', 'lab', '$filter']; + app.controller('TableController', TableController); function LabController($interval, game, lab) { @@ -301,7 +301,7 @@ var app = (function (Helpers,analytics,Game,Rules) { app.controller('LabController', LabController); - function UpgradesController($scope, game, lab) { + function RulesController($scope, game, lab) { var vm = this; // present just a few hypothesis var rules = Rules.rules.map(function (r) { @@ -379,8 +379,8 @@ var app = (function (Helpers,analytics,Game,Rules) { console.log('guess', arguments); }; }; - UpgradesController.$inject = ['$scope', 'game', 'lab']; - app.controller('UpgradesController', UpgradesController); + RulesController.$inject = ['$scope', 'game', 'lab']; + app.controller('RulesController', RulesController); function AchievementsController($scope, game, lab) { var vm = this; diff --git a/src/js/game.js b/src/js/game.js index 51a5a2c..a26d53f 100644 --- a/src/js/game.js +++ b/src/js/game.js @@ -5,15 +5,15 @@ var ObjectStorage = require("js/storage"); var Helpers = require("js/helpers"); var GameObjects = require("js/gameobjects"); var Rules = require("js/rules.js"); -var elements = require("json/elements.json"); +var cards = require("json/cards.json"); var achievements = require("json/achievements.json"); -var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules,elements,achievements) { +var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules,cards,achievements) { 'use strict'; var Game = function () { this.lab = null; - this.elements = null; + this.cards = null; this.workers = null; this.upgrades = null; this.achievements = null; @@ -38,7 +38,7 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules, // However, I don't see any other reasonable way to do this in order to // make it work with Angular. If you know a way, let me know, and I'll // give you a beer. - Kevin - this.elements = elements; //Helpers.loadFile('json/elements.json'); + this.cards = cards; //Helpers.loadFile('json/cards.json'); this.achievements = require("json/achievements.json"); //Helpers.loadFile('./json/achievements.json'); // function successCallback(response) { @@ -49,11 +49,11 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules, // return console.error('Could not get url', response.statusText, response); // } // return $q.all( - // $http.get('json/elements.json', { + // $http.get('json/cards.json', { // transformResponse: angular.fromJson // }) // .then(function (response) { - // return self.elements = response.data; + // return self.cards = response.data; // }), // $http.get('json/workers.json', { // transformResponse: angular.fromJson @@ -92,7 +92,7 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules, self.allObjects[o.key] = o; return o; }; - self.elements = self.elements.map( + self.cards = self.cards.map( function (r) { return makeGameObject(GameObjects.Card, r); }); @@ -106,10 +106,10 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules, o.loadState(ObjectStorage.load(key)); } - // put elements in extended array with utility methods + // put cards in extended array with utility methods self.Card = new GameObjects.Cards(); - self.Card.push.apply(self.Card, self.elements); - self.elements = self.Card; + self.Card.push.apply(self.Card, self.cards); + self.cards = self.Card; self.loaded = true; return self; @@ -121,13 +121,13 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules, this.rule.randomize(); // check if we have any cards in hand - // var totalElements = _(self.elements).map('state.amount').sum(); + // var totalElements = _(self.cards).map('state.amount').sum(); // if (totalElements<1) self.dealHand(); this.dealHand(); // deal first card // TODO make sure these follow rule - this.lastCards.push.apply(this.lastCards,_.sampleSize(this.elements,3)); + this.lastCards.push.apply(this.lastCards,_.sampleSize(this.cards,3)); for (var i = 0; i < this.lastCards.length; i++) { this.incorrectCards[i]=[]; } @@ -139,13 +139,13 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules, Game.prototype.dealHand = function (n) { n=n||12; - var hand=_.sampleSize(this.elements,n); - this.elements.map(function(card){ + var hand=_.sampleSize(this.cards,n); + this.cards.map(function(card){ card.state.amount=0; }); for (var i = 0; i < hand.length; i++) { var card = hand[i]; - this.elements.get(card.key).state.amount++; + this.cards.get(card.key).state.amount++; } }; @@ -154,7 +154,7 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules, console.debug('onClick',arguments); var cardType = angular.element(ui.draggable).data('element'); - var card = _.find(this.elements,{key:cardType}); + var card = _.find(this.cards,{key:cardType}); return this.play(card); }; Game.prototype.onDrop = function (event, ui) { @@ -162,7 +162,7 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules, console.debug('onDrop',arguments); var cardType = angular.element(ui.draggable).data('element'); - var card = _.find(this.elements,{key:cardType}); + var card = _.find(this.cards,{key:cardType}); return this.play(card); }; Game.prototype.play = function (card) { @@ -182,15 +182,15 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules, this.incorrectCards[turn].push(angular.copy(card)); // deal 2 random cards - _.sample(this.elements).state.amount+=1; - _.sample(this.elements).state.amount+=1; + _.sample(this.cards).state.amount+=1; + _.sample(this.cards).state.amount+=1; this.lab.state.score-=2; } return correct; }; /** Test the rule **/ Game.prototype.test = function (card) { - return this.rule.test(card,this.lastCards,this.elements); + return this.rule.test(card,this.lastCards,this.cards); }; Game.prototype.save = function () { // Save every object's state to local storage @@ -200,4 +200,4 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules, }; return Game; -}(Helpers, GameObjects, ObjectStorage,Rules,elements,achievements)); +}(Helpers, GameObjects, ObjectStorage,Rules,cards,achievements)); diff --git a/src/js/ui.js b/src/js/ui.js index 1d74f6b..441308a 100644 --- a/src/js/ui.js +++ b/src/js/ui.js @@ -24,7 +24,7 @@ var UI = module.exports = (function (FastClick,Cookies) { $modal.modal({show: true}); }; - /** Display only the elements with data-min-level above a certain + /** Display only the cards with data-min-level above a certain * threshold. */ var showLevels = function(level) { diff --git a/src/json/elements.json b/src/json/elements.json deleted file mode 100644 index 1603c53..0000000 --- a/src/json/elements.json +++ /dev/null @@ -1,1063 +0,0 @@ -[{ - "key": "🂡", - "name": "Ace", - "value": 1, - "suit": "Spades", - "color": "Black", - "royal": false, - "face": false, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂢", - "name": "Two", - "value": 2, - "suit": "Spades", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂣", - "name": "Three", - "value": 3, - "suit": "Spades", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂤", - "name": "Four", - "value": 4, - "suit": "Spades", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂥", - "name": "Five", - "value": 5, - "suit": "Spades", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂦", - "name": "Six", - "value": 6, - "suit": "Spades", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂧", - "name": "Seven", - "value": 7, - "suit": "Spades", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂨", - "name": "Eight", - "value": 8, - "suit": "Spades", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂩", - "name": "Nine", - "value": 9, - "suit": "Spades", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂪", - "name": "Ten", - "value": 10, - "suit": "Spades", - "color": "Black", - "royal": false, - "face": true, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂫", - "name": "Jack", - "value": 11, - "suit": "Spades", - "color": "Black", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂬", - "name": "Knight", - "value": 12, - "suit": "Spades", - "color": "Black", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂭", - "name": "Queen", - "value": 13, - "suit": "Spades", - "color": "Black", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂮", - "name": "King", - "value": 14, - "suit": "Spades", - "color": "Black", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂱", - "name": "Ace", - "value": 1, - "suit": "Hearts", - "color": "Red", - "royal": false, - "face": false, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂲", - "name": "Two", - "value": 2, - "suit": "Hearts", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂳", - "name": "Three", - "value": 3, - "suit": "Hearts", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂴", - "name": "Four", - "value": 4, - "suit": "Hearts", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂵", - "name": "Five", - "value": 5, - "suit": "Hearts", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂶", - "name": "Six", - "value": 6, - "suit": "Hearts", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂷", - "name": "Seven", - "value": 7, - "suit": "Hearts", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂸", - "name": "Eight", - "value": 8, - "suit": "Hearts", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂹", - "name": "Nine", - "value": 9, - "suit": "Hearts", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂺", - "name": "Ten", - "value": 10, - "suit": "Hearts", - "color": "Red", - "royal": false, - "face": true, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂻", - "name": "Jack", - "value": 11, - "suit": "Hearts", - "color": "Red", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂼", - "name": "Knight", - "value": 12, - "suit": "Hearts", - "color": "Red", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂽", - "name": "Queen", - "value": 13, - "suit": "Hearts", - "color": "Red", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂾", - "name": "King", - "value": 14, - "suit": "Hearts", - "color": "Red", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃁", - "name": "Ace", - "value": 1, - "suit": "Diamonds", - "color": "Red", - "royal": false, - "face": false, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃂", - "name": "Two", - "value": 2, - "suit": "Diamonds", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃃", - "name": "Three", - "value": 3, - "suit": "Diamonds", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃄", - "name": "Four", - "value": 4, - "suit": "Diamonds", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃅", - "name": "Five", - "value": 5, - "suit": "Diamonds", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃆", - "name": "Six", - "value": 6, - "suit": "Diamonds", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃇", - "name": "Seven", - "value": 7, - "suit": "Diamonds", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃈", - "name": "Eight", - "value": 8, - "suit": "Diamonds", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃉", - "name": "Nine", - "value": 9, - "suit": "Diamonds", - "color": "Red", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃊", - "name": "Ten", - "value": 10, - "suit": "Diamonds", - "color": "Red", - "royal": false, - "face": true, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃋", - "name": "Jack", - "value": 11, - "suit": "Diamonds", - "color": "Red", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃌", - "name": "Knight", - "value": 12, - "suit": "Diamonds", - "color": "Red", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃍", - "name": "Queen", - "value": 13, - "suit": "Diamonds", - "color": "Red", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃎", - "name": "King", - "value": 14, - "suit": "Diamonds", - "color": "Red", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃑", - "name": "Ace", - "value": 1, - "suit": "Clubs", - "color": "Black", - "royal": false, - "face": false, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃒", - "name": "Two", - "value": 2, - "suit": "Clubs", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃓", - "name": "Three", - "value": 3, - "suit": "Clubs", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃔", - "name": "Four", - "value": 4, - "suit": "Clubs", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃕", - "name": "Five", - "value": 5, - "suit": "Clubs", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃖", - "name": "Six", - "value": 6, - "suit": "Clubs", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃗", - "name": "Seven", - "value": 7, - "suit": "Clubs", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃘", - "name": "Eight", - "value": 8, - "suit": "Clubs", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃙", - "name": "Nine", - "value": 9, - "suit": "Clubs", - "color": "Black", - "royal": false, - "face": false, - "number": true, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃚", - "name": "Ten", - "value": 10, - "suit": "Clubs", - "color": "Black", - "royal": false, - "face": true, - "number": true, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃛", - "name": "Jack", - "value": 11, - "suit": "Clubs", - "color": "Black", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃜", - "name": "Knight", - "value": 12, - "suit": "Clubs", - "color": "Black", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃝", - "name": "Queen", - "value": 13, - "suit": "Clubs", - "color": "Black", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": true, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃞", - "name": "King", - "value": 14, - "suit": "Clubs", - "color": "Black", - "royal": true, - "face": true, - "number": false, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🂠", - "name": "Playing Card", - "value": 15, - "suit": "Black", - "color": "Black", - "royal": false, - "face": false, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃏", - "name": "Joker", - "value": 16, - "suit": "Black", - "color": "Black", - "royal": false, - "face": true, - "number": false, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃟", - "name": "Joker", - "value": 16, - "suit": "Red", - "color": "Red", - "royal": false, - "face": true, - "number": false, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}] diff --git a/test/unit/controllersSpec.js b/test/unit/controllersSpec.js index b0431dd..516f417 100644 --- a/test/unit/controllersSpec.js +++ b/test/unit/controllersSpec.js @@ -25,12 +25,12 @@ describe('cardsForScience controllers', function () { $controller = _$controller_; })); - describe('ElementController', function () { + describe('CardController', function () { var $scope, controller; beforeEach(function () { $scope = {}; - controller = $controller('ElementController',{$scope:$scope}); + controller = $controller('CardController',{$scope:$scope}); }); it('should have elements', function () {