From 0e22a2bb5a5a47fee161205d159a3e0a2b43c3cc Mon Sep 17 00:00:00 2001 From: perploug Date: Fri, 14 Mar 2014 23:02:52 +0100 Subject: [PATCH] Fixes installer progress bar --- .../src/installer/installer.service.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js index f389645707..8d2e552f61 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js @@ -56,15 +56,15 @@ angular.module("umbraco.install").factory('installerService', function($rootScop //calculates the offset of the progressbar on the installaer function calculateProgress(steps, next) { + var sorted = _.sortBy(steps, "serverOrder"); + var pct = "100%"; - var f = _.find(steps, function(item, index) { - if(item.name == next){ - pct = Math.floor((index+1 / steps.length * 100)) + "%"; - return true; - }else{ - return false; + for (var i = sorted.length - 1; i >= 0; i--) { + if(sorted[i].name == next){ + pct = Math.floor((i+1) / steps.length * 100) + "%"; + break; } - }); + } return pct; }