From 8e3988f5e9d0972b393bab4f9e6c1708015992dc Mon Sep 17 00:00:00 2001
From: Andrew Buss <abuss@ucsd.edu>
Date: Fri, 5 Jun 2015 02:31:10 -0700
Subject: [PATCH] fix bugs about bolds; allow viewing help without being logged
 in

---
 config.js                   |   1 -
 home.html                   |  14 +++--
 scripts/FeedController.js   |   5 +-
 scripts/FlashcardFactory.js |   1 -
 scripts/HelpController.js   | 121 ++++++++++++++++++++++----------------------
 templates/feed.html         |   9 ++--
 6 files changed, 71 insertions(+), 80 deletions(-)

diff --git a/config.js b/config.js
index c366b42..7ee9fb7 100644
--- a/config.js
+++ b/config.js
@@ -151,7 +151,6 @@ angular.module('flashy', [
                 template: "<h1>This page doesn't exist!</h1>"
             }).
             state('help', {
-                resolve: auth_resolve,
                 url: '/help',
                 templateUrl: 'templates/help.html',
                 controller: 'HelpController'
diff --git a/home.html b/home.html
index 662b645..f40dd00 100644
--- a/home.html
+++ b/home.html
@@ -54,21 +54,19 @@
       </ul>
       <a href="#" class="brand-logo center">Flashy</a>
 
+      <ul ng-cloak id="nav-mobile" class="right hide-on-small-and-down">
+
+        <li ui-sref-active="active"><a ui-sref="help"><i class="tiny mdi-action-help tooltipped"
+                                                         data-position="bottom"
+                                                         data-delay="50" data-tooltip="Help"></i></a></li>
+      </ul>
       <ul ng-show="UserService.isLoggedIn()" ng-cloak id="nav-mobile" class="right hide-on-small-and-down">
 
         <li ui-sref-active="active"><a ui-sref="study" class="tooltipped" data-position="bottom" data-delay="50"
                                        data-tooltip="Study">
           <i class="tiny mdi-action-pageview"></i></a></li>
 
-        <!-- Settings Dropdown -->
-        <ul id="settingsDropdown" class="dropdown-content">
-
 
-        </ul>
-
-        <li ui-sref-active="active"><a ui-sref="help"><i class="tiny mdi-action-help tooltipped"
-                                                         data-position="bottom"
-                                                         data-delay="50" data-tooltip="Help"></i></a></li>
         <li ui-sref-active="active"><a ui-sref="settings"><i data-position="bottom" data-delay="50"
                                                              data-tooltip="Settings"
                                                              class="mdi-action-settings tooltipped"></i></a></li>
diff --git a/scripts/FeedController.js b/scripts/FeedController.js
index fbb82d1..eb906e1 100644
--- a/scripts/FeedController.js
+++ b/scripts/FeedController.js
@@ -207,10 +207,7 @@ angular.module('flashy.FeedController',
             }
         });
 
-        $('button#blank-selected').click(function() {
-            console.log(window.getSelection());
-            document.execCommand('bold');
-        });
+
         $scope.newCardBlanks = [];
         $scope.refreshNewCardInput = function() {
             $scope.newCardText = $('#new-card-input').text();
diff --git a/scripts/FlashcardFactory.js b/scripts/FlashcardFactory.js
index 29c0e0b..7816c01 100644
--- a/scripts/FlashcardFactory.js
+++ b/scripts/FlashcardFactory.js
@@ -70,7 +70,6 @@ angular.module('flashy.FlashcardFactory', ['ui.router']).
             this.material_date = newversion.material_date;
             return this.refreshFormattedText();
         };
