code review

10 years ago · d32137ced0
parent 622d0a7e9d
commit d32137ced0
3 changed files with 11 additions and 10 deletions
--- a/src/js/contentscript-end.js
+++ b/src/js/contentscript-end.js
@ -184,7 +184,6 @@ var collapser = (function() {
        }
        var collapse = response.collapse;
        var placeholders = response.placeholders;
-        var background = placeholders.background;
        var i = requests.length;
        var request, entry, target, tagName;
        while ( i-- ) {
@ -201,15 +200,15 @@ var collapser = (function() {
            target = entry.target;
            if ( collapse ) {
                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
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@ -512,6 +512,7 @@ var onMessage = function(request, sender, callback) {
        if ( !response.collapse ) {
            response.placeholders = {
                background: vAPI.localStorage.getItem('placeholderBackground'),
+                border: vAPI.localStorage.getItem('placeholderBorder'),
                iframe: vAPI.localStorage.getItem('placeholderDocument'),
                img: vAPI.localStorage.getItem('placeholderImage')
            };
--- a/src/js/start.js
+++ b/src/js/start.js
@ -80,10 +80,11 @@ var defaultLocalUserSettings = {
                'rgba(0,0,0,0.02)',
            ') center center / 10px 10px repeat scroll'
        ].join(''),
+    placeholderBorder: '1px solid rgba(0, 0, 0, 0.05)',
    placeholderDocument: [
            'data:text/html,',
            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>'),
            '{{url}}',
            encodeURIComponent('</body></html>')