brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

messageTray: Remove _fixMarkup() function

Browse Source 
Commit 053e54f944 copied it to calendar, and since commit 15e42c4d5,
the original is no longer used.
This commit is contained in:
Florian Müllner 2015-06-11 14:39:36 +02:00
parent f300462003
commit 01374989b1
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/messageTray.js
View File

@ -69,26 +69,6 @@ const Urgency = {
CRITICAL: 3 CRITICAL: 3
}; };
function _fixMarkup(text, allowMarkup) {
if (allowMarkup) {
// Support &, ", ', < and >, escape all other
// occurrences of '&'.
let _text = text.replace(/&(?!amp;|quot;|apos;|lt;|gt;)/g, '&');
// Support <b>, <i>, and <u>, escape anything else
// so it displays as raw markup.
_text = _text.replace(/<(?!\/?[biu]>)/g, '&lt;');
try {
Pango.parse_markup(_text, -1, '');
return _text;
} catch (e) {}
}
// !allowMarkup, or invalid markup
return GLib.markup_escape_text(text, -1);
}
const FocusGrabber = new Lang.Class({ const FocusGrabber = new Lang.Class({
Name: 'FocusGrabber', Name: 'FocusGrabber',

8
tests/unit/markup.js
View File

@ -1,6 +1,6 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
// Test cases for MessageTray markup parsing // Test cases for Calendar markup parsing
const JsUnit = imports.jsUnit; const JsUnit = imports.jsUnit;
const Pango = imports.gi.Pango; const Pango = imports.gi.Pango;
@ -8,7 +8,7 @@ const Pango = imports.gi.Pango;
const Environment = imports.ui.environment; const Environment = imports.ui.environment;
Environment.init(); Environment.init();
const MessageTray = imports.ui.messageTray; const Calendar = imports.ui.calendar;
// Assert that @input, assumed to be markup, gets "fixed" to @output, // Assert that @input, assumed to be markup, gets "fixed" to @output,
// which is valid markup. If @output is null, @input is expected to // which is valid markup. If @output is null, @input is expected to
@ -16,7 +16,7 @@ const MessageTray = imports.ui.messageTray;
function assertConverts(input, output) { function assertConverts(input, output) {
if (!output) if (!output)
output = input; output = input;
let fixed = MessageTray._fixMarkup(input, true); let fixed = Calendar._fixMarkup(input, true);
JsUnit.assertEquals(output, fixed); JsUnit.assertEquals(output, fixed);
let parsed = false; let parsed = false;
@ -30,7 +30,7 @@ function assertConverts(input, output) {
// Assert that @input, assumed to be plain text, gets escaped to @output, // Assert that @input, assumed to be plain text, gets escaped to @output,
// which is valid markup. // which is valid markup.
function assertEscapes(input, output) { function assertEscapes(input, output) {
let fixed = MessageTray._fixMarkup(input, false); let fixed = Calendar._fixMarkup(input, false);
JsUnit.assertEquals(output, fixed); JsUnit.assertEquals(output, fixed);
let parsed = false; let parsed = false;