From 998531a1b498af0f915f6b6bb52f58f14cafe7bb Mon Sep 17 00:00:00 2001
From: Matthew Ross <kiswa.com@gmail.com>
Date: Sat, 6 Jun 2015 12:34:34 -0400
Subject: [PATCH] Fixes #65. Settings now allow disabling animations.

---
 api/userRoutes.php               | 4 ++--
 js/controllers/settings.js       | 6 ++----
 partials/board.html              | 6 +++---
 partials/boardItemModal.html     | 2 +-
 partials/boardItemViewModal.html | 2 +-
 partials/settingsBoardModal.html | 2 +-
 partials/settingsUserModal.html  | 2 +-
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/api/userRoutes.php b/api/userRoutes.php
index 0851fce..6b0be3a 100644
--- a/api/userRoutes.php
+++ b/api/userRoutes.php
@@ -141,8 +141,8 @@ $app->get('/users/current', function() use($app, $jsonResponse) {
             $userOptions = R::exportAll($user->ownOption);
             $options = [
                 'tasksOrder' => $userOptions[0]['tasks_order'],
-                'showAssignee' => $userOptions[0]['show_assignee'],
-                'showAnimations' => $userOptions[0]['show_animations']
+                'showAssignee' => $userOptions[0]['show_assignee'] == 1,
+                'showAnimations' => $userOptions[0]['show_animations'] == 1
             ];
             $jsonResponse->data = [
                 'userId' => $user->id,
diff --git a/js/controllers/settings.js b/js/controllers/settings.js
index e4de0e0..91f4cbf 100644
--- a/js/controllers/settings.js
+++ b/js/controllers/settings.js
@@ -29,10 +29,8 @@ function ($scope, UserService, AlertService) {
 
     loadOptionsData = function (data) {
         $scope.currentUser.options.tasksOrder = parseInt(data.options.tasksOrder);
-        $scope.currentUser.options.showAnimations = typeof data.options.showAnimations === "string" ?
-            data.options.showAnimations === "1" : data.options.showAnimations;
-        $scope.currentUser.options.showAssignee = typeof data.options.showAssignee === "string" ?
-            data.options.showAssignee === "1" : data.options.showAssignee;
+        $scope.currentUser.options.showAnimations = data.options.showAnimations;
+        $scope.currentUser.options.showAssignee = data.options.showAssignee;
     };
 
     $scope.saveOptions = function() {
diff --git a/partials/board.html b/partials/board.html
index 1160ed0..62d3252 100644
--- a/partials/board.html
+++ b/partials/board.html
@@ -65,14 +65,14 @@
                         </div>
                         <div class="description" data-ng-bind-html="marked(item.description)"></div>
                         <p class="assignee">
-                            <span data-ng-show="currentUser.options.showAssignee === '1'">
+                            <span data-ng-show="currentUser.options.showAssignee">
                                 <span data-ng-if="userNames[item.assignee]">Assigned To: </span>
                                 {{ userNames[item.assignee] }}
                             </span>
                             <span class="pull-right">
-                                <span data-ng-if="item.ownComment" class="fa fa-comments-o"
+                                <span data-ng-if="item.ownComment.length" class="fa fa-comments-o"
                                       title="{{ item.ownComment.length }} Comments"></span>
-                                <span data-ng-if="item.ownAttachment" class="fa fa-paperclip"
+                                <span data-ng-if="item.ownAttachment.length" class="fa fa-paperclip"
                                       title="{{ item.ownAttachment.length }} Attachments"></span>
                                 <span data-ng-if="item.due_date" data-ng-class="{'dateNear': item.dateNear, 'datePast': item.datePast}">
                                     Due: {{ item.due_date }}
diff --git a/partials/boardItemModal.html b/partials/boardItemModal.html
index f422312..cb0e8a2 100644
--- a/partials/boardItemModal.html
+++ b/partials/boardItemModal.html
@@ -1,4 +1,4 @@
-<div class="modal fade itemModal" tabindex="-1" role="dialog" aria-labelledby="itemLabel" aria-hidden="true">
+<div class="modal itemModal" data-ng-class="{ fade: currentUser.options.showAnimations }" tabindex="-1" role="dialog" aria-labelledby="itemLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content" id="addEdit" data-ng-controller="ItemFormBoardCtrl">
             <div class="modal-header">
diff --git a/partials/boardItemViewModal.html b/partials/boardItemViewModal.html
index c692e32..a7957a0 100644
--- a/partials/boardItemViewModal.html
+++ b/partials/boardItemViewModal.html
@@ -1,4 +1,4 @@
-<div class="modal fade itemViewModal" tabindex="-1" role="dialog"
+<div class="modal itemViewModal" data-ng-class="{ fade: currentUser.options.showAnimations }" tabindex="-1" role="dialog"
      aria-labelledby="itemViewLabel" aria-hidden="true"
      data-ng-controller="ItemViewBoardCtrl">
     <div class="modal-dialog">
diff --git a/partials/settingsBoardModal.html b/partials/settingsBoardModal.html
index 501d3e8..464cea0 100644
--- a/partials/settingsBoardModal.html
+++ b/partials/settingsBoardModal.html
@@ -1,4 +1,4 @@
-<div class="modal fade boardModal" tabindex="-1" role="dialog" aria-labelledby="boardLabel" aria-hidden="true">
+<div class="modal boardModal" data-ng-class="{ fade: currentUser.options.showAnimations }" tabindex="-1" role="dialog" aria-labelledby="boardLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content" data-ng-controller="BoardFormSettingsCtrl">
             <div class="modal-header">
diff --git a/partials/settingsUserModal.html b/partials/settingsUserModal.html
index 7b29a74..4dc83ce 100644
--- a/partials/settingsUserModal.html
+++ b/partials/settingsUserModal.html
@@ -1,4 +1,4 @@
-<div class="modal fade userModal" tabindex="-1" role="dialog" aria-labelledby="userLabel" aria-hidden="true">
+<div class="modal userModal" data-ng-class="{ fade: currentUser.options.showAnimations }" tabindex="-1" role="dialog" aria-labelledby="userLabel" aria-hidden="true">
     <div class="modal-dialog modal-sm">
         <div class="modal-content" data-ng-controller="UserFormSettingsCtrl">
             <div class="modal-header">