From 807399a02054ed60bccc5e853e21b7a59d42423a Mon Sep 17 00:00:00 2001
From: Andrew Buss <abuss@ucsd.edu>
Date: Sat, 23 May 2015 02:32:59 -0700
Subject: [PATCH] push dialog hopefully focuses properly now?

---
 home.html                 |  4 ++--
 scripts/FeedController.js | 45 +++++++++++++++++++++++++--------------------
 templates/feed.html       |  6 +++---
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/home.html b/home.html
index 90bce1c..61e7f27 100644
--- a/home.html
+++ b/home.html
@@ -14,7 +14,7 @@
 <header>
   <a href="#" style="position:absolute;top:0;left:0;" data-activates="sidebar" class="button-collapse"><i
           class="medium mdi-navigation-menu"></i></a>
-  <ul ng-show="isLoggedIn" id="sidebar" class="side-nav fixed">
+  <ul ng-show="isLoggedIn" id="sidebar" class="side-nav fixed ng-cloak">
     <li class="logo"><a href="//flashy.cards/" id="logo-container">
 
       <h1>Flashy</h1>
@@ -56,7 +56,7 @@
 <script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script>
 <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js"></script>
 <script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
-<script type="text/javascript" src="scripts/materialize.min.js"></script>
+<script type="text/javascript" src="scripts/materialize.js"></script>
 <script type="text/javascript" src="scripts/jquery.collapsible.js"></script>
 <script src="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.js"></script>
 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-animate.min.js"></script>
diff --git a/scripts/FeedController.js b/scripts/FeedController.js
index bab042e..de04f75 100644
--- a/scripts/FeedController.js
+++ b/scripts/FeedController.js
@@ -57,12 +57,10 @@ angular.module('flashy.FeedController', ['ui.router']).
             $http.post('/api/flashcards/', myCard).
                 success(function(data) {
                     console.log('pushed a card!');
-                    $scope.cards.unshift(myCard); // Add right away
-                    $scope.refreshCards(); // Refresh list
                     listenForC = true;
                 }).
                 error(function(error) {
-                    console.log('haha, n00b');
+                    console.log('something went wrong pushing a card!');
                 });
 
             $scope.text = '';
@@ -82,10 +80,32 @@ angular.module('flashy.FeedController', ['ui.router']).
 
         /* Key bindings for the whole feed window. Hotkey it up! */
         var listenForC = true;
+
+        // Need to pass these options into openmodal and leanmodal,
+        // otherwise the ready handler doesn't get called
+
+        modal_options = {
+            dismissible: true, // Modal can be dismissed by clicking outside of the modal
+            opacity: 0, // Opacity of modal background
+            in_duration: 300, // Transition in duration
+            out_duration: 200, // Transition out duration
+            ready: function() {
+                listenForC = false;
+                console.log('modal OPENING');
+                $('#new-card-input').focus();
+            },
+            complete: function() {
+                listenForC = true;
+                console.log('modal done, closing');
+                $('#new-card-input').blur();
+            }
+        };
+
         $(document).keydown(function(e) {
             var keyed = e.which;
             if (keyed == 67 && listenForC) { // "c" or "C" for compose
-                $('#newCard').openModal();
+                $('#newCard').openModal(modal_options);
+                e.preventDefault();
                 listenForC = false;
                 return false;
             } else if (keyed == 13 || keyed == 27) { // enter or esc, respectively
@@ -99,22 +119,7 @@ angular.module('flashy.FeedController', ['ui.router']).
 
         $(document).ready(function() {
             // the "href" attribute of .modal-trigger must specify the modal ID that wants to be triggered
-            $('.modal-trigger').leanModal({
-                    dismissible: true, // Modal can be dismissed by clicking outside of the modal
-                    opacity: 0, // Opacity of modal background
-                    in_duration: 300, // Transition in duration
-                    out_duration: 200, // Transition out duration
-                    ready: function() {
-                        listenForC = false;
-                        console.log('modal OPENING');
-                        $('#new-card-input').focus();
-                    },
-                    complete: function() {
-                        listenForC = true;
-                        console.log('modal done, closing');
-                    }
-                }
-            );
+            $('.modal-trigger').leanModal(modal_options);
         });
 
         $scope.$on('$destroy', function() {
diff --git a/templates/feed.html b/templates/feed.html
index 8752300..395c57e 100644
--- a/templates/feed.html
+++ b/templates/feed.html
@@ -11,7 +11,7 @@
 
 
 <!--Lil plus button in corner-->
-<div class="fixed-action-btn" style="bottom: 45px; right: 24px;">
+<div class="fixed-action-btn" style="bottom: 24px; right: 24px;">
   <a data-target="newCard" class="btn-floating btn-large modal-trigger" href="#newCard">
     <i class="large mdi-content-add"></i>
   </a>
@@ -23,8 +23,8 @@
       <div class="row">
         <div class="input-field">
           <i class="mdi-editor-mode-edit prefix"></i>
-          <input id="new-card-input" class="materialize-textarea" ng-model="text" type="text" maxlength="255" autofocus/>
-          <label id="newCardSign" for="newCard">New Flashcard Description</label>
+          <input id="new-card-input" class="materialize-textarea" ng-model="text" type="text" maxlength="255"/>
+          <label id="newCardSign" for="newCard">New Flashcard Text</label>
         </div>
       </div>
     </div>
-- 
1.9.1