ntp4: apps apps apps...

chrome/browser/resources/ntp4/new_tab.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview New tab page
  * This is the main code for the new tab page used by touch-enabled Chrome
  * browsers.  For now this is still a prototype.
  */
 
@@ skipping 296 matching lines @@
     var pageNames = data.appPageNames;
 
     function stringListIsEmpty(list) {
       for (var i = 0; i < list.length; i++) {
         if (list[i])
           return false;
       }
       return true;
     }
 
-    if (!pageNames || stringListIsEmpty(pageNames))
-      pageNames = [localStrings.getString('appDefaultPageName')];
-
     // Sort by launch index
     apps.sort(function(a, b) {
       return a.app_launch_index - b.app_launch_index;
     });
 
     // An app to animate (in case it was just installed).
     var highlightApp;
 
     // Add the apps, creating pages as necessary
     for (var i = 0; i < apps.length; i++) {
       var app = apps[i];
       var pageIndex = (app.page_index || 0);
       while (pageIndex >= appsPages.length) {
-        var pageName = '';
+        var pageName = localStrings.getString('appDefaultPageName');
         if (appsPages.length < pageNames.length)
           pageName = pageNames[appsPages.length];
 
         var origPageCount = appsPages.length;
         appendTilePage(new ntp4.AppsPage(), pageName, true, bookmarksPage);
         // Confirm that appsPages is a live object, updated when a new page is
         // added (otherwise we'd have an infinite loop)
         assert(appsPages.length == origPageCount + 1, 'expected new page');
       }
 
@@ skipping 27 matching lines @@
   function appAdded(appData, opt_highlight) {
     if (appData.id == highlightAppId) {
       opt_highlight = true;
       highlightAppId = null;
     }
 
     var pageIndex = appData.page_index || 0;
 
     if (pageIndex >= appsPages.length) {
       while (pageIndex >= appsPages.length) {
-        appendTilePage(new ntp4.AppsPage(), '', true, bookmarksPage);
+        appendTilePage(new ntp4.AppsPage(),
+                       localStrings.getString('appDefaultPageName'), true,
+                       bookmarksPage);
       }
       updateSliderCards();
     }
 
     var page = appsPages[pageIndex];
     var app = $(appData.id);
     if (app)
       app.replaceAppData(appData);
     else
       page.appendApp(appData, opt_highlight);
@@ skipping 42 matching lines @@
   function appsPrefChangeCallback(data) {
     for (var i = 0; i < data.apps.length; ++i) {
       $(data.apps[i].id).appData = data.apps[i];
     }
 
     // Set the App dot names. Skip the first and last dots (Most Visited and
     // Bookmarks).
     var dots = dotList.getElementsByClassName('dot');
     // TODO(csilv): Remove this calcluation if/when we remove the flag for
     // for the bookmarks page.
-    var length = bookmarksPage ? dots.length - 2 : dots.Length - 1;
+    var length = bookmarksPage ? dots.length - 1 : dots.length;
     for (var i = 1; i < length; ++i) {
       dots[i].displayTitle = data.appPageNames[i - 1] || '';
     }
   }
 
   /**
    * Listener for offline status change events. Updates apps that are
    * not offline-enabled to be grayscale if the browser is offline.
    */
   function updateOfflineEnabledApps() {
@@ skipping 80 matching lines @@
     return null;
   }
 
   /**
    * Called whenever tiles should be re-arranging themselves out of the way of a
    * moving or insert tile.
    */
   function enterRearrangeMode() {
     var tempPage = new ntp4.AppsPage();
     tempPage.classList.add('temporary');
-    appendTilePage(tempPage, '', true, bookmarksPage);
+    appendTilePage(tempPage, localStrings.getString('appDefaultPageName'),
+                   true, bookmarksPage);
     var tempIndex = Array.prototype.indexOf.call(tilePages, tempPage);
     if (cardSlider.currentCard >= tempIndex)
       cardSlider.currentCard += 1;
     updateSliderCards();
 
     if (ntp4.getCurrentlyDraggingTile().firstChild.canBeRemoved())
       $('footer').classList.add('showing-trash-mode');
   }
 
   /**
    * Invoked whenever some app is released
    * @param {Grabber.Event} e The Grabber RELEASE event.
    */
   function leaveRearrangeMode(e) {
     var tempPage = document.querySelector('.tile-page.temporary');
     var dot = tempPage.navigationDot;
     if (!tempPage.tileCount && tempPage != cardSlider.currentCardValue) {
       dot.animateRemove();
       var tempIndex = Array.prototype.indexOf.call(tilePages, tempPage);
       if (cardSlider.currentCard > tempIndex)
         cardSlider.currentCard -= 1;
       tempPage.parentNode.removeChild(tempPage);
       updateSliderCards();
     } else {
       tempPage.classList.remove('temporary');
-      saveAppPageName(tempPage, '');
+      saveAppPageName(tempPage, localStrings.getString('appDefaultPageName'));

[Dan Beam, 2011/10/14 08:19:56]

Might it make sense to keep one central

  var appDefaultPageName = localStrings.getString('appDefaultPageName');

so we don't have this call 4 times if you ever need to change / update
something?

     }
 
     $('footer').classList.remove('showing-trash-mode');
   }
 
   /**
    * Handler for key events on the page. Ctrl-Arrow will switch the visible
    * page.
    * @param {Event} e The KeyboardEvent.
    */
@@ skipping 390 matching lines @@
 var getAppsCallback = ntp4.getAppsCallback;
 var appsPrefChangeCallback = ntp4.appsPrefChangeCallback;
 var themeChanged = ntp4.themeChanged;
 var recentlyClosedTabs = ntp4.setRecentlyClosedTabs;
 var setMostVisitedPages = ntp4.setMostVisitedPages;
 var updateLogin = ntp4.updateLogin;
 
 document.addEventListener('DOMContentLoaded', ntp4.initialize);
 window.addEventListener('online', ntp4.updateOfflineEnabledApps);
 window.addEventListener('offline', ntp4.updateOfflineEnabledApps);