Merge pull request #7223 from dscravag/nightly2

Nightly 2012-12-28
mozilla-b2g · Dec 28, 2012 · 05b802e · 05b802e
2 parents 73270c3 + d740ba2
commit 05b802e
Show file tree

Hide file tree

Showing 176 changed files with 3,882 additions and 3,539 deletions.
diff --git a/README.md b/README.md
@@ -86,6 +86,15 @@ To run integration tests:
    or `make test-integration REPORTER=<REPORTER>` to run integration
    tests with the specified reporter, for example `XUnit`
 
+   or `make test-integration TESTVARS=<PATH/TO/TESTVARS.json>` to run
+   tests with variables in the testvars file (this defaults to
+   testvars.json)
+
 Note: If you're using a FirefoxOS Device, it must have been flashed
 with a build with marionette enabled. If it doesn't have marionette
 enabled, then running `make test-integration` will time out.
+
+The testvars file is a JSON file that maps app names to objects
+holding key/values as required by that app's integration tests.  See
+that app's integration test code and/or README for which key/values
+are required.
diff --git a/apps/browser/about.html b/apps/browser/about.html
@@ -16,8 +16,8 @@
   <body>
     <h1 data-l10n-id="browser">Browser</h1>
     <ul>
-      <li><a data-l10n-id="support-about" href="">Support</a></li>
-      <li><a data-l10n-id="faq-about" href="">FAQ</a></li>
+      <li><a data-l10n-id="support-about" href="http://support.mozilla.org/products/firefox-os">Support</a></li>
+      <li><a data-l10n-id="faq-about" href="https://www.mozilla.org/firefox/mobile/faq/?os=firefox-os">FAQ</a></li>
       <li><a data-l10n-id="credits-about" href="http://www.mozilla.org/credits/">Credits</a></li>
     </ul>
     <p data-l10n-id="trademark-about2">Browser and the Browser logos are trademarks of the Mozilla Foundation</p>

