Merge branch origin/temp8 into temp8

This commit is contained in:
Stephan
2018-07-20 11:01:10 +02:00
2 changed files with 8 additions and 3 deletions

View File

@@ -761,9 +761,14 @@ function tinyMceService($log, imageHelper, $http, $timeout, macroResource, macro
* @param {string} input the string to parse
*/
getAnchorNames: function (input) {
var anchorPattern = /<a id=\\"(.*?)\\">/gi;
var anchors = [];
if (!input) {
return anchors;
}
var anchorPattern = /<a id=\\"(.*?)\\">/gi;
var matches = input.match(anchorPattern);
var anchors = [];
if (matches) {
anchors = matches.map(function (v) {

View File

@@ -34,7 +34,7 @@
<label class="checkbox no-indent">
<input type="checkbox"
ng-model="model.target.target"
ng-true-value="_blank"
ng-true-value="'_blank'"
ng-false-value="" /> <localize key="defaultdialogs_openInNewWindow">Opens the linked document in a new window or tab</localize>
</label>
</umb-control-group>