From 9b5455c18659d7ce78d9430d43925c770c6e636d Mon Sep 17 00:00:00 2001 From: Mundairson Date: Mon, 16 Jul 2018 22:06:45 +0100 Subject: [PATCH 1/5] Changed the constructors so the two overloads have the same parameter in the same position. --- .../UmbracoExperimentalFeatureAttribute.cs | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/Umbraco.Core/CodeAnnotations/UmbracoExperimentalFeatureAttribute.cs b/src/Umbraco.Core/CodeAnnotations/UmbracoExperimentalFeatureAttribute.cs index 74be6ab397..92e96fde7f 100644 --- a/src/Umbraco.Core/CodeAnnotations/UmbracoExperimentalFeatureAttribute.cs +++ b/src/Umbraco.Core/CodeAnnotations/UmbracoExperimentalFeatureAttribute.cs @@ -3,33 +3,41 @@ namespace Umbraco.Core.CodeAnnotations { /// - /// Marks the program elements that Umbraco is experimenting with and could become public. + /// Marks the program elements that Umbraco is experimenting with and could + /// become public. /// /// - /// Indicates that Umbraco is experimenting with code that potentially could become - /// public, but we're not sure, and the code is not stable and can be refactored at any time. - /// The issue tracker should contain more details, discussion, and planning. + /// Indicates that Umbraco is experimenting with code that potentially + /// could become public, but we're not sure, and the code is not stable and + /// can be refactored at any time. + /// The issue tracker should contain more details, discussion, and + /// planning. /// [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)] internal sealed class UmbracoExperimentalFeatureAttribute : Attribute { /// - /// Initializes a new instance of the class with a description. + /// Initializes a new instance of the + /// class with a description. /// - /// The text string that describes what is intended. + /// The text string that describes what is + /// intended. public UmbracoExperimentalFeatureAttribute(string description) { - + /* empty */ } /// - /// Initializes a new instance of the class with a tracker url and a description. + /// Initializes a new instance of the + /// class with a tracker url and a description. /// - /// The url of a tracker issue containing more details, discussion, and planning. - /// The text string that describes what is intended. - public UmbracoExperimentalFeatureAttribute(string trackerUrl, string description) + /// The text string that describes what is + /// intended. + /// The url of a tracker issue containing more + /// details, discussion, and planning. + public UmbracoExperimentalFeatureAttribute(string description, string trackerUrl) { - + /* empty */ } } } From e17d2fbfc0084c9b8d8240df5adc0bf9f278080a Mon Sep 17 00:00:00 2001 From: Mundairson Date: Mon, 16 Jul 2018 22:09:03 +0100 Subject: [PATCH 2/5] Changed the constructors so the two overloads have the same parameter in the same position. --- .../UmbracoProposedPublicAttribute.cs | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Core/CodeAnnotations/UmbracoProposedPublicAttribute.cs b/src/Umbraco.Core/CodeAnnotations/UmbracoProposedPublicAttribute.cs index 1a65dc036e..8f15405cf8 100644 --- a/src/Umbraco.Core/CodeAnnotations/UmbracoProposedPublicAttribute.cs +++ b/src/Umbraco.Core/CodeAnnotations/UmbracoProposedPublicAttribute.cs @@ -6,31 +6,39 @@ namespace Umbraco.Core.CodeAnnotations /// Marks the program elements that Umbraco is considering making public. /// /// - /// Indicates that Umbraco considers making the (currently internal) program element public - /// at some point in the future, but the decision is not fully made yet and is still pending reviews. - /// Note that it is not a commitment to make the program element public. It may not ever become public. - /// The issue tracker should contain more details, discussion, and planning. + /// Indicates that Umbraco considers making the (currently internal) + /// program element public at some point in the future, but the decision is + /// not fully made yet and is still pending reviews. + /// Note that it is not a commitment to make the program element public. + /// It may not ever become public. + /// The issue tracker should contain more details, discussion, and + /// planning. /// - [AttributeUsage(AttributeTargets.All, AllowMultiple=false, Inherited=false)] + [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)] internal sealed class UmbracoProposedPublicAttribute : Attribute { /// - /// Initializes a new instance of the class with a description. + /// Initializes a new instance of the + /// class with a description. /// - /// The text string that describes what is intended. + /// The text string that describes what is + /// intended. public UmbracoProposedPublicAttribute(string description) { - + /* empty */ } /// - /// Initializes a new instance of the class with a tracker url and a description. + /// Initializes a new instance of the + /// class with a tracker url and a description. /// - /// The url of a tracker issue containing more details, discussion, and planning. - /// The text string that describes what is intended. - public UmbracoProposedPublicAttribute(string trackerUrl, string description) + /// The text string that describes what is + /// intended. + /// The url of a tracker issue containing more + /// details, discussion, and planning. + public UmbracoProposedPublicAttribute(string description, string trackerUrl) { - + /* empty */ } } } From 9e21a7251583897f0e2735009af84ffe0ad093d0 Mon Sep 17 00:00:00 2001 From: Mundairson Date: Mon, 16 Jul 2018 22:12:03 +0100 Subject: [PATCH 3/5] Changed the constructors so the two overloads have the same parameter in the same position. --- .../UmbracoWillObsoleteAttribute.cs | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Core/CodeAnnotations/UmbracoWillObsoleteAttribute.cs b/src/Umbraco.Core/CodeAnnotations/UmbracoWillObsoleteAttribute.cs index 7babe71469..bb0fd35fb9 100644 --- a/src/Umbraco.Core/CodeAnnotations/UmbracoWillObsoleteAttribute.cs +++ b/src/Umbraco.Core/CodeAnnotations/UmbracoWillObsoleteAttribute.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Umbraco.Core.CodeAnnotations { @@ -9,29 +6,35 @@ namespace Umbraco.Core.CodeAnnotations /// Marks the program elements that Umbraco will obsolete. /// /// - /// Indicates that Umbraco will obsolete the program element at some point in the future, but we do not want to - /// explicitely mark it [Obsolete] yet to avoid warning messages showing when developers compile Umbraco. + /// Indicates that Umbraco will obsolete the program element at some point + /// in the future, but we do not want to explicitly mark it [Obsolete] yet + /// to avoid warning messages showing when developers compile Umbraco. /// [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)] internal sealed class UmbracoWillObsoleteAttribute : Attribute { /// - /// Initializes a new instance of the class with a description. + /// Initializes a new instance of the + /// class with a description. /// - /// The text string that describes what is intended. + /// The text string that describes what is + /// intended. public UmbracoWillObsoleteAttribute(string description) { - + /* empty */ } /// - /// Initializes a new instance of the class with a tracker url and a description. + /// Initializes a new instance of the + /// class with a tracker url and a description. /// - /// The url of a tracker issue containing more details, discussion, and planning. - /// The text string that describes what is intended. - public UmbracoWillObsoleteAttribute(string trackerUrl, string description) + /// The text string that describes what is + /// intended. + /// The url of a tracker issue containing more + /// details, discussion, and planning. + public UmbracoWillObsoleteAttribute(string description, string trackerUrl) { - + /* empty */ } } } From d7d36c34bed349936fa9ecf795185439bc740dc9 Mon Sep 17 00:00:00 2001 From: Mundairson Date: Wed, 18 Jul 2018 14:29:10 +0100 Subject: [PATCH 4/5] Removed empty block comments. --- .../CodeAnnotations/UmbracoExperimentalFeatureAttribute.cs | 2 -- .../CodeAnnotations/UmbracoProposedPublicAttribute.cs | 2 -- .../CodeAnnotations/UmbracoWillObsoleteAttribute.cs | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/Umbraco.Core/CodeAnnotations/UmbracoExperimentalFeatureAttribute.cs b/src/Umbraco.Core/CodeAnnotations/UmbracoExperimentalFeatureAttribute.cs index 92e96fde7f..27d8b05c07 100644 --- a/src/Umbraco.Core/CodeAnnotations/UmbracoExperimentalFeatureAttribute.cs +++ b/src/Umbraco.Core/CodeAnnotations/UmbracoExperimentalFeatureAttribute.cs @@ -24,7 +24,6 @@ namespace Umbraco.Core.CodeAnnotations /// intended. public UmbracoExperimentalFeatureAttribute(string description) { - /* empty */ } /// @@ -37,7 +36,6 @@ namespace Umbraco.Core.CodeAnnotations /// details, discussion, and planning. public UmbracoExperimentalFeatureAttribute(string description, string trackerUrl) { - /* empty */ } } } diff --git a/src/Umbraco.Core/CodeAnnotations/UmbracoProposedPublicAttribute.cs b/src/Umbraco.Core/CodeAnnotations/UmbracoProposedPublicAttribute.cs index 8f15405cf8..fbd80a7613 100644 --- a/src/Umbraco.Core/CodeAnnotations/UmbracoProposedPublicAttribute.cs +++ b/src/Umbraco.Core/CodeAnnotations/UmbracoProposedPublicAttribute.cs @@ -25,7 +25,6 @@ namespace Umbraco.Core.CodeAnnotations /// intended. public UmbracoProposedPublicAttribute(string description) { - /* empty */ } /// @@ -38,7 +37,6 @@ namespace Umbraco.Core.CodeAnnotations /// details, discussion, and planning. public UmbracoProposedPublicAttribute(string description, string trackerUrl) { - /* empty */ } } } diff --git a/src/Umbraco.Core/CodeAnnotations/UmbracoWillObsoleteAttribute.cs b/src/Umbraco.Core/CodeAnnotations/UmbracoWillObsoleteAttribute.cs index bb0fd35fb9..65895cd2ff 100644 --- a/src/Umbraco.Core/CodeAnnotations/UmbracoWillObsoleteAttribute.cs +++ b/src/Umbraco.Core/CodeAnnotations/UmbracoWillObsoleteAttribute.cs @@ -21,7 +21,6 @@ namespace Umbraco.Core.CodeAnnotations /// intended. public UmbracoWillObsoleteAttribute(string description) { - /* empty */ } /// @@ -34,7 +33,6 @@ namespace Umbraco.Core.CodeAnnotations /// details, discussion, and planning. public UmbracoWillObsoleteAttribute(string description, string trackerUrl) { - /* empty */ } } } From 5fdaa451b82c9701686885261cd63e628c7123a6 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 19 Jul 2018 22:35:05 +1000 Subject: [PATCH 5/5] fixes null check on linkpicker changes with anchors, fixes ng-true-value constant value --- .../src/common/services/tinymce.service.js | 9 +++++++-- .../src/views/common/overlays/linkpicker/linkpicker.html | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) 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 21588c9ede..aa53626a78 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 @@ -761,9 +761,14 @@ function tinyMceService($log, imageHelper, $http, $timeout, macroResource, macro * @param {string} input the string to parse */ getAnchorNames: function (input) { - var anchorPattern = //gi; + var anchors = []; + if (!input) { + return anchors; + } + + var anchorPattern = //gi; var matches = input.match(anchorPattern); - var anchors = []; + if (matches) { anchors = matches.map(function (v) { diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html index e4ab635a44..5dd1275014 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html @@ -34,7 +34,7 @@