Browse Source

code review

pull/2/head
gorhill 10 years ago
parent
commit
d32137ced0
  1. 17
      src/js/contentscript-end.js
  2. 1
      src/js/messaging.js
  3. 3
      src/js/start.js

17
src/js/contentscript-end.js

@ -184,7 +184,6 @@ var collapser = (function() {
} }
var collapse = response.collapse; var collapse = response.collapse;
var placeholders = response.placeholders; var placeholders = response.placeholders;
var background = placeholders.background;
var i = requests.length; var i = requests.length;
var request, entry, target, tagName; var request, entry, target, tagName;
while ( i-- ) { while ( i-- ) {
@ -201,15 +200,15 @@ var collapser = (function() {
target = entry.target; target = entry.target;
if ( collapse ) { if ( collapse ) {
target.style.setProperty('display', 'none', 'important'); target.style.setProperty('display', 'none', 'important');
} else {
tagName = target.localName;
target.setAttribute(
srcProps[tagName],
placeholders[tagName].replace('{{url}}', request.url)
);
target.style.setProperty('border', '1px solid rgba(0,0,0,0.05)', 'important');
target.style.setProperty('background', background, 'important');
continue;
} }
tagName = target.localName;
target.setAttribute(
srcProps[tagName],
placeholders[tagName].replace('{{url}}', request.url)
);
target.style.setProperty('border', placeholders.border, 'important');
target.style.setProperty('background', placeholders.background, 'important');
} }
// Renew map: I believe that even if all properties are deleted, an // Renew map: I believe that even if all properties are deleted, an

1
src/js/messaging.js

@ -512,6 +512,7 @@ var onMessage = function(request, sender, callback) {
if ( !response.collapse ) { if ( !response.collapse ) {
response.placeholders = { response.placeholders = {
background: vAPI.localStorage.getItem('placeholderBackground'), background: vAPI.localStorage.getItem('placeholderBackground'),
border: vAPI.localStorage.getItem('placeholderBorder'),
iframe: vAPI.localStorage.getItem('placeholderDocument'), iframe: vAPI.localStorage.getItem('placeholderDocument'),
img: vAPI.localStorage.getItem('placeholderImage') img: vAPI.localStorage.getItem('placeholderImage')
}; };

3
src/js/start.js

@ -80,10 +80,11 @@ var defaultLocalUserSettings = {
'rgba(0,0,0,0.02)', 'rgba(0,0,0,0.02)',
') center center / 10px 10px repeat scroll' ') center center / 10px 10px repeat scroll'
].join(''), ].join(''),
placeholderBorder: '1px solid rgba(0, 0, 0, 0.05)',
placeholderDocument: [ placeholderDocument: [
'data:text/html,', 'data:text/html,',
encodeURIComponent('<html><head><style>'), encodeURIComponent('<html><head><style>'),
encodeURIComponent('body { color: gray; font: 12px sans-serif; margin: 0; padding: 2px; white-space: nowrap; }'),
encodeURIComponent('body { color: gray; font: 12px sans-serif; margin: 0; padding: 2px; white-space: nowrap; }'),
encodeURIComponent('</style></head><body>'), encodeURIComponent('</style></head><body>'),
'{{url}}', '{{url}}',
encodeURIComponent('</body></html>') encodeURIComponent('</body></html>')

Loading…
Cancel
Save