NNTP cleanup

chrome/browser/resources/new_new_tab.js

 
 // Helpers
 
 function $(id) {
   return document.getElementById(id);
 }
 
 // TODO(arv): Remove these when classList is available in HTML5.
 // https://bugs.webkit.org/show_bug.cgi?id=20709
 function hasClass(el, name) {
@@ skipping 712 matching lines @@
  *               'SyncLinkClicked').
  * linkurl: the URL to use as the element's href (only used if linkurlisset is
  *          true).
  */
 function syncMessageChanged(newMessage) {
   var syncStatusElement = $('sync-status');
   var style = syncStatusElement.style;
 
   // Hide the section if the message is emtpy.
   if (!newMessage.syncsectionisvisible) {
-    style.opacity = style.height = 0;
     return;
   }
-  style.height = '';
-  style.opacity = 1;
+  style.display = 'block';
 
   // Set the sync section background color based on the state.
-  if (newMessage.msgtype == "error") {
-    style.backgroundColor = "tomato";
-  } else if (newMessage.msgtype == "presynced") {
-    style.backgroundColor = "greenyellow";
+  if (newMessage.msgtype == 'error') {
+    style.backgroundColor = 'tomato';
   } else {
-    style.backgroundColor = "#CAFF70";
+    style.backgroundColor = '';
   }
 
   // Set the text for the header and sync message.
   var titleElement = syncStatusElement.firstElementChild;
   titleElement.textContent = newMessage.title;
   var messageElement = titleElement.nextElementSibling;
   messageElement.textContent = newMessage.msg;
 
-  // Set up the link if we should show one or hide it otherwise.
-  var linkContainer = messageElement.nextElementSibling;
-  var containerStyle = linkContainer.style;
-  var linkElement = linkContainer.firstElementChild;
-  linkElement.removeEventListener('click', syncSectionLinkClicked);
+  // Remove what comes after the message
+  while (messageElement.nextSibling) {
+    syncStatusElement.removeChild(messageElement.nextSibling);
+  }
 
-  // TODO(idana): when we don't have an URL to set, using an href is not a good
-  // idea because the user will still be able to right click on the link and
-  // open the empty href in a new tab/window.
-  //
-  // See http://code.google.com/p/chromium/issues/detail?id=19538 for more info
-  // about how to fix this.
-  linkElement.href = '';
-  containerStyle.display = 'none';
   if (newMessage.linkisvisible) {
-    containerStyle.display = '';
-    linkElement.textContent = newMessage.linktext;
-    // We don't listen to click events if the backend specified a target URL
-    // for the link.
+    var el;
     if (newMessage.linkurlisset) {
-      linkElement.href = newMessage.linkurl;
+      // Use a link
+      el = document.createElement('a');
+      el.href = newMessage.linkurl;
     } else {
-      linkElement.addEventListener('click', syncSectionLinkClicked);
+      el = document.createElement('button');
+      el.className = 'link';
+      el.addEventListener('click', syncSectionLinkClicked);
     }
+    el.textContent = newMessage.linktext;
+    syncStatusElement.appendChild(el);
   }
 }
 
 /**
  * Invoked when the link in the sync status section is clicked.
  */
 function syncSectionLinkClicked(e) {
   chrome.send('SyncLinkClicked');
   e.preventDefault();
 }
@@ skipping 31 matching lines @@
   $('themecss').href = 'chrome://theme/css/newtab.css?' + Date.now();
   updateAttribution();
 }
 
 function updateAttribution() {
   $('attribution-img').src = 'chrome://theme/theme_ntp_attribution?' +
       Date.now();
 }
 
 function bookmarkBarAttached() {
-  document.documentElement.setAttribute("bookmarkbarattached", "true");
+  document.documentElement.setAttribute('bookmarkbarattached', 'true');
 }
 
 function bookmarkBarDetached() {
-  document.documentElement.setAttribute("bookmarkbarattached", "false");
+  document.documentElement.setAttribute('bookmarkbarattached', 'false');
 }
 
 function viewLog() {
   var lines = [];
   var start = log[0][1];
 
   for (var i = 0; i < log.length; i++) {
     lines.push((log[i][1] - start) + ': ' + log[i][0]);
   }
 
@@ skipping 505 matching lines @@
 // This link allows user to make new tab page as homepage from the new tab
 // page itself (without going to Options dialog box).
 document.addEventListener('DOMContentLoaded', showSetAsHomepageLink);
 
 /**
  * The sync code is not yet built by default on all platforms so we have to
  * make sure we don't send the initial sync message to the backend unless the
  * backend told us that the sync code is present.
  */
 function callGetSyncMessageIfSyncIsPresent() {
-  if (document.documentElement.getAttribute("syncispresent") == "true") {
+  if (document.documentElement.getAttribute('syncispresent') == 'true') {
     chrome.send('GetSyncMessage');
   }
 }
 
-function setAsHomePageLinkClicked() {
+function setAsHomePageLinkClicked(e) {
   chrome.send('SetHomepageLinkClicked');
+  e.preventDefault();
 }
 
 function showSetAsHomepageLink() {
   var setAsHomepageElement = $('set-as-homepage');
   var style = setAsHomepageElement.style;
-  if (document.documentElement.getAttribute("showsetashomepage") != "true") {
+  if (document.documentElement.getAttribute('showsetashomepage') != 'true') {
     // Hide the section (if new tab page is already homepage).
-    style.opacity = style.height = 0;
     return;
   }
 
-  style.height = '';
-  style.opacity = 1;
-  var spanElement = setAsHomepageElement.firstElementChild;
-  var linkElement = spanElement.firstElementChild;
-  if (!linkElement) {
-    linkElement = document.createElement('a');
-    linkElement.href = '';
-    linkElement.textContent = localStrings.getString('makethishomepage');
-    linkElement.addEventListener('click', setAsHomePageLinkClicked);
-    spanElement.appendChild(linkElement);
-  }
+  style.display = 'block';
+  var buttonElement = setAsHomepageElement.firstElementChild;
+  buttonElement.addEventListener('click', setAsHomePageLinkClicked);
 }
 
 function hideAllMenus() {
   optionMenu.hide();
 }
 
 window.addEventListener('blur', hideAllMenus);
 window.addEventListener('keydown', function(e) {
   if (e.keyIdentifier == 'Alt' || e.keyIdentifier == 'Meta') {
     hideAllMenus();
@@ skipping 270 matching lines @@
       case Node.DOCUMENT_FRAGMENT_NODE:
       case Node.TEXT_NODE:
         break;
 
       default:
         throw Error('Node type ' + node.nodeType + ' is not supported');
     }
   });
   return df;
 }
+
+updateAttribution();