From c429bd1f447161ffd1edae013778746cf7a2429a Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 17 Jul 2014 15:08:12 +0100 Subject: [PATCH] improved the dropbox progress bar --- services/web/app/views/project/editor/dropbox.jade | 2 +- .../coffee/ide/dropbox/controllers/DropboxController.coffee | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/web/app/views/project/editor/dropbox.jade b/services/web/app/views/project/editor/dropbox.jade index 1f3153d929..40d2cce851 100644 --- a/services/web/app/views/project/editor/dropbox.jade +++ b/services/web/app/views/project/editor/dropbox.jade @@ -20,7 +20,7 @@ script(type="text/ng-template", id="dropboxModalTemplate") div(ng-show="dbState.hasDropboxFeature && dbState.userIsLinkedToDropbox") - progressbar.progress-striped.active(value='percentageLeftTillNextPoll', type="info") + progressbar.progress-striped.active(value='dbState.percentageLeftTillNextPoll', type="info") span strong {{dbState.minsTillNextPoll}} minutes span until dropbox is next checked for changes. diff --git a/services/web/public/coffee/ide/dropbox/controllers/DropboxController.coffee b/services/web/public/coffee/ide/dropbox/controllers/DropboxController.coffee index 444aa3eaf2..e3f3d5aa47 100644 --- a/services/web/public/coffee/ide/dropbox/controllers/DropboxController.coffee +++ b/services/web/public/coffee/ide/dropbox/controllers/DropboxController.coffee @@ -35,6 +35,7 @@ define [ $scope.dbState.minsTillNextPoll = POLLING_INTERVAL - roundedMinsSinceLastPoll $scope.dbState.percentageLeftTillNextPoll = 100 - ((roundedMinsSinceLastPoll / POLLING_INTERVAL) * 100) + console.log $scope.dbState.percentageLeftTillNextPoll $timeout calculatePollTime, 60 * 1000 ide.socket.emit "getUserDropboxLinkStatus", user_id, (err, status)=>