From 783a89f458664a48efd3138662718fe24d8809cc Mon Sep 17 00:00:00 2001 From: "Lam, Doris T (393A)" Date: Wed, 19 Sep 2018 10:15:50 -0700 Subject: [PATCH] allow html in names --- app/partials/mms/pane-left.html | 2 +- src/directives/mmsTranscludeName.js | 2 +- src/directives/mmsViewImg.js | 2 +- src/directives/mmsViewLink.js | 2 +- src/directives/templates/mmsSpec.html | 2 +- src/directives/templates/mmsTree.html | 2 +- src/directives/templates/mmsViewSection.html | 4 ++-- src/services/UtilsService.js | 18 +++++++++--------- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/partials/mms/pane-left.html b/app/partials/mms/pane-left.html index f3c3f9686..2357358f0 100644 --- a/app/partials/mms/pane-left.html +++ b/app/partials/mms/pane-left.html @@ -27,7 +27,7 @@

List of {{view.title}}

- {{row.data._veNumber}} {{row.data.name}} + {{row.data._veNumber}} diff --git a/src/directives/mmsTranscludeName.js b/src/directives/mmsTranscludeName.js index 8ce83ddc7..ef4c16964 100644 --- a/src/directives/mmsTranscludeName.js +++ b/src/directives/mmsTranscludeName.js @@ -31,7 +31,7 @@ angular.module('mms.directives') function mmsTranscludeName(ElementService, UxService, $compile, growl, $templateCache, Utils, ViewService) { var template = $templateCache.get('mms/templates/mmsTranscludeName.html'); - var defaultTemplate = '{{element.name}}(no name)'; + var defaultTemplate = '(no name)'; var editTemplate = '{{edit.name}}(no name)'; var mmsTranscludeNameLink = function(scope, domElement, attrs, controllers) { diff --git a/src/directives/mmsViewImg.js b/src/directives/mmsViewImg.js index 975c86366..5616ed782 100644 --- a/src/directives/mmsViewImg.js +++ b/src/directives/mmsViewImg.js @@ -4,7 +4,7 @@ angular.module('mms.directives') .directive('mmsViewImg', [mmsViewImg]); function mmsViewImg() { - var template = '
Figure {{mmsPe._veNumber}}. {{image.title || mmsPe.name}}
'; + var template = '
Figure {{mmsPe._veNumber}}.
'; return { restrict: 'E', template: template, diff --git a/src/directives/mmsViewLink.js b/src/directives/mmsViewLink.js index d6fc18f64..e41fda11a 100644 --- a/src/directives/mmsViewLink.js +++ b/src/directives/mmsViewLink.js @@ -149,7 +149,7 @@ function mmsViewLink(ElementService, UtilsService, $compile, growl, ViewService, suppressNumbering: '<' }, require: ['?^^mmsCf', '?^^mmsView'], - template: '{{linkText}}{{type}}{{element._veNumber}}{{suffix}}{{name || "Unnamed View"}}' + + template: '{{linkText}}{{type}}{{element._veNumber}}{{suffix}}' + '', link: mmsViewLinkLink }; diff --git a/src/directives/templates/mmsSpec.html b/src/directives/templates/mmsSpec.html index e0d0442ff..2bfdfd53b 100644 --- a/src/directives/templates/mmsSpec.html +++ b/src/directives/templates/mmsSpec.html @@ -101,7 +101,7 @@

Commit

Element not found: displaying last found content
-

{{element.name}}

+

Last modified {{element._modified | date:'M/d/yy h:mm a'}} by {{element._modifier}}
diff --git a/src/directives/templates/mmsTree.html b/src/directives/templates/mmsTree.html index 10e86a36d..8affd2a49 100644 --- a/src/directives/templates/mmsTree.html +++ b/src/directives/templates/mmsTree.html @@ -6,7 +6,7 @@ - {{row.section}} {{row.branch.data.name}} + {{row.section}}
diff --git a/src/directives/templates/mmsViewSection.html b/src/directives/templates/mmsViewSection.html index 3afe58db1..8a20df226 100644 --- a/src/directives/templates/mmsViewSection.html +++ b/src/directives/templates/mmsViewSection.html @@ -1,7 +1,7 @@
-

{{section._veNumber}} {{section.name}}

-

{{section._veNumber}} {{edit.name}}

+

{{section._veNumber}}

+

{{section._veNumber}}

diff --git a/src/services/UtilsService.js b/src/services/UtilsService.js index 8e27e85ee..ba7612e94 100644 --- a/src/services/UtilsService.js +++ b/src/services/UtilsService.js @@ -488,7 +488,7 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _ var makeHtmlTable = function(table, isFilterable, isSortable, pe) { var result = ['']; if (ApplicationService.getState().inDoc && !table.excludeFromList) { - result.push(''); + result.push(''); } else if (table.title) { result.push(''); } @@ -818,8 +818,8 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _ //ob.tableCount++; prefix = 'Table ' + veNumber + '. '; var capTbl = el.find('table > caption'); - name = capTbl.text(); - if (name !== "" && name.indexOf('Table') === 0 && name.split('. ').length > 0) { + name = capTbl.html(); + if (name && name.indexOf('Table') === 0 && name.split('. ').length > 0) { name = name.substring(name.indexOf(prefix) + prefix.length); } else if (name === "") { name = pe.name; @@ -844,8 +844,8 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _ //ob.figureCount++; prefix = 'Figure ' + veNumber + '. '; var capFig = el.find('figure > figcaption'); - name = capFig.text(); - if (name !== "" && name.indexOf('Figure') === 0 && name.split('. ').length > 0) { + name = capFig.html(); + if (name && name.indexOf('Figure') === 0 && name.split('. ').length > 0) { name = name.substring(name.indexOf(prefix) + prefix.length); } else if (name === "") { name = pe.name; @@ -898,8 +898,8 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _ if (type === 'table') { prefix = 'Table ' + veNumber + '. '; var capTbl = el.find('table > caption'); - name = capTbl.text(); - if (name !== "" && name.indexOf('Table') === 0 && name.split('. ').length > 0) { + name = capTbl.html(); + if (name && name.indexOf('Table') === 0 && name.split('. ').length > 0) { name = name.substring(name.indexOf(prefix) + prefix.length); } else if (name === "") { name = pe.name; @@ -914,8 +914,8 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _ if (type === 'figure') { prefix = 'Figure ' + veNumber + '. '; var capFig = el.find('figure > figcaption'); - name = capFig.text(); - if (name !== "" && name.indexOf('Figure') === 0 && name.split('. ').length > 0) { + name = capFig.html(); + if (name && name.indexOf('Figure') === 0 && name.split('. ').length > 0) { name = name.substring(name.indexOf(prefix) + prefix.length); } else if (name === "") { name = pe.name;
Table {{mmsPe._veNumber}}. {{table.title || mmsPe.name}}Table {{mmsPe._veNumber}}. ' + table.title + '