From f785a92bea3aec07b20332887a13621b21a2d13e Mon Sep 17 00:00:00 2001
From: HalynaVladyka <halyna_vladyka@gmail.com>
Date: Wed, 13 Jan 2016 11:39:47 +0200
Subject: [PATCH] last changes

---
 .../Hubs/BroadcastHub.cs                      |  8 ++---
 .../Views/Operator/Index.cshtml               |  2 ++
 .../Operator/controllers/playerController.js  | 33 ++++++++++++++-----
 .../scriptServices/broadcastOperator.js       |  2 +-
 .../app/Prompter/prompter-service.js          | 18 ++++++----
 5 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/Hubs/BroadcastHub.cs b/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/Hubs/BroadcastHub.cs
index ab556c2..2a2ad21 100644
--- a/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/Hubs/BroadcastHub.cs
+++ b/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/Hubs/BroadcastHub.cs
@@ -377,14 +377,14 @@ public void MirrorText(bool? isMirroredX, bool? isMirroredY)
 		    Clients.OthersInGroup(GetGroupName()).mirrorText(isMirroredX, isMirroredY);
 		}
 
-		public void HandPlay()
+        public void HandPlay(double TextAreaPosition)
 		{
-		    Clients.All.handPlay();
+            Clients.All.handPlay(TextAreaPosition);
 		}
 
-		public void HandPlayBack()
+        public void HandPlayBack(double TextAreaPosition)
 		{
-		    Clients.All.handPlayBack();
+            Clients.All.handPlayBack(TextAreaPosition);
 		}
 
 	    public void PadRight(int percentage)
diff --git a/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/Views/Operator/Index.cshtml b/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/Views/Operator/Index.cshtml
index 1db7f7f..f7035f0 100644
--- a/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/Views/Operator/Index.cshtml
+++ b/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/Views/Operator/Index.cshtml
@@ -502,11 +502,13 @@
                                                     <button class="btn btn-default move-left glyphicon glyphicon-backward move-left"
                                                             ng-mousedown="handPlayBack()"
                                                             ng-mouseup="pause()"
+                                                            ng-mouseleave="puauseIfMouseUp()"
                                                             ng-disabled="isHandPlayDisabled"></button>
 
                                                     <button class="btn btn-default move-left glyphicon glyphicon-forward move-left"
                                                             ng-mousedown="handPlay()"
                                                             ng-mouseup="pause()"
+                                                            ng-mouseleave="puauseIfMouseUp()"
                                                             ng-disabled="isHandPlayDisabled"></button>
 
                                                     <button class="btn btn-default move-left"
diff --git a/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/app/Operator/controllers/playerController.js b/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/app/Operator/controllers/playerController.js
index 074bf1a..ea7725a 100644
--- a/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/app/Operator/controllers/playerController.js
+++ b/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/app/Operator/controllers/playerController.js
@@ -49,7 +49,7 @@
         $scope.speed = 2;
         $scope.velocity = startVelocity;
         $scope.speedIndicator = 0;
-        $scope.speedHandlPlay = 10;
+        $scope.speedHandlPlay = 15;
         $scope.currentSize = $scope.textSizes[6];
         $scope.textSize = 90;
         $scope.isPlayDisabled = false;
@@ -205,38 +205,53 @@
             },  $scope.velocity);
         }
 
+        var IsHandPlaying = false;
+        $scope.textAreaposition = textBox.scrollTop();
 
         $scope.handPlayBack = function () {
+            $scope.textAreaposition = textBox.scrollTop();
+            IsHandPlaying = true;
             $scope.isHandPlayDisabled = false;
             $scope.isPlayDisabled = false;
-            broadcastHub.server.handPlayBack();
+            broadcastHub.server.handPlayBack($scope.textAreaposition);
         }
 
