Merge pull request #349 from pliablepixels/montage-jazz

Montage jazz

Former-commit-id: ba1be6c70c55a7274d980d9b418b8bc385704ba2

1 files changed, 4 insertions, 8 deletions

diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index ce745716..d91986aa 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -389,14 +389,10 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
         //console.log("YOU changed " + $scope.sliderProgress.progress);
         $scope.currentProgress.progress = $scope.sliderProgress.progress;
-        $timeout(function () {
-            sendCommand('14', $scope.connKey, '&offset=' + $scope.currentProgress.progress);
-        }, 500);
-        // give this command some time to complete
-        $timeout(function () {
-            $scope.blockSlider = false;
-        }, 1500);
-
+        sendCommand('14', $scope.connKey, '&offset=' + $scope.currentProgress.progress)
+        .then (function (s) { $scope.blockSlider = false; }, function (e) {$scope.blockSlider = false;});
+    
+       
     };