diff --git a/chrome/content/zotero-platform/win/overlay.css b/chrome/content/zotero-platform/win/overlay.css
index d27d45ec7..50b074aca 100644
--- a/chrome/content/zotero-platform/win/overlay.css
+++ b/chrome/content/zotero-platform/win/overlay.css
@@ -219,11 +219,6 @@ toolbar:not([id="nav-bar"]) #zotero-toolbar-buttons separator {
padding-top: 4px;
}
-#zotero-tb-fullscreen {
- margin-left: 2px;
- margin-right: 5px;
-}
-
#zotero-view-tabbox tab {
padding-left: .7em;
padding-right: .7em;
diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 932583dd6..03bdbabe7 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -29,7 +29,7 @@
var ZoteroOverlay = new function()
{
const DEFAULT_ZPANE_HEIGHT = 300;
- var toolbarCollapseState, showInPref;
+ var toolbarCollapseState;
var zoteroPane, zoteroSplitter;
var _stateBeforeReload = false;
@@ -119,31 +119,6 @@ var ZoteroOverlay = new function()
throw new Error("Skipping loading");
}
- // Open Zotero app tab, if in Fx 4 and requested by pref
- showInPref = Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefService)
- .getBranch('extensions.zotero.').getIntPref('showIn');
- this.isTab = showInPref !== 1;
-
- var observerService = Components.classes["@mozilla.org/observer-service;1"]
- .getService(Components.interfaces.nsIObserverService);
- var zoteroObserver = function(subject, topic, data) {
- if(subject != window) return;
- observerService.removeObserver(this, "browser-delayed-startup-finished");
- if(showInPref === 3) {
- var tabbar = document.getElementById("TabsToolbar");
- if(tabbar && window.getComputedStyle(tabbar).display !== "none") {
- // load Zotero as a tab, if it isn't loading by default
- ZoteroOverlay.loadZoteroTab(true);
- }
- } else if(showInPref === 1) {
- // close Zotero as a tab, in case it was pinned
- var zoteroTab = ZoteroOverlay.findZoteroTab();
- if(zoteroTab) gBrowser.removeTab(zoteroTab);
- }
- };
- observerService.addObserver(zoteroObserver, "browser-delayed-startup-finished", false);
-
ZoteroPane.init();
// Clear old Zotero icon pref
@@ -264,71 +239,6 @@ var ZoteroOverlay = new function()
}
}
}
-
- /**
- * Determines whether there is an open Zotero tab
- */
- this.findZoteroTab = function() {
- // Look for an existing tab
- var tab = false;
- var numTabs = gBrowser.browsers.length;
- for(var index = 0; index < numTabs; index++) {
- var currentBrowser = gBrowser.getBrowserAtIndex(index);
- if(ZOTERO_TAB_URL == currentBrowser.currentURI.spec) {
- tab = (gBrowser.tabs ? gBrowser.tabs : gBrowser.mTabs)[index];
- break;
- }
- }
-
- return tab;
- }
-
- /**
- * Loads the Zotero tab, or adds a new tab if no tab yet exists
- * @param {Boolean} background Whether the Zotero tab should be loaded in the background
- */
- this.loadZoteroTab = function(background) {
- var tab = this.findZoteroTab();
-
- // If no existing tab, add a new tab
- if(!tab) tab = gBrowser.addTab(ZOTERO_TAB_URL);
- // Pin tab
- if(showInPref == 3) gBrowser.pinTab(tab);
- // If requested, activate tab
- if(!background) gBrowser.selectedTab = tab;
- }
-
- /**
- * Toggle between Zotero as a tab and Zotero as a pane
- */
- this.toggleTab = function(setMode) {
- var tab = this.findZoteroTab();
- window.zoteroSavedCollectionSelection = ZoteroPane.collectionsView.selectedTreeRow.id;
- window.zoteroSavedItemSelection = ZoteroPane.itemsView.saveSelection();
- if(tab) { // Zotero is running in a tab
- if(setMode) return;
- // if Zotero tab is the only tab, open the home page in a new tab
- if((gBrowser.tabs ? gBrowser.tabs : gBrowser.mTabs).length === 1) {
- gBrowser.addTab(gBrowser.homePage);
- }
-
- // swap ZoteroPane object
- ZoteroPane = ZoteroPane_Overlay;
-
- // otherwise, close Zotero tab and open Zotero pane
- gBrowser.removeTab(tab);
- this.isTab = false;
- this.toggleDisplay();
- } else { // Zotero is running in the pane
- if(setMode === false) return;
- // close Zotero pane
- this.toggleDisplay(false);
-
- // open Zotero tab
- this.isTab = true;
- this.loadZoteroTab();
- }
- }
}
window.addEventListener("load", function(e) {
diff --git a/chrome/content/zotero/preferences/preferences_advanced.xul b/chrome/content/zotero/preferences/preferences_advanced.xul
index 3f9a5080b..05f5de473 100644
--- a/chrome/content/zotero/preferences/preferences_advanced.xul
+++ b/chrome/content/zotero/preferences/preferences_advanced.xul
@@ -45,7 +45,6 @@
-
diff --git a/chrome/content/zotero/preferences/preferences_advanced_firefox.xul b/chrome/content/zotero/preferences/preferences_advanced_firefox.xul
index a408a50e0..7890faf73 100644
--- a/chrome/content/zotero/preferences/preferences_advanced_firefox.xul
+++ b/chrome/content/zotero/preferences/preferences_advanced_firefox.xul
@@ -55,12 +55,6 @@
-
-
-
-
-
-
diff --git a/chrome/content/zotero/preferences/preferences_general_firefox.xul b/chrome/content/zotero/preferences/preferences_general_firefox.xul
index 0bc040001..7eb55dd4e 100644
--- a/chrome/content/zotero/preferences/preferences_general_firefox.xul
+++ b/chrome/content/zotero/preferences/preferences_general_firefox.xul
@@ -28,28 +28,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
.
-
- ***** END LICENSE BLOCK *****
-*/
-
-/*
- * This object contains the various functions for the interface
- */
-var ZoteroTab = new function()
-{
- this.onLoad = function() {
- var me = this;
-
- // find window this tab is loaded in
- this.containerWindow = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
- .getInterface(Components.interfaces.nsIWebNavigation)
- .QueryInterface(Components.interfaces.nsIDocShell)
- .chromeEventHandler.ownerDocument.defaultView;
- if(!this.containerWindow) return;
-
- var tabs = (this.containerWindow.gBrowser.tabs
- ? this.containerWindow.gBrowser.tabs : this.containerWindow.gBrowser.mTabs);
-
- // loop over all browsers in this window
- for(var i=0; i 1) {
- window.close();
- } else {
- if(tabs[0].pinned) this.containerWindow.gBrowser.unpinTab(tabs[0]);
- document.location.replace(this.containerWindow.gHomeButton.getHomePage());
- }
- return;
- }
-
- this.containerWindow.ZoteroPane_Overlay = this.containerWindow.ZoteroPane;
- this.containerWindow.ZoteroPane_Tab = ZoteroPane;
- this.containerWindow.ZoteroPane = ZoteroPane;
- }
-
- this.onUnload = function() {
- // remove drop propagation killer
- this.containerBrowser.removeEventListener("drop", _dropPropagationKiller, false);
-
- // replace window ZoteroPane
- if(this.containerWindow.ZoteroPane === this.containerWindow.ZoteroPane_Tab) {
- this.containerWindow.ZoteroPane = this.containerWindow.ZoteroPane_Overlay;
- }
- delete this.containerWindow.ZoteroPane_Tab;
-
- // destroy pane
- ZoteroPane.destroy();
- }
-
- function _dropPropagationKiller(event) {
- event.stopPropagation();
- event.preventDefault();
- }
-}
-
-window.addEventListener("load", function(e) { ZoteroTab.onLoad(e); }, false);
-window.addEventListener("unload", function(e) { ZoteroTab.onUnload(e); }, false);
diff --git a/chrome/content/zotero/tab.xul b/chrome/content/zotero/tab.xul
deleted file mode 100644
index 02b7687ae..000000000
--- a/chrome/content/zotero/tab.xul
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-%globalDTD;
-
-%textcontextDTD;
-
-%standaloneDTD;
-
-%brandDTD;
-]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 25b1a8595..d57a1d8d2 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -22,7 +22,6 @@
***** END LICENSE BLOCK *****
*/
-const ZOTERO_TAB_URL = "chrome://zotero/content/tab.xul";
/*
* This object contains the various functions for the interface
@@ -395,7 +394,8 @@ var ZoteroPane = new function()
this.updateTagSelectorSize();
// restore saved row selection (for tab switching)
- var containerWindow = (window.ZoteroTab ? window.ZoteroTab.containerWindow : window);
+ // TODO: Remove now that no tab mode?
+ var containerWindow = window;
if(containerWindow.zoteroSavedCollectionSelection) {
this.collectionsView.addEventListener('load', Zotero.Promise.coroutine(function* () {
yield this.collectionsView.selectByID(containerWindow.zoteroSavedCollectionSelection);
@@ -725,9 +725,6 @@ var ZoteroPane = new function()
case 'toggleTagSelector':
ZoteroPane_Local.toggleTagSelector();
break;
- case 'toggleFullscreen':
- ZoteroPane_Local.toggleTab();
- break;
case 'copySelectedItemCitationsToClipboard':
ZoteroPane_Local.copySelectedItemsToClipboard(true)
break;
@@ -4713,17 +4710,6 @@ var ZoteroPane = new function()
}
}
- /**
- * Toggles Zotero-as-a-tab by passing off the request to the ZoteroOverlay object associated
- * with the present window
- */
- this.toggleTab = function() {
- var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
- .getService(Components.interfaces.nsIWindowMediator);
- var browserWindow = wm.getMostRecentWindow("navigator:browser");
- if(browserWindow.ZoteroOverlay) browserWindow.ZoteroOverlay.toggleTab();
- }
-
/**
* Sets the layout to either a three-vertical-pane layout and a layout where itemsPane is above itemPane
*/
@@ -4747,9 +4733,7 @@ var ZoteroPane = new function()
*/
this.show = function() {
if(window.ZoteroOverlay) {
- if(ZoteroOverlay.isTab) {
- ZoteroOverlay.loadZoteroTab();
- } else if(!this.isShowing()) {
+ if (!this.isShowing()) {
ZoteroOverlay.toggleDisplay();
}
}
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index 7e6ceba47..829d93156 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -248,9 +248,7 @@
-
-
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index 7701bbe77..ec1cbb8bb 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -8,10 +8,6 @@
-
-
-
-
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 6a13497af..4f195ad92 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -123,7 +123,6 @@
-
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 707b8abec..55e2ed6b1 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -612,16 +612,6 @@
color: gray;
}
-#zotero-tb-fullscreen
-{
- list-style-image: url('chrome://zotero/skin/toolbar-fullscreen-bottom.png');
-}
-
-#zotero-pane-stack[fullscreenmode="true"] #zotero-tb-fullscreen
-{
- list-style-image: url('chrome://zotero/skin/toolbar-fullscreen-top.png');
-}
-
#zotero-tb-search
{
font-size: 11px !important;
diff --git a/chrome/skin/default/zotero/preferences.css b/chrome/skin/default/zotero/preferences.css
index 7955ebbdd..4ca9dbc10 100644
--- a/chrome/skin/default/zotero/preferences.css
+++ b/chrome/skin/default/zotero/preferences.css
@@ -73,11 +73,6 @@ grid row hbox:first-child
}
-#showIn radio
-{
- width: 120px;
-}
-
#fontSize radio
{
margin-right: 20px;
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index 375a586c8..2b0e43125 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -25,7 +25,6 @@ pref("extensions.zotero.triggerProxyAuthentication", true);
// Proxy auth URLs should respond successfully to HEAD requests over HTTP and HTTPS (in case of forced HTTPS requests)
pref("extensions.zotero.proxyAuthenticationURLs", 'http://www.acm.org,http://www.ebscohost.com,http://www.elsevier.com,http://www.ieee.org,http://www.jstor.org,http://www.ovid.com,http://www.springer.com,http://www.tandfonline.com');
pref("extensions.zotero.cacheTranslatorData",true);
-pref("extensions.zotero.showIn", 1);
pref("extensions.zotero.browserContentContextMenu", true);
pref("extensions.zotero.openURL.resolver","http://worldcatlibraries.org/registry/gateway");
pref("extensions.zotero.openURL.version","1.0");