From 3d3160efdf38faf3c76b17fa26b18483ce625dd4 Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 10 May 2015 17:59:58 -0400 Subject: [PATCH] minor code review --- platform/firefox/vapi-background.js | 5 ++--- src/js/contentscript-end.js | 5 ++++- src/js/start.js | 11 ++++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js index 0e21ba2..a8dfcd8 100644 --- a/platform/firefox/vapi-background.js +++ b/platform/firefox/vapi-background.js @@ -1160,12 +1160,11 @@ var httpObserver = { // https://developer.mozilla.org/en-US/Firefox/Multiprocess_Firefox/Limitations_of_chrome_scripts tabIdFromChannel: function(channel) { var aWindow; - if ( channel.notificationCallbacks ) { try { var loadContext = channel - .notificationCallbacks - .getInterface(Ci.nsILoadContext); + .notificationCallbacks + .getInterface(Ci.nsILoadContext); if ( loadContext.topFrameElement ) { return vAPI.tabs.getTabId(loadContext.topFrameElement); } diff --git a/src/js/contentscript-end.js b/src/js/contentscript-end.js index 161b3cb..38a9dd2 100644 --- a/src/js/contentscript-end.js +++ b/src/js/contentscript-end.js @@ -150,6 +150,7 @@ var collapser = (function() { var srcProps = { 'img': 'src' }; + var reURLplaceholder = /\{\{url\}\}/g; var PendingRequest = function(target) { this.id = requestId++; @@ -207,7 +208,9 @@ var collapser = (function() { if ( tagName === 'iframe' ) { target.setAttribute( 'src', - 'data:text/html,' + encodeURIComponent(placeholders.iframe.replace('{{url}}', request.url)) + 'data:text/html,' + encodeURIComponent( + placeholders.iframe.replace(reURLplaceholder, request.url) + ) ); continue; } diff --git a/src/js/start.js b/src/js/start.js index 1ae8536..da9f610 100644 --- a/src/js/start.js +++ b/src/js/start.js @@ -67,8 +67,13 @@ var defaultLocalUserSettings = { 'padding: 2px;', 'white-space: nowrap;', '}', + 'a { ', + 'color: inherit;', + 'padding: 0 3px;', + 'text-decoration: none;', + '}', '', - '{{url}}', + '↑{{url}}', '' ].join(''), placeholderImage: 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7' @@ -97,9 +102,9 @@ var onAllDone = function() { if ( defaultLocalUserSettings.hasOwnProperty(key) === false ) { continue; } - if ( vAPI.localStorage.getItem(key) === null ) { + //if ( vAPI.localStorage.getItem(key) === null ) { vAPI.localStorage.setItem(key, defaultLocalUserSettings[key]); - } + //} } };