From 6751f108f0f2689439180628ecb4c68140647274 Mon Sep 17 00:00:00 2001 From: Mark Drake Date: Sun, 7 Dec 2014 21:55:06 -0500 Subject: [PATCH 1/2] Resolves bug U4-5944 This change resolves an issue with the media picker / RTE where an image inserted with no alt title provided is inserted with it equal to "undefined". See: http://issues.umbraco.org/issue/U4-5944 --- .../src/common/services/tinymce.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js index 1e5758bb55..fb93b77dd4 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js @@ -111,7 +111,7 @@ function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macro if (img) { var data = { - alt: img.altText, + alt: img.altText || "", src: (img.url) ? img.url : "nothing.jpg", rel: img.id, id: '__mcenew' From accded4dfc8bbe1c47349cd4ad0722400ad1933d Mon Sep 17 00:00:00 2001 From: Mark Drake Date: Tue, 9 Dec 2014 11:51:27 -0500 Subject: [PATCH 2/2] Resolves Bug #U4-5568 Allow 0 for numeric data type Please see this bug for more detail: http://issues.umbraco.org/issue/U4-5568 --- .../src/common/directives/util/fixnumber.directive.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/fixnumber.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/fixnumber.directive.js index ce00a9c6ad..c4068f068f 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/util/fixnumber.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/util/fixnumber.directive.js @@ -24,6 +24,7 @@ function fixNumber($parse) { //always return an int to the model ctrl.$parsers.push(function (value) { + if (value === 0) return 0; return parseFloat(value || '', 10); });