diff --git a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js index 76996c7785..9cfc5e831a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js @@ -85,9 +85,7 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, um var maxScaleableHeight = this.getMaxScaleableHeight(idealImages, maxRowHeight); //if the max scale height is smaller than the min display height, we'll use the min display height targetHeight = targetHeight ? targetHeight : Math.max(maxScaleableHeight, minDisplayHeight); - - console.log("targetHeight = " + targetHeight); - + var attemptedRowHeight = this.performGetRowHeight(idealImages, targetRowWidth, minDisplayHeight, targetHeight); if (attemptedRowHeight != null) { @@ -151,17 +149,12 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, um for (var i = 0; i < idealImages.length; i++) { var scaledW = this.getScaledWidth(idealImages[i], targetHeight); - console.log("Image " + i + " scaled width = " + scaledW); currRowWidth += scaledW; } if (currRowWidth > targetRowWidth) { //get the new scaled height to fit var newHeight = targetRowWidth * targetHeight / currRowWidth; - - console.log("currRowWidth = " + currRowWidth); - console.log("targetRowWidth = " + targetRowWidth); - console.log("Scaled down new height = " + newHeight); return newHeight; } @@ -210,8 +203,6 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, um ////set the row style //row.style = { "width": maxRowWidth + "px" }; - console.log("ROW built"); - return row; }, @@ -327,8 +318,6 @@ function umbSessionStorage($window) { return { get: function (key) { - console.log(storage); - console.log(storage["umb_" + key]); return angular.fromJson(storage["umb_" + key]); }, diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/assets-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/assets-service.spec.js index d9eda02349..bdc4374d3a 100644 --- a/src/Umbraco.Web.UI.Client/test/unit/common/services/assets-service.spec.js +++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/assets-service.spec.js @@ -20,12 +20,10 @@ describe('Assets service tests', function () { var loaded = false; runs( function(){ assetsService.loadJs("lib/umbraco/NamespaceManager.js").then(function(){ - console.log( "done" ); expect(Umbraco.Sys).toNotBe(undefined); }); }); runs(function(){ - console.log( "asserting" ); expect(Umbraco.Sys).toNotBe(undefined); }); }); diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/events-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/events-service.spec.js index b714c02b50..95d9f05cdf 100644 --- a/src/Umbraco.Web.UI.Client/test/unit/common/services/events-service.spec.js +++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/events-service.spec.js @@ -81,7 +81,6 @@ describe('angular event tests', function () { $rootScope.$on("testEvent", function(e, args) { $timeout(function () { - console.log("timeout #1"); args.val = "changed1"; args.resolve(args); }, 1000); @@ -89,7 +88,6 @@ describe('angular event tests', function () { $rootScope.$on("testEvent", function (e, args) { $timeout(function () { - console.log("timeout #2"); args.val = "changed2"; args.resolve(args); }, 1000); @@ -119,7 +117,6 @@ describe('angular event tests', function () { _.each(promises, function(p) { p.promise.then(function (args) { index++; - console.log("YOU ARE HERE: " + args.val); expect(args.val).toBe("changed" + index); }); }); diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-photo-folder-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-photo-folder-helper.spec.js index 84b8d52612..a8bf9bcb7c 100644 --- a/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-photo-folder-helper.spec.js +++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-photo-folder-helper.spec.js @@ -26,7 +26,6 @@ describe('umbPhotoFolderHelper tests', function () { var result = umbPhotoFolderHelper.buildRow(images, maxRowHeight, minDisplayHeight, maxRowWidth, idealImgPerRow, margin); - console.log(result.images.length); expect(result.images.length).toBe(5); @@ -49,7 +48,6 @@ describe('umbPhotoFolderHelper tests', function () { var result = umbPhotoFolderHelper.buildRow(images, maxRowHeight, minDisplayHeight, maxRowWidth, idealImgPerRow, margin); - console.log(result.images.length); expect(result.images.length).toBe(4);