From 80b2ae42e5af66a800a8986a6ffd9aa335340439 Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Mon, 9 Aug 2010 14:57:34 -0700
Subject: [PATCH] + Made the Groups.killNewTabGroup test a little tighter (in
 case someone has made a group called "new tabs") + Worked around bug 575672
 (CSS transition assert)

--HG--
extra : rebase_source : 6f758e737c2092214ec3185be847f2c5da406be0
---
 browser/base/content/tabview/groupitems.js | 2 +-
 browser/base/content/tabview/iq.js         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/tabview/groupitems.js b/browser/base/content/tabview/groupitems.js
index 8af1f9bb682..1fc7fefb05c 100644
--- a/browser/base/content/tabview/groupitems.js
+++ b/browser/base/content/tabview/groupitems.js
@@ -1798,7 +1798,7 @@ window.GroupItems = {
   // Removes the New Tab Group, which is now defunct. See bug 575851 and comments therein.
   killNewTabGroup: function() {
     this.groupItems.forEach(function(groupItem) {
-      if (groupItem.getTitle() == 'New Tabs') {
+      if (groupItem.getTitle() == 'New Tabs' && groupItem.locked.title) {
         groupItem.removeAll();
         groupItem.close();
       }
diff --git a/browser/base/content/tabview/iq.js b/browser/base/content/tabview/iq.js
index 7cd8aca8210..1626c2b6085 100644
--- a/browser/base/content/tabview/iq.js
+++ b/browser/base/content/tabview/iq.js
@@ -542,7 +542,9 @@ iQClass.prototype = {
         options = {};
 
       let easings = {
-        tabviewBounce: "cubic-bezier(0.0, 0.63, .6, 1.29)",
+        tabviewBounce: "cubic-bezier(0.0, 0.63, .6, 1.0)", 
+        // TODO: change 1.0 above to 1.29 after bug 575672 is fixed
+        
         easeInQuad: 'ease-in', // TODO: make it a real easeInQuad, or decide we don't care
         fast: 'cubic-bezier(0.7,0,1,1)'
       };