OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 'use strict'; | 5 'use strict'; |
6 | 6 |
7 /** | 7 /** |
8 * @constructor | 8 * @constructor |
9 */ | 9 */ |
10 function MessageWindowImpl() { | 10 function MessageWindowImpl() { |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 typeof(showSpinner) != 'boolean') { | 98 typeof(showSpinner) != 'boolean') { |
99 console.log('Bad show message:', event.data); | 99 console.log('Bad show message:', event.data); |
100 break; | 100 break; |
101 } | 101 } |
102 | 102 |
103 // Set the dialog text. | 103 // Set the dialog text. |
104 var button = document.getElementById('button-primary'); | 104 var button = document.getElementById('button-primary'); |
105 var cancelButton = document.getElementById('button-secondary'); | 105 var cancelButton = document.getElementById('button-secondary'); |
106 var messageDiv = document.getElementById('message'); | 106 var messageDiv = document.getElementById('message'); |
107 var infoboxDiv = document.getElementById('infobox'); | 107 var infoboxDiv = document.getElementById('infobox'); |
| 108 |
108 document.getElementById('title').innerText = title; | 109 document.getElementById('title').innerText = title; |
109 document.querySelector('title').innerText = title; | 110 document.querySelector('title').innerText = title; |
110 messageDiv.innerText = message; | 111 |
| 112 // Convert new line characters to <br/> elements. |
| 113 var escapedHTML = base.escapeHTML(message); |
| 114 messageDiv.innerHTML = escapedHTML.replace(/\n/g, '<br/>'); |
| 115 |
111 if (showSpinner) { | 116 if (showSpinner) { |
112 messageDiv.classList.add('waiting'); | 117 messageDiv.classList.add('waiting'); |
113 messageDiv.classList.add('prominent'); | 118 messageDiv.classList.add('prominent'); |
114 } | 119 } |
115 if (infobox != '') { | 120 if (infobox != '') { |
116 infoboxDiv.innerText = infobox; | 121 infoboxDiv.innerText = infobox; |
117 } else { | 122 } else { |
118 infoboxDiv.hidden = true; | 123 infoboxDiv.hidden = true; |
119 } | 124 } |
120 | 125 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 | 159 |
155 this.updateSize_(); | 160 this.updateSize_(); |
156 break; | 161 break; |
157 | 162 |
158 default: | 163 default: |
159 console.error('Unexpected message:', event.data); | 164 console.error('Unexpected message:', event.data); |
160 } | 165 } |
161 }; | 166 }; |
162 | 167 |
163 var messageWindow = new MessageWindowImpl(); | 168 var messageWindow = new MessageWindowImpl(); |
OLD | NEW |