Remove favicon from UI and shot model. (#4796)

mozilla-services · Sep 11, 2018 · c030dec · c030dec
1 parent a9a6d02
commit c030dec
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 47 deletions.
diff --git a/docs/testing-the-api.md b/docs/testing-the-api.md
@@ -65,7 +65,6 @@ Authenticated.  Creates or updates a shot.  Takes a JSON body.  Looks like:
   "url": "https://github.com/mozilla-services/screenshots/issues/1237",
   "docTitle": "Screenshots erases everything in my clipboard · Issue #1237 · mozilla-services/pageshot",
   "createdDate": 1468983767525,
-  "favicon": "https://assets-cdn.github.com/favicon.ico",
   "images": [
     {
       "url": "https://cloud.githubusercontent.com/assets/557895/16748439/efdbf0a0-4778-11e6-9a33-d1043238addf.png",

diff --git a/server/src/pages/shot/model.js b/server/src/pages/shot/model.js
@@ -1,4 +1,4 @@
-const { createProxyUrl, createDownloadUrl } = require("../../proxy-url");
+const { createDownloadUrl } = require("../../proxy-url");
 const { getGitRevision } = require("../../linker");
 const MobileDetect = require("mobile-detect");
 
@@ -10,9 +10,6 @@ exports.createModel = function(req) {
   if (clip) {
     downloadUrl = createDownloadUrl(clip.image.url, req.shot.filename);
   }
-  if (req.shot.favicon) {
-    req.shot.favicon = createProxyUrl(req, req.shot.favicon);
-  }
   const title = req.getText("shotPageTitle", {originalTitle: req.shot.title});
   const enableAnnotations = req.config.enableAnnotations;
   const isFxaAuthenticated = req.accountId && req.accountId === req.shot.accountId;

diff --git a/server/src/pages/shotindex/model.js b/server/src/pages/shotindex/model.js
@@ -20,9 +20,6 @@ exports.createModel = function(req) {
   serverModel.enableUserSettings = req.config.enableUserSettings;
   let shots = req.shots;
   for (const shot of shots || []) {
-    if (shot.favicon) {
-      shot.favicon = createProxyUrl(req, shot.favicon);
-    }
     const clip = shot.getClip(shot.clipNames()[0]);
     if (clip) {
       serverModel.downloadUrls[shot.id] = createDownloadUrl(clip.image.url, shot.filename);

diff --git a/server/src/pages/shotindex/view.js b/server/src/pages/shotindex/view.js
@@ -321,12 +321,6 @@ class Card extends React.Component {
       imageUrl = this.props.staticLink("img/question-mark.svg");
     }
 
-    let favicon = null;
-    if (shot.favicon) {
-      // We use background-image so if the image is broken it just doesn't show:
-      favicon = <div style={{backgroundImage: `url("${shot.favicon}")`}} className="favicon" />;
-    }
-
     let neverExpireIndicator = null;
     if (!shot.expireTime) {
       if (this.props.hasFxa) {
@@ -356,7 +350,6 @@ class Card extends React.Component {
             <h4>{this.displayTitle(shot.title)}</h4>
           </div>
           <div className="link-container">
-            {favicon}
             <div className="shot-url">
               {shot.urlDisplay}
             </div>

diff --git a/shared/shot.js b/shared/shot.js
@@ -191,7 +191,6 @@ class AbstractShot {
     this.docTitle = attrs.docTitle || null;
     this.userTitle = attrs.userTitle || null;
     this.createdDate = attrs.createdDate || Date.now();
-    this.favicon = attrs.favicon || null;
     this.siteName = attrs.siteName || null;
     this.images = [];
     if (attrs.images) {
@@ -458,15 +457,6 @@ class AbstractShot {
     this._createdDate = val;
   }
 
-  get favicon() {
-    return this._favicon;
-  }
-  set favicon(val) {
-    // We set the favicon with tabs.Tab.faviConUrl, which is a full URL.
-    val = val || null;
-    this._favicon = val;
-  }
-
   clipNames() {
     const names = Object.getOwnPropertyNames(this._clips);
     names.sort(function(a, b) {
@@ -566,7 +556,7 @@ class AbstractShot {
 }
 
 AbstractShot.prototype.REGULAR_ATTRS = (`
-origin fullUrl docTitle userTitle createdDate favicon images
+origin fullUrl docTitle userTitle createdDate images
 siteName openGraph twitterCard documentSize
 thumbnail abTests
 `).split(/\s+/g);
@@ -575,12 +565,11 @@ thumbnail abTests
 AbstractShot.prototype.DEPRECATED_ATTRS = (`
 microdata history ogTitle createdDevice head body htmlAttrs bodyAttrs headAttrs
 readable hashtags comments showPage isPublic resources deviceId url
-fullScreenThumbnail
+fullScreenThumbnail favicon
 `).split(/\s+/g);
 
 AbstractShot.prototype.RECALL_ATTRS = (`
-url docTitle userTitle createdDate favicon
-openGraph twitterCard images thumbnail
+url docTitle userTitle createdDate openGraph twitterCard images thumbnail
 `).split(/\s+/g);
 
 AbstractShot.prototype._OPENGRAPH_PROPERTIES = (`

diff --git a/static/css/frame.scss b/static/css/frame.scss
@@ -288,15 +288,6 @@
   }
 }
 
-// TODO: investigate favicons not appearing on dev, stage and prod
-.favicon {
-  background-size: 16px 16px;
-  display: none;
-  height: 16px;
-  margin-right: 6px;
-  width: 16px;
-}
-
 .shot-title-input {
   border-radius: $border-radius;
   border: 1px solid $active-blue;

diff --git a/static/css/shot-index.scss b/static/css/shot-index.scss
@@ -221,15 +221,6 @@ h1 {
   .link-container {
     @include flex-container(row, flex-start, center);
 
-    // TODO: investigate favicons not appearing on dev, stage and prod
-    .favicon {
-      background-size: 16px 16px;
-      display: none;
-      flex: 0 0 16px;
-      height: 16px;
-      margin-right: 6px;
-    }
-
     .shot-url {
       color: $link-medium;
       font-size: 12px;