small compatibility fix to make legacy dialogs (mostly) work (#2310)

This commit is contained in:
Andrew Henry 2019-03-14 13:31:42 -07:00 committed by Deep Tailor
parent f77c6c821c
commit b72ad529aa
4 changed files with 48 additions and 10 deletions

View File

@ -28,6 +28,7 @@ define([
"./res/templates/dialog.html", "./res/templates/dialog.html",
"./res/templates/overlay-blocking-message.html", "./res/templates/overlay-blocking-message.html",
"./res/templates/message.html", "./res/templates/message.html",
"./res/templates/notification-message.html",
"./res/templates/overlay-message-list.html", "./res/templates/overlay-message-list.html",
"./res/templates/overlay.html", "./res/templates/overlay.html",
'legacyRegistry' 'legacyRegistry'
@ -39,6 +40,7 @@ define([
dialogTemplate, dialogTemplate,
overlayBlockingMessageTemplate, overlayBlockingMessageTemplate,
messageTemplate, messageTemplate,
notificationMessageTemplate,
overlayMessageListTemplate, overlayMessageListTemplate,
overlayTemplate, overlayTemplate,
legacyRegistry legacyRegistry
@ -88,6 +90,10 @@ define([
"key": "message", "key": "message",
"template": messageTemplate "template": messageTemplate
}, },
{
"key": "notification-message",
"template": notificationMessageTemplate
},
{ {
"key": "overlay-message-list", "key": "overlay-message-list",
"template": overlayMessageListTemplate "template": overlayMessageListTemplate

View File

@ -2,24 +2,31 @@
ng-class="'message-severity-' + ngModel.severity"> ng-class="'message-severity-' + ngModel.severity">
<div class="w-message-contents"> <div class="w-message-contents">
<div class="top-bar"> <div class="top-bar">
<div class="title">{{ngModel.message}}</div> <div class="title">{{ngModel.title}}</div>
</div>
<div class="hint" ng-hide="ngModel.hint === undefined">
{{ngModel.hint}}
<span ng-if="ngModel.timestamp !== undefined">[{{ngModel.timestamp}}]</span>
</div> </div>
<div class="message-body"> <div class="message-body">
<div class="message-action">
{{ngModel.actionText}}
</div>
<mct-include key="'progress-bar'" <mct-include key="'progress-bar'"
ng-model="ngModel" ng-model="ngModel"
ng-show="ngModel.progressPerc !== undefined"></mct-include> ng-show="ngModel.progress !== undefined || ngModel.unknownProgress"></mct-include>
</div> </div>
<div class="bottom-bar"> <div class="bottom-bar">
<a ng-repeat="dialogOption in ngModel.options" <a ng-repeat="dialogOption in ngModel.options"
class="s-button" class="s-button"
ng-click="dialogOption.callback()"> ng-click="dialogOption.callback()">
{{dialogOption.label}} {{dialogOption.label}}
</a> </a>
<a class="s-button major" <a class="s-button major"
ng-if="ngModel.primaryOption" ng-if="ngModel.primaryOption"
ng-click="ngModel.primaryOption.callback()"> ng-click="ngModel.primaryOption.callback()">
{{ngModel.primaryOption.label}} {{ngModel.primaryOption.label}}
</a> </a>
</div> </div>
</div> </div>
</div> </div>

View File

@ -0,0 +1,25 @@
<div class="l-message"
ng-class="'message-severity-' + ngModel.severity">
<div class="w-message-contents">
<div class="top-bar">
<div class="title">{{ngModel.message}}</div>
</div>
<div class="message-body">
<mct-include key="'progress-bar'"
ng-model="ngModel"
ng-show="ngModel.progressPerc !== undefined"></mct-include>
</div>
<div class="bottom-bar">
<a ng-repeat="dialogOption in ngModel.options"
class="s-button"
ng-click="dialogOption.callback()">
{{dialogOption.label}}
</a>
<a class="s-button major"
ng-if="ngModel.primaryOption"
ng-click="ngModel.primaryOption.callback()">
{{ngModel.primaryOption.label}}
</a>
</div>
</div>
</div>

View File

@ -9,7 +9,7 @@
<div class="w-messages"> <div class="w-messages">
<mct-include <mct-include
ng-repeat="msg in ngModel.dialog.messages | orderBy: '-'" ng-repeat="msg in ngModel.dialog.messages | orderBy: '-'"
key="'message'" ng-model="msg.model"></mct-include> key="'notification-message'" ng-model="msg.model"></mct-include>
</div> </div>
<div class="bottom-bar"> <div class="bottom-bar">
<a ng-repeat="dialogAction in ngModel.dialog.actions" <a ng-repeat="dialogAction in ngModel.dialog.actions"