diff --git a/apps/browser/js/browser.js b/apps/browser/js/browser.js
@@ -25,7 +25,7 @@ var Browser = {
   AWESOME_SCREEN: 'awesome-screen',
   SETTINGS_SCREEN: 'settings-screen',
   previousScreen: null,
-  currentScreen: this.PAGE_SCREEN,
+  currentScreen: 'page-screen',
 
   DEFAULT_SEARCH_PROVIDER_URL: 'm.bing.com',
   DEFAULT_SEARCH_PROVIDER_TITLE: 'Bing',
@@ -278,7 +278,9 @@ var Browser = {
           return;
         }
         // If address bar is hidden then show it
-        this.mainScreen.classList.remove('address-hidden');
+        if (this.addressBarState === this.HIDDEN) {
+          this.showAddressBar();
+        }
         tab.loading = true;
         if (isCurrentTab && this.currentScreen === this.PAGE_SCREEN) {
           this.throbber.classList.add('loading');
@@ -429,36 +431,44 @@ var Browser = {
 
   handleScroll: function browser_handleScroll(evt) {
     if (evt.detail.top < this.LOWER_SCROLL_THRESHOLD) {
-      if (this.addressBarState == this.VISIBLE ||
-        this.addressBarState == this.TRANSITIONING) {
+      if (this.addressBarState === this.VISIBLE ||
+          this.addressBarState === this.TRANSITIONING) {
         return;
       }
-      var addressBarVisible = (function browser_addressBarVisible() {
-        this.mainScreen.classList.remove('expanded');
-        this.addressBarState = this.VISIBLE;
-        this.mainScreen.removeEventListener('transitionend',
-          addressBarVisible);
-      }).bind(this);
-      this.mainScreen.addEventListener('transitionend', addressBarVisible);
-      this.addressBarState = this.TRANSITIONING;
-      this.mainScreen.classList.remove('address-hidden');
+      this.showAddressBar();
     } else if (evt.detail.top > this.UPPER_SCROLL_THRESHOLD) {
-      if (this.addressBarState == this.HIDDEN ||
-        this.addressBarState == this.TRANSITIONING) {
+      if (this.addressBarState === this.HIDDEN ||
+          this.addressBarState === this.TRANSITIONING) {
         return;
       }
-      var addressBarHidden = (function browser_addressBarHidden() {
-        this.addressBarState = this.HIDDEN;
-        this.mainScreen.removeEventListener('transitionend',
-          addressBarHidden);
-      }).bind(this);
-      this.mainScreen.classList.add('expanded');
-      this.addressBarState = this.TRANSITIONING;
-      this.mainScreen.addEventListener('transitionend', addressBarHidden);
-      this.mainScreen.classList.add('address-hidden');
+      this.hideAddressBar();
     }
   },
 
+  hideAddressBar: function browser_hideAddressBar() {
+    var addressBarHidden = (function browser_addressBarHidden() {
+      this.addressBarState = this.HIDDEN;
+      this.mainScreen.removeEventListener('transitionend', addressBarHidden);
+    }).bind(this);
+    this.mainScreen.addEventListener('transitionend', addressBarHidden);
+    this.addressBarState = this.TRANSITIONING;
+    this.mainScreen.classList.add('expanded');
+    this.mainScreen.clientTop;
+    this.mainScreen.classList.add('address-hidden');
+  },
+
+  showAddressBar: function browser_showAddressBar() {
+    var addressBarVisible = (function browser_addressBarVisible() {
+      this.mainScreen.classList.remove('expanded');
+      this.addressBarState = this.VISIBLE;
+      this.mainScreen.removeEventListener('transitionend', addressBarVisible);
+    }).bind(this);
+    this.mainScreen.addEventListener('transitionend', addressBarVisible);
+    this.addressBarState = this.TRANSITIONING;
+    this.mainScreen.clientTop;
+    this.mainScreen.classList.remove('address-hidden');
+  },
+
   handleUrlInputKeypress: function browser_handleUrlInputKeypress(evt) {
     var input = this.urlInput.value;
     if (this.isSearch(input)) {
@@ -959,7 +969,7 @@ var Browser = {
 
   drawHistoryHeading: function browser_drawHistoryHeading(threshold,
     timestamp) {
-    const LABELS = [
+    var LABELS = [
       'future',
       'today',
       'yesterday',
@@ -1399,8 +1409,8 @@ var Browser = {
     });
     this._tabScreenObjectURLs = [];
 
-    for each(var tab in this.tabs) {
-      var li = this.generateTabLi(tab, multipleTabs);
+    for (var tab in this.tabs) {
+      var li = this.generateTabLi(this.tabs[tab], multipleTabs);
       ul.appendChild(li);
     }
 
@@ -1474,16 +1484,17 @@ var Browser = {
           this.showTopSiteThumbnails.bind(this));
 
         var self = this;
-        for each(var tab in this.tabs) {
+        var tabIds = Object.keys(this.tabs);
+        tabIds.forEach(function(tabId) {
+          var tab = self.tabs[tabId];
           if (tab.dom.purgeHistory) {
-            tab.dom.purgeHistory().onsuccess = (function(e) {
-              if (self.tabs[tabId] == self.currentTab) {
+            tab.dom.purgeHistory().onsuccess = function(e) {
+              if (tab == self.currentTab) {
                 self.refreshButtons();
               }
-            });
+            };
           }
-        }
-
+        });
       }).bind(this));
 
       this.history.innerHTML = '';

diff --git a/apps/browser/locales/browser.en-US.properties b/apps/browser/locales/browser.en-US.properties
@@ -52,9 +52,7 @@ confirm-clear-cookies-and-stored-data=Clear cookies and other data stored by sit
 
 # About Page
 support-about=Support
-support-about.href=http://support.mozilla.org/1/firefox-os/1.0/firefox-os/en-US
 faq-about=FAQ
-faq-about.href=https://www.mozilla.org/en-US/firefox/mobile/faq/?os=firefox-os
 credits-about=Credits
 credits-about.href=http://mozilla.org/credits/
 trademark-about2={{browserBrandShortName}} and the {{browserBrandShortName}} logos are trademarks of the Mozilla Foundation.

diff --git a/apps/browser/locales/browser.fr.properties b/apps/browser/locales/browser.fr.properties
@@ -53,10 +53,8 @@ confirm-clear-cookies-and-stored-data=Effacer les cookies et d’autres données
 
 # About Page
 support-about=Aide
-support-about.href=http://support.mozilla.org/1/firefox-os/1.0/firefox-os/fr
 faq-about=FAQ
 credits-about=Crédits
-credits-about.href=http://mozilla.org/credits/
 faq-about.href=https://www.mozilla.org/fr/firefox/mobile/faq/?os=firefox-os
 trademark-about2={{browserBrandShortName}} et les logos {{browserBrandShortName}} sont des marques déposées de Mozilla Foundation.
 

diff --git a/apps/browser/locales/browser.zh-TW.properties b/apps/browser/locales/browser.zh-TW.properties
@@ -52,9 +52,7 @@ confirm-clear-cookies-and-stored-data=是否要清除此裝置上儲存的 Cooki
 
 # About Page
 support-about=技術支援
-support-about.href=http://support.mozilla.org/1/firefox-os/1.0/firefox-os/zh-TW
 faq-about=常見問題集
-faq-about.href=https://www.mozilla.org/en-US/firefox/mobile/faq/?os=firefox-os
 credits-about=感謝
 credits-about.href=http://mozilla.org/credits/
 trademark-about2={{browserBrandShortName} 與 {{browserBrandShortName}} 標誌是 Mozilla 基金會的商標。

diff --git a/apps/calculator/index.html b/apps/calculator/index.html