From 07a06ca9da59a6d3ca56f9c95037b5cd7edef12a Mon Sep 17 00:00:00 2001
From: Andrew Buss <abuss@ucsd.edu>
Date: Mon, 1 Jun 2015 00:15:41 -0700
Subject: [PATCH] cleanup; more deck refactoring

---
 scripts/CardGridController.js | 14 ++++++++++++++
 scripts/CardListController.js | 12 ++++++------
 scripts/FlashcardDirective.js |  8 +++-----
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/scripts/CardGridController.js b/scripts/CardGridController.js
index 35c0316..d771ef9 100644
--- a/scripts/CardGridController.js
+++ b/scripts/CardGridController.js
@@ -62,6 +62,10 @@ angular.module('flashy.CardGridController', ['ui.router', 'ngAnimate', 'ngWebSoc
             console.log('deck ws open');
         });
 
+        $scope.deck_ws.onMessage(function(message) {
+            console.log('message', message);
+        });
+
         $scope.add = function(card) {
             var colNum = 0;
             var lowestCol = $scope.cardCols[0];
@@ -84,6 +88,16 @@ angular.module('flashy.CardGridController', ['ui.router', 'ngAnimate', 'ngWebSoc
             $timeout($scope.refreshColumnWidth);
         };
 
+        $http.get('/api/sections/' + $scope.sectionId + '/deck/').
+            success(function(data) {
+                $scope.deck_cards = data;
+                console.log("got user's deck");
+                console.log(data);
+            }).
+            error(function(err) {
+                console.log('get deck failed');
+            });
+
         $scope.$on('$destroy', function() {
             $scope.deck_ws.close();
             $rootScope.currentSection = {};
diff --git a/scripts/CardListController.js b/scripts/CardListController.js
index 3276100..631d9f0 100644
--- a/scripts/CardListController.js
+++ b/scripts/CardListController.js
@@ -182,22 +182,22 @@ angular.module('flashy.CardListController', ['ui.router', 'angular.filter', 'ngS
 filter('displayCard', function($sce) {
     return function(card) {
         // text to display as html
-        var cardText = "";
+        var cardText = '';
 
         var start = 0; // where to start next string break
 
         // get all display pieces and blank pieces
         for (var i = 0; i < card.mask.length; i++) {
-          cardText = cardText.concat( card.text.substring(start, card.mask[i][0]) );
-          cardText = cardText.concat("<b>");
-          cardText = cardText.concat( card.text.substring(card.mask[i][0], card.mask[i][1]) );
-          cardText = cardText.concat("</b>");
+          cardText = cardText.concat(card.text.substring(start, card.mask[i][0]));
+          cardText = cardText.concat('<b>');
+          cardText = cardText.concat(card.text.substring(card.mask[i][0], card.mask[i][1]));
+          cardText = cardText.concat('</b>');
           start = card.mask[i][1];
         }
 
         // get remaining dislay pieces, if any
         if (start != card.mask.length - 1)
-          cardText = cardText.concat( card.text.substring(start) );
+          cardText = cardText.concat(card.text.substring(start));
 
         //cardText = cardText.concat("</span>");
         return $sce.trustAsHtml(cardText);
diff --git a/scripts/FlashcardDirective.js b/scripts/FlashcardDirective.js
index cc91a80..ee94eb9 100644
--- a/scripts/FlashcardDirective.js
+++ b/scripts/FlashcardDirective.js
@@ -25,7 +25,7 @@ angular.module('flashy.FlashcardDirective', []).
                     /* Pulls card from feed into deck */
                     scope.pullCard = function(flashcard) {
                         flashcard.is_in_deck = true;
-                        $http.post('/api/flashcards/' + flashcard.id + '/pull/', flashcard).
+                        $http.post('/api/flashcards/' + flashcard.id + '/pull/').
                             success(function(data) {
                                 console.log('pulled flashcard #' + flashcard.id);
                                 //scope.startShrink = true;
@@ -40,8 +40,7 @@ angular.module('flashy.FlashcardDirective', []).
                     scope.unpullCard = function(flashcard) {
                         console.log('unpulling card...');
                         flashcard.is_in_deck = false;
-                        $http.post('/api/flashcards/' + flashcard.id + '/unpull/',
-                            flashcard).
+                        $http.post('/api/flashcards/' + flashcard.id + '/unpull/').
                             success(function(data) {
                                 console.log('card unpull success');
                                 //scope.startShrink = true;
@@ -55,8 +54,7 @@ angular.module('flashy.FlashcardDirective', []).
                     /* Hides card from feed */
                     scope.hideCard = function(flashcard) {
                         if ($state.current.name == 'feed') {
-                            $http.post('/api/flashcards/' + flashcard.id + '/hide/',
-                                flashcard).
+                            $http.post('/api/flashcards/' + flashcard.id + '/hide/').
                                 success(function(data) {
                                     console.log('card hide success');
                                     scope.startShrink = true;
-- 
1.9.1