Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions source/glimpse.hud.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: ' + $('<div/>').text(window.location.pathname + window.location.search).html(),
title: $('<div/>').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,
Expand Down
6 changes: 4 additions & 2 deletions source/glimpse.render.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ glimpse.render = (function($, pubsub, util, data, settings) {
},
getCss = function() {
var content = templates.css.replace(/url\(\)/gi, 'url(' + generateSpriteAddress() + ')');
var stylenode = $('<style type="text/css"></style>');
stylenode.text('/*<[CDATA[*/ ' + content + ' /*]]>*/');

return '<style type="text/css"> ' + content + ' </style>';
return stylenode;
},
getHtml = function() {
return templates.html;
Expand All @@ -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');
Expand Down
8 changes: 4 additions & 4 deletions source/glimpse.render.shell.info.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<div class="glimpse-info-more">Go to your Glimpse Config page <a href="' + util.uriTemplate(data.currentMetadata().resources.glimpse_config) + '" target="_blank">Glimpse.axd</a></div>
<div class="glimpse-info-more">For more info see <a href="http://getGlimpse.com" target="_blank">http://getGlimpse.com</a></div>
<div style="margin:1.5em 0 0.5em;">
Created by <strong>Anthony van der Hoorn</strong> (<a href="http://twitter.com/anthony_vdh" target="_blank">@anthony_vdh</a>) and <strong>Nik Molnar</strong> (<a href="http://twitter.com/nikmd23" target="_blank">@nikmd23</a>) &nbsp; - &copy; getglimpse.com 2011
Created by <strong>Anthony van der Hoorn</strong> (<a href="http://twitter.com/anthony_vdh" target="_blank">@anthony_vdh</a>) and <strong>Nik Molnar</strong> (<a href="http://twitter.com/nikmd23" target="_blank">@nikmd23</a>) &#xa0; - &#xa9; getglimpse.com 2011
</div>
<div>
Have a <em>feature</em> request? <a href="http://getglimpse.uservoice.com" target="_blank">Submit the idea</a>. &nbsp; &nbsp;
Found an <em>error</em>? <a href="https://github.com/glimpse/glimpse/issues" target="_blank">Help us improve</a>. &nbsp; &nbsp;
Have a <em>question</em>? <a href="http://twitter.com/#search?q=%23glimpse" target="_blank">Tweet us using #glimpse</a>. &nbsp; &nbsp;
Have a <em>feature</em> request? <a href="http://getglimpse.uservoice.com" target="_blank">Submit the idea</a>. &#xa0; &#xa0;
Found an <em>error</em>? <a href="https://github.com/glimpse/glimpse/issues" target="_blank">Help us improve</a>. &#xa0; &#xa0;
Have a <em>question</em>? <a href="http://twitter.com/#search?q=%23glimpse" target="_blank">Tweet us using #glimpse</a>. &#xa0; &#xa0;
Want to <em>help</em>? <a href="groups.google.com/group/getglimpse-dev" target="_blank">Join our developer mailing list</a>.
</div>
2 changes: 1 addition & 1 deletion source/glimpse.shell.title.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(function($, pubsub, data, elements) {
var renderLayout = function() {
var requestData = data.currentData(),
name = requestData.clientId ? '"' + requestData.clientId + '"' : '&nbsp;';
name = requestData.clientId ? '"' + requestData.clientId + '"' : '&#xa0;';

elements.titleHolder().find('.glimpse-snapshot-name').html(name);
elements.titleHolder().find('.glimpse-uri').text(requestData.uri);
Expand Down
2 changes: 1 addition & 1 deletion source/glimpse.timeline.shell.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions source/glimpse.util.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ glimpse.util = (function($) {
localStorage.setItem(key, JSON.stringify(value));
},
htmlEncode: function (value) {
return !(value == null) ? value.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/'/g, '&#39;').replace(/</g, '&lt;').replace(/>/g, '&gt;') : '';
return !(value == null) ? value.replace(/&/g, '&amp;').replace(/"/g, '&#x34;').replace(/'/g, '&#39;').replace(/</g, '&lt;').replace(/>/g, '&gt;') : '';
},
jsEncode: function (value) {
return !(value == null) ? value.replace(/\\/g, '\\\\').replace(/"/g, '\"') : '';
Expand All @@ -68,7 +68,7 @@ glimpse.util = (function($) {
value = value.toString();
if (!value)
return '';
return value.replace(/\r\n/g, '<br />').replace(/\n/g, '<br />').replace(/\t/g, '&nbsp; &nbsp; ').replace(/ /g, '&nbsp; ');
return value.replace(/\r\n/g, '<br />').replace(/\n/g, '<br />').replace(/\t/g, '&#xa0; &#xa0; ').replace(/ /g, '&#xa0; ');
},
lengthJson: function (data) {
var count = 0;
Expand Down