Merge pull request #43 from levent/refactor-more-js

[js] move updateTaskCard out of main.js
levent · Feb 10, 2015 · af4eee3 · af4eee3
2 parents 8064be6 + b8ea4f4
commit af4eee3
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 29 deletions.
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
@@ -23,33 +23,6 @@ function notifyUser(json, user) {
   }
 }
 
-function updateTaskCard(container, task_card, hours, devs, who, me) {
-  var claim_btn = task_card.find('.claim_btn');
-  var renounce_btn = task_card.find('.renounce_btn');
-  task_card.attr('style', 'position:relative');
-
-  task_card.find('.assignees').html(devs.join(', '));
-
-  if(Number(hours) > 0) {
-    if(devs.length === 0) {
-      task_card.insertBefore(container.siblings('.incomplete').find('.new-task-card'));
-      task_card.find('.assignees').html('Nobody');
-    } else {
-      container.siblings('.inprogress').append(task_card);
-    }
-  } else {
-    container.siblings('.complete').append(task_card);
-  }
-
-  if(jQuery.inArray(me,devs) > -1) {
-    claim_btn.addClass('hide-override');
-    renounce_btn.removeClass('hide-override');
-  } else {
-    claim_btn.removeClass('hide-override');
-    renounce_btn.addClass('hide-override');
-  }
-}
-
 function setupTaskBoard(project_id, user_story_id) {
 
   var us_container = '#user_story_container_' + user_story_id;

diff --git a/app/assets/javascripts/task_board.js b/app/assets/javascripts/task_board.js
@@ -3,6 +3,40 @@ var TaskBoard = (function(){
 
   var self = this ,
 
+    placeTaskCard = function(container, task_card, hours, devs) {
+      if(Number(hours) > 0) {
+        if(devs.length === 0) {
+          task_card.insertBefore(container.siblings('.incomplete').find('.new-task-card'));
+          task_card.find('.assignees').html('Nobody');
+        } else {
+          container.siblings('.inprogress').append(task_card);
+        }
+      } else {
+        container.siblings('.complete').append(task_card);
+      }
+    },
+
+    showHideTaskCardButtons = function(task_card, devs, me) {
+      var claim_btn = task_card.find('.claim_btn');
+      var renounce_btn = task_card.find('.renounce_btn');
+
+      if(jQuery.inArray(me, devs) > -1) {
+        claim_btn.addClass('hide-override');
+        renounce_btn.removeClass('hide-override');
+      } else {
+        claim_btn.removeClass('hide-override');
+        renounce_btn.addClass('hide-override');
+      }
+    },
+
+    updateTaskCard = function(container, task_card, hours, devs, me) {
+      task_card.attr('style', 'position:relative');
+      task_card.find('.assignees').html(devs.join(', '));
+
+      placeTaskCard(container, task_card, hours, devs);
+      showHideTaskCardButtons(task_card, devs, me);
+    },
+
     countComplete = function() {
       var complete_stories = $('div.user-story[data-status="complete"]');
       var complete_points = $.map(complete_stories, function(element) {
@@ -63,7 +97,8 @@ var TaskBoard = (function(){
     };
 
     return {
-      calculateStats : calculateStats
+          calculateStats : calculateStats,
+          updateTaskCard : updateTaskCard
     };
 
 })();
diff --git a/app/views/sprints/_sse.html.erb b/app/views/sprints/_sse.html.erb
@@ -1,7 +1,7 @@
 var update = function(data){
   var task_card = $('#task_card_' + data.task_id);
   var container = task_card.parent();
-  updateTaskCard(container, task_card, data.task_hours, data.task_devs, data.performed_by, '<%= current_user.name %>');
+  TaskBoard.updateTaskCard(container, task_card, data.task_hours, data.task_devs, '<%= current_user.name %>');
   notifyUser(data, "<%= current_user.name %>");
   var us_card = $('div.user-story[data-story="' + data.user_story_id + '"]');
   us_card.attr('data-status', data.user_story_status);