Merge branch 'master' into develop

2026-07-29 15:59:50 -05:00 · 2017-11-17 15:49:17 +01:00
parent 10fcf2f5be 6595be95eb
commit 0e44fe082b
177 changed files with 14293 additions and 1263 deletions
@@ -39,6 +39,8 @@ function (_, $, coreModule) {
            return;
          }

+          value = _.unescape(value);
+
          $scope.$apply(function() {
            var selected = _.find($scope.altSegments, {value: value});
            if (selected) {
@@ -46,6 +48,7 @@ function (_, $, coreModule) {
              segment.html = selected.html || selected.value;
              segment.fake = false;
              segment.expandable = selected.expandable;
+              segment.type = selected.type;
            }
            else if (segment.custom !== 'false') {
              segment.value = value;