-
         Flashcard.prototype.editModalOptions = {
             dismissible: true, // Modal can be dismissed by clicking outside of the modal
             opacity: 0, // Opacity of modal background
diff --git a/scripts/HelpController.js b/scripts/HelpController.js
index ae9e0cf..720c0ff 100644
--- a/scripts/HelpController.js
+++ b/scripts/HelpController.js
@@ -1,72 +1,71 @@
 angular.module('flashy.HelpController', ['ui.router']).
 
-    controller('HelpController', ['$scope', '$state', '$http', '$timeout', 'UserService',
-        function($scope, $state, $http, $timeout, UserService) {
-            $scope.toggleContent = function(event, index) {
-                console.log(event, index);
+    controller('HelpController', function($scope, $state, $http, $timeout) {
+        $scope.toggleContent = function(event, index) {
+            console.log(event, index);
 
-                if ($('#content-' + index).hasClass('open')) { // let's close it
-                    // Note: 250 is duration (ms) of animation
-                    $('#content-' + index).slideUp(250).removeClass('open');
-                } else { // let'd open it
-                    $('#content-' + index).slideDown(250).addClass('open');
-                }
+            if ($('#content-' + index).hasClass('open')) { // let's close it
+                // Note: 250 is duration (ms) of animation
+                $('#content-' + index).slideUp(250).removeClass('open');
+            } else { // let'd open it
+                $('#content-' + index).slideDown(250).addClass('open');
+            }
 
 //            event.currentTarget
-            };
+        };
 
-            $scope.closeContent = function(event) {
+        $scope.closeContent = function(event) {
 
-            };
+        };
 
-            // JSON OF FAQ ENTRIES
-            $scope.entries = [
-                {
-                    // icon: 'mdi-editor-insert-emoticon small',
-                    question: 'What is Flashy?',
-                    answer: '<p>Flashy is a service for creating, sharing, and reviewing flashcards for your courses.' +
-                    '</p><p>Flashy is optimized for contributing cards in real time during lecture to a shared live' +
-                    " feed. Don't want to contribute cards? That's fine! By adding others' cards to your deck, you" +
-                    ' help identify high-quality cards which should remain at the top of the feed for others to choose.' +
-                    '</p><p>Based on the principles of spaced repetition, Flashy also intelligently determines which' +
-                    ' cards you are most at risk of forgetting, based on your review history. Receive push ' +
-                    "notifications on your Android device's Chrome browser without installing any other app," +
-                    " and we'll notify you when you have a few cards which need to be reviewed.</p>"
-                },
-                {
-                    // icon: 'mdi-file-cloud-queue small',
-                    question: 'Does Flashy work outside of UCSD?',
-                    answer: "To simplify development, Flashy was configured only for courses at UCSD. If you'd like Flashy for your school, please send us an email to let us know!"
-                },
-                {
-                    // icon: 'mdi-hardware-security small',
-                    question: 'How do registration and verification work?',
-                    answer: "An account is required to use Flashy. We store the cards you save to your deck with your account. When you register, you'll be able to use the site immediately, but you must verify ownership of your email address within 24 hours. After 24 hours have passed, you'll need to verify your address before continuing to use the site. Don't worry, your cards and deck won't be deleted."
-                },
-                {
-                    question: "My question isn't answered above",
-                    answer: ' <a href="mailto:or.so.help.me@flashy.cards">Send us an email!</a>'
-                }];
+        // JSON OF FAQ ENTRIES
+        $scope.entries = [
+            {
+                // icon: 'mdi-editor-insert-emoticon small',
+                question: 'What is Flashy?',
+                answer: '<p>Flashy is a service for creating, sharing, and reviewing flashcards for your courses.' +
+                '</p><p>Flashy is optimized for contributing cards in real time during lecture to a shared live' +
+                " feed. Don't want to contribute cards? That's fine! By adding others' cards to your deck, you" +
+                ' help identify high-quality cards which should remain at the top of the feed for others to choose.' +
+                '</p><p>Based on the principles of spaced repetition, Flashy also intelligently determines which' +
+                ' cards you are most at risk of forgetting, based on your review history. Receive push ' +
+                "notifications on your Android device's Chrome browser without installing any other app," +
+                " and we'll notify you when you have a few cards which need to be reviewed.</p>"
+            },
+            {
+                // icon: 'mdi-file-cloud-queue small',
+                question: 'Does Flashy work outside of UCSD?',
+                answer: "To simplify development, Flashy was configured only for courses at UCSD. If you'd like Flashy for your school, please send us an email to let us know!"
+            },
+            {
+                // icon: 'mdi-hardware-security small',
+                question: 'How do registration and verification work?',
+                answer: "An account is required to use Flashy. We store the cards you save to your deck with your account. When you register, you'll be able to use the site immediately, but you must verify ownership of your email address within 24 hours. After 24 hours have passed, you'll need to verify your address before continuing to use the site. Don't worry, your cards and deck won't be deleted."
+            },
+            {
+                question: "My question isn't answered above",
+                answer: ' <a href="mailto:or.so.help.me@flashy.cards">Send us an email!</a>'
+            }];
 
-            // Functions
-            $scope.toggleContent = function(event, index) {
-                if ($('#content-' + index).hasClass('open')) { // let's close it
-                    // Note: 250 is duration (ms) of animation
-                    $('#content-' + index).slideUp(250).removeClass('open');
-                } else { // let's open it
-                    $('#content-' + index).slideDown(250).addClass('open');
-                }
-            };
+        // Functions
+        $scope.toggleContent = function(event, index) {
+            if ($('#content-' + index).hasClass('open')) { // let's close it
+                // Note: 250 is duration (ms) of animation
+                $('#content-' + index).slideUp(250).removeClass('open');
+            } else { // let's open it
+                $('#content-' + index).slideDown(250).addClass('open');
+            }
+        };
 
-            $scope.expandAllContent = function() {
-                for (var i = 0; i < $scope.entries.length; i++) {
-                    $('#content-' + i).slideDown(0).addClass('open');
-                }
-            };
+        $scope.expandAllContent = function() {
+            for (var i = 0; i < $scope.entries.length; i++) {
+                $('#content-' + i).slideDown(0).addClass('open');
+            }
+        };
 
-            $scope.collapseAllContent = function() {
-                for (var i = 0; i < $scope.entries.length; i++) {
-                    $('#content-' + i).slideUp(0).removeClass('open');
-                }
-            };
-        }]);
+        $scope.collapseAllContent = function() {
+            for (var i = 0; i < $scope.entries.length; i++) {
+                $('#content-' + i).slideUp(0).removeClass('open');
+            }
+        };
+    });
diff --git a/templates/feed.html b/templates/feed.html
index 5a25475..8656024 100644
--- a/templates/feed.html
+++ b/templates/feed.html
@@ -3,7 +3,7 @@
   <form id="edit-card-form">
     <div class="modal-content col">
       <div class="row" style="margin-bottom:0">
-        <div class="card  cyan-text text-darken-2"
+        <div class="card cyan-text text-darken-2"
              style="width:300px; height:180px; margin-bottom:0; font-size:120%;">
           <div class="valign-wrapper">
             <div id="edit-card-input" ng-model="editCardFormattedText" style="outline:0px solid transparent;"
@@ -37,8 +37,7 @@
       </div>
 
       <div class="row">
-        <button id="blank-selected" style="float:left" class="btn" data-position="right"
-                onclick="document.execCommand('bold')" data-delay="50">
+        <button class="blank-selected-btn btn tooltipped" style="float:left" onclick="document.execCommand('bold')" data-position="right" data-delay="50">
           Blank Selected Text
         </button>
       </div>
@@ -114,8 +113,8 @@
         </button>
       </div>
       <div class="row">
-        <button id="blank-selected" style="float:left" class="btn tooltipped" data-position="right" data-delay="50"
-                data-tooltip="Ctrl-B">Blank Selected Text
+        <button style="float:left" class="blank-selected-btn btn tooltipped" data-position="right" data-delay="50"
+                data-tooltip="Ctrl-B" onclick="document.execCommand('bold')" >Blank Selected Text
         </button>
       </div>
       <div class="row" ng-show="newCardText" ng-style="(newCardText.length>160)?{color:'red'}:{}">
-- 
1.9.1