Permalink
Browse files

Fix window height bug in Zotero preferences, and reorganize code

Prefpanes are now in separate overlays, which Fixes the age-old resizing
bug when switching between panes (at least on OS X) that varied
depending on the initial pane. Code has also been moved into
pane-specific files and objects, with strict mode enabled. When calling
code from another pane (e.g., for a UI update in another pane), first
check whether the Zotero_Preferences.[Pane] object exists--if it doesn't
then nothing needs to be called.

This change breaks the word integration plugin pref overlays, which
hopefully can be rewritten to work with either overlay format.

There is a good chance that this breaks some other things in the
preferences too.

Fixes #243
  • Loading branch information...
dstillman committed Mar 20, 2013
1 parent 41e2f30 commit a417c9ef59071950bf371a2f72221bab3b771f98
Showing with 3,753 additions and 3,115 deletions.
  1. +6 −1 chrome.manifest
  2. +59 −2,180 chrome/content/zotero/preferences/preferences.js
  3. +31 −813 chrome/content/zotero/preferences/preferences.xul
  4. +789 −0 chrome/content/zotero/preferences/preferences_advanced.js
  5. +204 −0 chrome/content/zotero/preferences/preferences_advanced.xul
  6. +51 −0 chrome/content/zotero/preferences/preferences_advanced_firefox.xul
  7. +170 −0 chrome/content/zotero/preferences/preferences_cite.js
  8. +93 −0 chrome/content/zotero/preferences/preferences_cite.xul
  9. +246 −0 chrome/content/zotero/preferences/preferences_export.js
  10. +82 −0 chrome/content/zotero/preferences/preferences_export.xul
  11. +53 −0 chrome/content/zotero/preferences/preferences_export_firefox.xul
  12. +8 −117 chrome/content/zotero/preferences/preferences_firefox.xul
  13. +76 −0 chrome/content/zotero/preferences/preferences_general.js
  14. +137 −0 chrome/content/zotero/preferences/preferences_general.xul
  15. +75 −0 chrome/content/zotero/preferences/preferences_general_firefox.xul
  16. +36 −0 chrome/content/zotero/preferences/preferences_keys.js
  17. +125 −0 chrome/content/zotero/preferences/preferences_keys.xul
  18. +147 −0 chrome/content/zotero/preferences/preferences_proxies.js
  19. +483 −0 chrome/content/zotero/preferences/preferences_search.js
  20. +118 −0 chrome/content/zotero/preferences/preferences_search.xul
  21. +435 −0 chrome/content/zotero/preferences/preferences_sync.js
  22. +319 −0 chrome/content/zotero/preferences/preferences_sync.xul
  23. +10 −4 chrome/content/zotero/preferences/quickCopySiteEditor.xul
View
@@ -49,8 +49,13 @@ skin zotero default chrome/skin/default/zotero/
overlay chrome://browser/content/browser.xul chrome://zotero/content/statusBarOverlay.xul appversion<4.0
overlay chrome://browser/content/browser.xul chrome://zotero/content/overlay.xul
-overlay chrome://zotero/content/preferences/preferences.xul chrome://zotero/content/preferences/preferences_firefox.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+
+overlay chrome://zotero/content/preferences/preferences.xul chrome://zotero/content/preferences/preferences_firefox.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
overlay chrome://zotero/content/preferences/preferences.xul#cite chrome://zotero/content/preferences/preferences_firefox.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+overlay chrome://zotero/content/preferences/preferences_general.xul chrome://zotero/content/preferences/preferences_general_firefox.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+overlay chrome://zotero/content/preferences/preferences_export.xul chrome://zotero/content/preferences/preferences_export_firefox.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+overlay chrome://zotero/content/preferences/preferences_advanced.xul chrome://zotero/content/preferences/preferences_advanced_firefox.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+
overlay chrome://mozapps/content/downloads/unknownContentType.xul chrome://zotero/content/downloadOverlay.xul
style chrome://browser/content/browser.xul chrome://zotero/skin/zotero.css
Oops, something went wrong.

0 comments on commit a417c9e

Please sign in to comment.