-        broadcastHub.client.handPlayBack = function () {
+        broadcastHub.client.handPlayBack = function (textAreaposition) {
             clearInterval(animation);
             animation = setInterval(function () {
                 if (textBox.scrollTop() > 0) {
-                    textBox.scrollTop(textBox.scrollTop() - $scope.speedHandlPlay);
+                    $scope.textAreaposition -= $scope.speedHandlPlay;
+                    textBox.scrollTop($scope.textAreaposition);
                 }
             }, $scope.velocity);
         }
 
         $scope.handPlay = function () {
+            $scope.textAreaposition = textBox.scrollTop();
+            IsHandPlaying = true;
             $scope.isHandPlayDisabled = false;
             $scope.isPlayDisabled = false;
-            broadcastHub.server.handPlay();
+            broadcastHub.server.handPlay($scope.textAreaposition);
         }
 
-        broadcastHub.client.handPlay = function () {
+        broadcastHub.client.handPlay = function (textAreaposition) {
             clearInterval(animation);
             animation = setInterval(function () {
                 if (textBox.scrollTop() <= textBox.get(0).scrollHeight) {
-                    textBox.scrollTop(textBox.scrollTop() + $scope.speedHandlPlay);
+                    $scope.textAreaposition += $scope.speedHandlPlay;
+                    textBox.scrollTop($scope.textAreaposition);
                 }
             }, $scope.velocity);
         }
 
+        $scope.puauseIfMouseUp = function () {
+            if (IsHandPlaying == true) {
+                $scope.pause();
+            }
+        }
+
         $scope.pause = function () {
+            IsHandPlaying = false;
             $scope.isHandPlayDisabled = false;
             $scope.isPlayDisabled = false;
             broadcastHub.invoke('pause');
@@ -263,7 +278,7 @@
                 speedBtnClicked = true;
                 broadcastHub.server.speedUp();
                 $scope.speedIndicator++;
-                setTimeout(function () { speedBtnClicked = false; }, 500);
+                setTimeout(function () { speedBtnClicked = false; }, 300);
             }
         }
 
@@ -277,7 +292,7 @@
                 speedBtnClicked = true;
                 broadcastHub.server.speedDown();
                 $scope.speedIndicator--;
-                setTimeout(function () { speedBtnClicked = false; }, 500);
+                setTimeout(function () { speedBtnClicked = false; }, 300);
             }
         }
 
diff --git a/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/app/Operator/services/scriptServices/broadcastOperator.js b/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/app/Operator/services/scriptServices/broadcastOperator.js
index c98fe2d..885d269 100644
--- a/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/app/Operator/services/scriptServices/broadcastOperator.js
+++ b/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/app/Operator/services/scriptServices/broadcastOperator.js
@@ -45,7 +45,7 @@
                 //for adding text into operator screen :)
                 var sections = $scope.sortedScripts[$scope.index].Sections;
                 var area = $('#area')
-                if (area.length == 0) {
+                if (area.children.length > 0) {
                     area.empty();
                 }
                 _.each(sections, function (section) {
diff --git a/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/app/Prompter/prompter-service.js b/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/app/Prompter/prompter-service.js
index 55fc7c8..891ed02 100644
--- a/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/app/Prompter/prompter-service.js
+++ b/Main/SoftServe.ITA.PrompterPro/PrompterPro.WebApplication/app/Prompter/prompter-service.js
@@ -29,7 +29,7 @@
     	    $scope.showDialog = false;
     	    $scope.speed = 2;
     	    $scope.velocity = startVelocity;
-    	    $scope.speedHandlPlay = 10;
+    	    $scope.speedHandlPlay = 15;
     	    $scope.currentSize = $scope.textSizes[2];
     	    $scope.textSize = 90;
     	    $scope.leftPadding = 0;
@@ -54,7 +54,7 @@
                     ///
                     var sections = $scope.script.Sections;
                     var area = $('#area')
-                    if (area.length == 0) {
+                    if (area.children.length > 0) {
                         area.empty();
                     }
                     _.each(sections, function (section) {
@@ -165,21 +165,27 @@
                     textBox.css({ 'transform': 'matrix(1, 0, 0, 1, 0, 0)' });
                 }
             }
+
+            $scope.textAreaposition = textBox.scrollTop();
             
-            broadcastHub.client.handPlayBack = function () {
+            broadcastHub.client.handPlayBack = function (textAreaposition) {
                 clearInterval(animation);
+                $scope.textAreaposition = textAreaposition;
                 animation = setInterval(function () {
                     if (textBox.scrollTop() > 0) {
-                        textBox.scrollTop(textBox.scrollTop() - $scope.speedHandlPlay);
+                        $scope.textAreaposition -= $scope.speedHandlPlay;
+                        textBox.scrollTop($scope.textAreaposition);
                     }
                 }, $scope.velocity);
             }
 
-            broadcastHub.client.handPlay = function () {
+            broadcastHub.client.handPlay = function (textAreaposition) {
                 clearInterval(animation);
+                $scope.textAreaposition = textAreaposition;
                 animation = setInterval(function () {
                     if (textBox.scrollTop() <= textBox.get(0).scrollHeight) {
-                        textBox.scrollTop(textBox.scrollTop() + $scope.speedHandlPlay);
+                        $scope.textAreaposition += $scope.speedHandlPlay;
+                        textBox.scrollTop($scope.textAreaposition);
                     }
                 }, $scope.velocity);
             }