Merge branch '7.2.1' of https://github.com/markusdrake/Umbraco-CMS into dev-v7
This commit is contained in:
@@ -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);
|
||||
});
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
Reference in New Issue
Block a user