diff --git a/goon/browserassets/html/browserOutput.html b/goon/browserassets/html/browserOutput.html index d6a97b35c8d..feaa5f0ecda 100644 --- a/goon/browserassets/html/browserOutput.html +++ b/goon/browserassets/html/browserOutput.html @@ -6,11 +6,25 @@ - - - + + + + + + + + + + + + +
@@ -41,5 +55,13 @@
+ + \ No newline at end of file diff --git a/goon/browserassets/js/browserOutput.js b/goon/browserassets/js/browserOutput.js index 8a2ee996fda..0192959f92a 100644 --- a/goon/browserassets/js/browserOutput.js +++ b/goon/browserassets/js/browserOutput.js @@ -104,9 +104,13 @@ function setHighlightColor(match) { //Highlights words based on user settings function highlightTerms(el) { + var element = $(el) + if(!(element.mark)) { // mark.js isn't loaded; give up + return + } for (var i = 0; i < opts.highlightTerms.length; i++) { //Each highlight term if(opts.highlightTerms[i]) { - $(el).mark(opts.highlightTerms[i], {"element" : "span", "each" : setHighlightColor}); + element.mark(opts.highlightTerms[i], {"element" : "span", "each" : setHighlightColor}); } } } @@ -808,6 +812,10 @@ $(function() { }); $('#highlightTerm').click(function(e) { + if(!($().mark)) { + output('Highlighting is disabled. You are probably using Internet Explorer 8 and need to update.', 'internal'); + return; + } if ($('.popup .highlightTerm').is(':visible')) {return;} var termInputs = ''; for (var i = 0; i < opts.highlightLimit; i++) {