1 files changed, 19 insertions, 50 deletions

diff --git a/bandwagon/content/ui/overlays/extensionsOverlayController.js b/bandwagon/content/ui/overlays/extensionsOverlayController.js
index 092feac..a1faac0 100644
--- a/bandwagon/content/ui/overlays/extensionsOverlayController.js
+++ b/bandwagon/content/ui/overlays/extensionsOverlayController.js
@@ -67,32 +67,13 @@ Bandwagon.Controller.ExtensionsOverlay.init = function()
     }
 
     // Move Get Add-ons/Search to after Themes
+
     Bandwagon.Controller.ExtensionsOverlay._moveSearchTab();
- 
-    try
-    {
-        // If we don't do the next call, the Search tab still thinks it is at the start and it causes some display glitches
-        // dmcnamara - this is failing on linux
-        updateVisibilityFlags();
-    } catch (e) {}
 
     // Add publish button to extension binding when selected
 
     document.getElementById("extensionsView").addEventListener("select", Bandwagon.Controller.ExtensionsOverlay._stuffPublishUI, true);
 
-    // Bug 470268 - the Add-ons window is too narrow by default, enforce a minimum size
-    // This is a one time only deal, so get/set the pref
-
-    var w = document.documentElement.getAttribute("width");
-    var sized = Bandwagon.Preferences.getPreference("addonswindow.resized");
-
-    if (w < 700 && !sized)
-    {
-        document.documentElement.setAttribute("width", 700);
-    }
-
-    Bandwagon.Preferences.setPreference("addonswindow.resized", true);
-
     // Handle window arguments
 
     if (window.arguments)
@@ -101,6 +82,20 @@ Bandwagon.Controller.ExtensionsOverlay.init = function()
 
         if (inArgs)
         {
+            /** OBSOLETE
+            if (inArgs.subscribe)
+            {
+                Bandwagon.Logger.debug("Have window argument subscribe = " + inArgs.subscribe);
+
+                setTimeout(function()
+                {
+                    Bandwagon.Controller.ExtensionsOverlay._showCollectionsPaneView();
+                    Bandwagon.Controller.CollectionsPane.doShowCollectionPreview(inArgs.subscribe);
+                },
+                500);
+            }
+            else
+            */
             if (inArgs.selectCollection)
             {
                 Bandwagon.Logger.debug("Have window argument selectCollection = " + inArgs.selectCollection);
@@ -156,17 +151,9 @@ Bandwagon.Controller.ExtensionsOverlay.doRemoveFromCollection = function(collect
         null,
         check);
 
-    var callback = function(event)
-    {
-        if (!event.isError())
-        {
-            bandwagonService.forceCheckForUpdates(collection);
-        }
-    }
-
     if (button == 0)
     {
-        bandwagonService.removeAddonFromCollection(extension.guid, collection, callback);
+        bandwagonService.removeAddonFromCollection(extension.guid, collection);
     }
 }
 
@@ -214,16 +201,7 @@ Bandwagon.Controller.ExtensionsOverlay.doNewCollection = function()
 {
     Bandwagon.Logger.debug("In Bandwagon.Controller.ExtensionsOverlay.doNewCollection()");
 
-    var extension = Bandwagon.Controller.ExtensionsOverlay._getSelectedExtension();
-
-    if (extension && extension.guid)
-    {
-        Bandwagon.Controller.CollectionsPane._openLocalizedURL(Bandwagon.COLLECTIONSPANE_DO_NEW_COLLECTION_URL + "?guid=" + extension.guid);
-    }
-    else
-    {
-        Bandwagon.Controller.CollectionsPane._openLocalizedURL(Bandwagon.COLLECTIONSPANE_DO_NEW_COLLECTION_URL);
-    }
+    Bandwagon.Controller.CollectionsPane._openLocalizedURL(Bandwagon.COLLECTIONSPANE_DO_NEW_COLLECTION_URL);
 }
 
 Bandwagon.Controller.ExtensionsOverlay.doAddNewShareEmail = function()
@@ -244,11 +222,6 @@ Bandwagon.Controller.ExtensionsOverlay.doAddNewShareEmail = function()
     Bandwagon.Controller.ExtensionsOverlay._invalidatePublishButton();
 }
 
-Bandwagon.Controller.ExtensionsOverlay.doCreateAccount = function()
-{
-    Bandwagon.Controller.CollectionsPane._openLocalizedURL(Bandwagon.LOGINPANE_DO_NEW_ACCOUNT);
-}
-
 Bandwagon.Controller.ExtensionsOverlay._openPublishDialog = function(params)
 {
     window.openDialog("chrome://bandwagon/content/ui/publish.xul", "",
@@ -260,7 +233,7 @@ Bandwagon.Controller.ExtensionsOverlay._moveSearchTab = function()
     var parNode = document.getElementById("viewGroup");
     var newNode = document.getElementById("search-view").cloneNode(false);
     var refNode = document.getElementById("updates-view");
-    var insertedNode = parNode.insertBefore(newNode, refNode);
+    var insertedNode = parNode.insertBefore(newNode, refNode)
     parNode.removeChild(parNode.firstChild);
 }
 
@@ -280,11 +253,6 @@ Bandwagon.Controller.ExtensionsOverlay._stuffPublishUI = function()
     if (elemExtension.getAttribute("plugin") == "true" || elemExtension.getAttribute("updateable") == "false")
         return;
 
-    if (Bandwagon.Controller.ExtensionsOverlay._publishButton && Bandwagon.Controller.ExtensionsOverlay._publishButton.parentNode)
-    {
-        Bandwagon.Controller.ExtensionsOverlay._publishButton.parentNode.removeChild(Bandwagon.Controller.ExtensionsOverlay._publishButton);
-    }
-
     Bandwagon.Controller.ExtensionsOverlay._invalidatePublishButton();
 
     for (var i=0; i<elemSelectedButtons.childNodes.length; i++)
@@ -418,3 +386,4 @@ Bandwagon.Controller.ExtensionsOverlay._showView = function(aView)
 showView = Bandwagon.Controller.ExtensionsOverlay._showView;
 
 window.addEventListener("load", Bandwagon.Controller.ExtensionsOverlay.init, true);
+