diff --git a/source/glimpse.hud.js b/source/glimpse.hud.js index e714348..19d6947 100644 --- a/source/glimpse.hud.js +++ b/source/glimpse.hud.js @@ -319,11 +319,11 @@ } details.timings.data.unshift({ - description: 'Request: ' + (window.location.pathname + window.location.search), - title: (window.location.pathname + window.location.search), + description: 'Request: ' + $('
').text(window.location.pathname + window.location.search).html(), + title: $('
').text(window.location.pathname + window.location.search).html(), startTime: 'NOT SURE', duration: rootDuration, - startPoint: '0.0', + startPoint: 0.0, category: 'Request', childlessDuration: Math.round(rootChildlessDuration * 10) / 10, startPercent: 0, diff --git a/source/glimpse.render.js b/source/glimpse.render.js index 0e44df2..07f8923 100644 --- a/source/glimpse.render.js +++ b/source/glimpse.render.js @@ -23,8 +23,10 @@ glimpse.render = (function($, pubsub, util, data, settings) { }, getCss = function() { var content = templates.css.replace(/url\(\)/gi, 'url(' + generateSpriteAddress() + ')'); + var stylenode = $(''); + stylenode.text('/*<[CDATA[*/ ' + content + ' /*]]>*/'); - return ''; + return stylenode; }, getHtml = function() { return templates.html; @@ -45,7 +47,7 @@ glimpse.render = (function($, pubsub, util, data, settings) { pubsub.publish('action.template.processing', { templates: templates }); pubsub.publish('action.shell.loading'); - $(getCss()).appendTo('head'); + $(getCss()).appendTo('head'); $(getHtml()).appendTo('body'); pubsub.publish('action.shell.loaded'); diff --git a/source/glimpse.render.shell.info.html b/source/glimpse.render.shell.info.html index 1920e11..5f9ba39 100644 --- a/source/glimpse.render.shell.info.html +++ b/source/glimpse.render.shell.info.html @@ -6,11 +6,11 @@
Go to your Glimpse Config page Glimpse.axd
For more info see http://getGlimpse.com
- Created by Anthony van der Hoorn (@anthony_vdh) and Nik Molnar (@nikmd23)   - © getglimpse.com 2011 + Created by Anthony van der Hoorn (@anthony_vdh) and Nik Molnar (@nikmd23)   - © getglimpse.com 2011
- Have a feature request? Submit the idea.     - Found an error? Help us improve.     - Have a question? Tweet us using #glimpse.     + Have a feature request? Submit the idea.     + Found an error? Help us improve.     + Have a question? Tweet us using #glimpse.     Want to help? Join our developer mailing list.
diff --git a/source/glimpse.shell.title.js b/source/glimpse.shell.title.js index 07d4de8..43a730b 100644 --- a/source/glimpse.shell.title.js +++ b/source/glimpse.shell.title.js @@ -1,7 +1,7 @@ (function($, pubsub, data, elements) { var renderLayout = function() { var requestData = data.currentData(), - name = requestData.clientId ? '"' + requestData.clientId + '"' : ' '; + name = requestData.clientId ? '"' + requestData.clientId + '"' : ' '; elements.titleHolder().find('.glimpse-snapshot-name').html(name); elements.titleHolder().find('.glimpse-uri').text(requestData.uri); diff --git a/source/glimpse.timeline.shell.css b/source/glimpse.timeline.shell.css index 5c723fc..6093f49 100644 --- a/source/glimpse.timeline.shell.css +++ b/source/glimpse.timeline.shell.css @@ -31,7 +31,7 @@ background: -webkit-linear-gradient(top, #cfcfcf 0%,#dddddd 100%); background: -o-linear-gradient(top, #cfcfcf 0%,#dddddd 100%); background: -ms-linear-gradient(top, #cfcfcf 0%,#dddddd 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr=\'#cfcfcf\', endColorstr=\'#dddddd\',GradientType=0 ); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient( startColorstr=\'#cfcfcf\', endColorstr=\'#dddddd\',GradientType=0 )"; background: linear-gradient(top, #cfcfcf 0%,#dddddd 100%); -webkit-box-shadow: inset 0px 1px 0px 0px #E2E2E2; -moz-box-shadow: inset 0px 1px 0px 0px #E2E2E2; diff --git a/source/glimpse.util.js b/source/glimpse.util.js index 1fedcf6..339d5ea 100644 --- a/source/glimpse.util.js +++ b/source/glimpse.util.js @@ -58,7 +58,7 @@ glimpse.util = (function($) { localStorage.setItem(key, JSON.stringify(value)); }, htmlEncode: function (value) { - return !(value == null) ? value.replace(/&/g, '&').replace(/"/g, '"').replace(/'/g, ''').replace(//g, '>') : ''; + return !(value == null) ? value.replace(/&/g, '&').replace(/"/g, '4').replace(/'/g, ''').replace(//g, '>') : ''; }, jsEncode: function (value) { return !(value == null) ? value.replace(/\\/g, '\\\\').replace(/"/g, '\"') : ''; @@ -68,7 +68,7 @@ glimpse.util = (function($) { value = value.toString(); if (!value) return ''; - return value.replace(/\r\n/g, '
').replace(/\n/g, '
').replace(/\t/g, '    ').replace(/ /g, '  '); + return value.replace(/\r\n/g, '
').replace(/\n/g, '
').replace(/\t/g, '    ').replace(/ /g, '  '); }, lengthJson: function (data) { var count = 0;