www

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | Submodules | README | LICENSE

commit 84cf9d8cbe6935999b2dfbb1f2e8d7f8ec1cccc2
parent 095ec1c9745581161e2aeee1350bc26315028f4b
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri,  9 Jul 2010 20:10:43 +0000

Closes #1037, Remove Firefox 2.0/3.0–specific code


Diffstat:
Mchrome/content/zotero-platform/mac/overlay.css | 128++++++++++++++++++++++++++++++++++++++-----------------------------------------
Mchrome/content/zotero/advancedSearch.js | 4----
Mchrome/content/zotero/bibliography.js | 5-----
Mchrome/content/zotero/bibliography.xul | 6+-----
Dchrome/content/zotero/bindings/conditional-timed-textbox.xml | 54------------------------------------------------------
Mchrome/content/zotero/bindings/tagselector.xml | 15++-------------
Mchrome/content/zotero/integration/addCitationDialog.xul | 4+---
Mchrome/content/zotero/integration/editBibliographyDialog.xul | 4+---
Mchrome/content/zotero/overlay.js | 25-------------------------
Mchrome/content/zotero/overlay.xul | 2--
Mchrome/content/zotero/selectItemsDialog.js | 2--
Mchrome/content/zotero/selectItemsDialog.xul | 4+---
Mchrome/content/zotero/xpcom/collectionTreeView.js | 17++++-------------
Mchrome/content/zotero/xpcom/itemTreeView.js | 98+++++++++++++++++++------------------------------------------------------------
Mchrome/content/zotero/xpcom/utilities.js | 117+++++++++++++++++++++----------------------------------------------------------
Mchrome/content/zotero/xpcom/zotero.js | 138++++++++++++++++++++++---------------------------------------------------------
Mchrome/locale/af-ZA/zotero/zotero.dtd | 2--
Mchrome/locale/ar/zotero/zotero.dtd | 2--
Mchrome/locale/bg-BG/zotero/zotero.dtd | 2--
Mchrome/locale/ca-AD/zotero/zotero.dtd | 2--
Mchrome/locale/cs-CZ/zotero/zotero.dtd | 2--
Mchrome/locale/da-DK/zotero/zotero.dtd | 2--
Mchrome/locale/de-AT/zotero/zotero.dtd | 2--
Mchrome/locale/de-CH/zotero/zotero.dtd | 2--
Mchrome/locale/de-DE/zotero/zotero.dtd | 2--
Mchrome/locale/el-GR/zotero/zotero.dtd | 2--
Mchrome/locale/en-US/zotero/zotero.dtd | 2--
Mchrome/locale/es-ES/zotero/zotero.dtd | 2--
Mchrome/locale/et-EE/zotero/zotero.dtd | 2--
Mchrome/locale/eu-ES/zotero/zotero.dtd | 2--
Mchrome/locale/fi-FI/zotero/zotero.dtd | 2--
Mchrome/locale/fr-FR/zotero/zotero.dtd | 2--
Mchrome/locale/gl-ES/zotero/zotero.dtd | 2--
Mchrome/locale/he-IL/zotero/zotero.dtd | 2--
Mchrome/locale/hr-HR/zotero/zotero.dtd | 2--
Mchrome/locale/hu-HU/zotero/zotero.dtd | 2--
Mchrome/locale/is-IS/zotero/zotero.dtd | 2--
Mchrome/locale/it-IT/zotero/zotero.dtd | 2--
Mchrome/locale/ja-JP/zotero/zotero.dtd | 2--
Mchrome/locale/ko-KR/zotero/zotero.dtd | 2--
Mchrome/locale/mn-MN/zotero/zotero.dtd | 2--
Mchrome/locale/nb-NO/zotero/zotero.dtd | 2--
Mchrome/locale/nl-NL/zotero/zotero.dtd | 2--
Mchrome/locale/pl-PL/zotero/zotero.dtd | 2--
Mchrome/locale/pt-BR/zotero/zotero.dtd | 2--
Mchrome/locale/pt-PT/zotero/zotero.dtd | 2--
Mchrome/locale/ro-RO/zotero/zotero.dtd | 2--
Mchrome/locale/ru-RU/zotero/zotero.dtd | 2--
Mchrome/locale/sk-SK/zotero/zotero.dtd | 2--
Mchrome/locale/sl-SI/zotero/zotero.dtd | 2--
Mchrome/locale/sr-RS/zotero/zotero.dtd | 2--
Mchrome/locale/sv-SE/zotero/zotero.dtd | 2--
Mchrome/locale/th-TH/zotero/zotero.dtd | 2--
Mchrome/locale/tr-TR/zotero/zotero.dtd | 2--
Mchrome/locale/vi-VN/zotero/zotero.dtd | 2--
Mchrome/locale/zh-CN/zotero/zotero.dtd | 2--
Mchrome/locale/zh-TW/zotero/zotero.dtd | 2--
Mchrome/skin/default/zotero/bindings/tagselector.css | 11-----------
Mchrome/skin/default/zotero/overlay.css | 21+++++----------------
Dchrome/skin/default/zotero/search-cancel-active.png | 0
Dchrome/skin/default/zotero/search-cancel.png | 0
Mchrome/skin/default/zotero/zotero.css | 5-----
Mcomponents/zotero-autocomplete.js | 2+-
63 files changed, 170 insertions(+), 574 deletions(-)

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css @@ -103,17 +103,13 @@ margin: none; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox { +#zotero-view-tabbox { background-color: #fff; padding: 0; margin: 0; } -:root[moz-version="3.0"] #zotero-view-tabbox { - margin: 2px 0 0 0; -} - -:root:not([moz-version="3.0"]) #zotero-item-pane-content .groupbox-body { +#zotero-item-pane-content .groupbox-body { -moz-appearance: none; background-color: #ffffff; } @@ -127,31 +123,31 @@ padding: 0; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabpanels { +#zotero-view-tabbox > tabpanels { margin: 12px 0 0 0; -moz-appearance: none; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs { +#zotero-view-tabbox > tabs { -moz-appearance: -moz-mac-unified-toolbar; padding: 2px; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab > hbox > .tab-icon { +#zotero-view-tabbox > tabs > tab > hbox > .tab-icon { display: none; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab > hbox .tab-text { +#zotero-view-tabbox > tabs > tab > hbox .tab-text { text-shadow: rgba(255, 255, 255, 0.4) 0 1px !important; font-size: 11px; font-weight: bold; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab:active:hover > hbox > .tab-text, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab[selected=true] > hbox > .tab-text { +#zotero-view-tabbox > tabs > tab:active:hover > hbox > .tab-text, +#zotero-view-tabbox > tabs > tab[selected=true] > hbox > .tab-text { text-shadow: none !important; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab { +#zotero-view-tabbox > tabs > tab { -moz-box-orient: vertical; -moz-box-align: center; -moz-appearance: none; @@ -163,114 +159,114 @@ -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle.png") 0 4 0 5 repeat stretch; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab:active:hover { +#zotero-view-tabbox > tabs > tab:active:hover { -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-down.png") 0 4 0 5 repeat stretch; text-shadow: none !important; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab[selected=true] { +#zotero-view-tabbox > tabs > tab[selected=true] { color: #FFF !important; text-shadow: rgba(0, 0, 0, 0.4) 0 1px; -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-selected.png") 0 4 0 5 repeat stretch; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab[selected=true]:active:hover { +#zotero-view-tabbox > tabs > tab[selected=true]:active:hover { -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-selected-down.png") 0 4 0 5 repeat stretch; } -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs > * { +:root:not([active]) #zotero-view-tabbox > tabs > * { color: #7C7C7C !important; /* remove this when we support click-through */ -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-inactive.png") 0 4 0 5 repeat stretch; } -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs > tab[selected=true] { +:root:not([active]) #zotero-view-tabbox > tabs > tab[selected=true] { color: #C5C5C5 !important; /* remove this when we support click-through */ -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-selected-inactive.png") 0 4 0 5 repeat stretch; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > :first-child, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > [first-visible], -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > :last-child, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] { +#zotero-view-tabbox > tabs > :first-child, +#zotero-view-tabbox > tabs > [first-visible], +#zotero-view-tabbox > tabs[chromedir=rtl] > :last-child, +#zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] { border-width: 0 4px 0 6px; -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left.png") 0 4 0 6 repeat stretch; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > :first-child:active:hover, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > [first-visible]:active:hover, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > :last-child:active:hover, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible]:active:hover { +#zotero-view-tabbox > tabs > :first-child:active:hover, +#zotero-view-tabbox > tabs > [first-visible]:active:hover, +#zotero-view-tabbox > tabs[chromedir=rtl] > :last-child:active:hover, +#zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible]:active:hover { -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-down.png") 0 4 0 6 repeat stretch; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab:first-child[selected=true], -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab[first-visible][selected=true], -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true], -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true] { +#zotero-view-tabbox > tabs > tab:first-child[selected=true], +#zotero-view-tabbox > tabs > tab[first-visible][selected=true], +#zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true], +#zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true] { -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-selected.png") 0 4 0 6 repeat stretch; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab:first-child[selected=true]:active:hover, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab[first-visible][selected=true]:active:hover, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true]:active:hover, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true]:active:hover, { +#zotero-view-tabbox > tabs > tab:first-child[selected=true]:active:hover, +#zotero-view-tabbox > tabs > tab[first-visible][selected=true]:active:hover, +#zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true]:active:hover, +#zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true]:active:hover, { -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-selected-down.png") 0 4 0 6 repeat stretch; } -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs > :first-child, -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs > [first-visible], -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > :last-child, -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] { +:root:not([active]) #zotero-view-tabbox > tabs > :first-child, +:root:not([active]) #zotero-view-tabbox > tabs > [first-visible], +:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > :last-child, +:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] { -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-inactive.png") 0 4 0 6 repeat stretch; } -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs > tab:first-child[selected=true], -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs > tab[first-visible][selected=true], -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true], -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true] { +:root:not([active]) #zotero-view-tabbox > tabs > tab:first-child[selected=true], +:root:not([active]) #zotero-view-tabbox > tabs > tab[first-visible][selected=true], +:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true], +:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true] { -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-selected-inactive.png") 0 4 0 6 repeat stretch; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > :last-child, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > [last-visible], -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > :first-child, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] { +#zotero-view-tabbox > tabs > :last-child, +#zotero-view-tabbox > tabs > [last-visible], +#zotero-view-tabbox > tabs[chromedir=rtl] > :first-child, +#zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] { border-width: 0 6px 0 5px; -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right.png") 0 6 0 5 repeat stretch; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > :last-child:active:hover, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > [last-visible]:active:hover, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > :first-child:active:hover, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible]:active:hover { +#zotero-view-tabbox > tabs > :last-child:active:hover, +#zotero-view-tabbox > tabs > [last-visible]:active:hover, +#zotero-view-tabbox > tabs[chromedir=rtl] > :first-child:active:hover, +#zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible]:active:hover { -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-down.png") 0 6 0 5 repeat stretch; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab:last-child[selected=true], -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab[last-visible][selected=true], -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true], -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true] { +#zotero-view-tabbox > tabs > tab:last-child[selected=true], +#zotero-view-tabbox > tabs > tab[last-visible][selected=true], +#zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true], +#zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true] { -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-selected.png") 0 6 0 5 repeat stretch; } -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab:last-child[selected=true]:active:hover, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs > tab[last-visible][selected=true]:active:hover, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true]:active:hover, -:root:not([moz-version="3.0"]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true]:active:hover { +#zotero-view-tabbox > tabs > tab:last-child[selected=true]:active:hover, +#zotero-view-tabbox > tabs > tab[last-visible][selected=true]:active:hover, +#zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true]:active:hover, +#zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true]:active:hover { -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-selected-down.png") 0 6 0 5 repeat stretch; } -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs > :last-child, -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs > [last-visible], -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > :first-child, -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] { +:root:not([active]) #zotero-view-tabbox > tabs > :last-child, +:root:not([active]) #zotero-view-tabbox > tabs > [last-visible], +:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > :first-child, +:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] { -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-inactive.png") 0 6 0 5 repeat stretch; } -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs > tab:last-child[selected=true], -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs > tab[last-visible][selected=true], -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true], -:root:not([moz-version="3.0"]) :root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true] { +:root:not([active]) #zotero-view-tabbox > tabs > tab:last-child[selected=true], +:root:not([active]) #zotero-view-tabbox > tabs > tab[last-visible][selected=true], +:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true], +:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true] { -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-selected-inactive.png") 0 6 0 5 repeat stretch; } diff --git a/chrome/content/zotero/advancedSearch.js b/chrome/content/zotero/advancedSearch.js @@ -164,10 +164,6 @@ var ZoteroAdvancedSearch = new function() { this.startDrag = function (event, element) { - if (Zotero.isFx2 || Zotero.isFx30) { - nsDragAndDrop.startDrag(event, element); - return; - } element.onDragStart(event); } diff --git a/chrome/content/zotero/bibliography.js b/chrome/content/zotero/bibliography.js @@ -94,11 +94,6 @@ var Zotero_File_Interface_Bibliography = new function() { // restore saved bibliographic settings document.getElementById('output-radio').selectedItem = document.getElementById(Zotero.Prefs.get("export.bibliographySettings")); - - // disable clipboard in Fx3.0 on the Mac, because it can't support formatted output - if(Zotero.isMac && Zotero.isFx30) { - document.getElementById("mac-clipboard-warning").hidden = false; - } } // ONLY FOR integrationDocPrefs.xul: update status of displayAs, set diff --git a/chrome/content/zotero/bibliography.xul b/chrome/content/zotero/bibliography.xul @@ -21,11 +21,7 @@ <radiogroup id="output-radio"> <radio id="save-as-rtf" label="&zotero.bibliography.saveAsRTF.label;"/> <radio id="save-as-html" label="&zotero.bibliography.saveAsHTML.label;"/> - <hbox align="center"> - <radio id="copy-to-clipboard" label="&zotero.bibliography.copyToClipboard.label;"/> - <label id="mac-clipboard-warning" value="&zotero.bibliography.macClipboardWarning;" - hidden="true" style="margin-left:1em; font-size:0.95em"/> - </hbox> + <radio id="copy-to-clipboard" label="&zotero.bibliography.copyToClipboard.label;"/> <radio id="print" label="&zotero.bibliography.print.label;"/> </radiogroup> </groupbox> diff --git a/chrome/content/zotero/bindings/conditional-timed-textbox.xml b/chrome/content/zotero/bindings/conditional-timed-textbox.xml @@ -1,54 +0,0 @@ -<?xml version="1.0"?> -<!-- - ***** BEGIN LICENSE BLOCK ***** - - Copyright © 2009 Center for History and New Media - George Mason University, Fairfax, Virginia, USA - http://zotero.org - - This file is part of Zotero. - - Zotero is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Zotero is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Zotero. If not, see <http://www.gnu.org/licenses/>. - - ***** END LICENSE BLOCK ***** ---> - -<bindings xmlns="http://www.mozilla.org/xbl" - xmlns:html="http://www.w3.org/1999/xhtml" - xmlns:xbl="http://www.mozilla.org/xbl" - xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - <binding id="conditional-timed-textbox" extends="chrome://global/content/bindings/textbox.xml#timed-textbox"> - <implementation> - <method name="_fireCommand"> - <parameter name="me"/> - <body> - <![CDATA[ - // - // This whole binding can be removed once Firefox 3.0 support is removed - // - this._timer = null; - - if (me.value.indexOf('"') != -1) { - ZoteroPane.setItemsPaneMessage(Zotero.getString('advancedSearchMode')); - } - else { - me.doCommand(); - } - ]]> - </body> - </method> - </implementation> - </binding> -</bindings> diff --git a/chrome/content/zotero/bindings/tagselector.xml b/chrome/content/zotero/bindings/tagselector.xml @@ -160,10 +160,6 @@ this.id('display-all-tags').setAttribute('checked', !this.filterToScope); this.id('show-automatic').setAttribute('checked', this.showAutomatic); this.dragObserver = new this._dragObserverConstructor; - if(Zotero.isFx30) { - this.id('tags-search-filter').hidden = false; - this.id('tags-search').setAttribute('type', 'timed'); - } ]]> </constructor> @@ -552,10 +548,6 @@ var textbox = this.id('tags-search'); var t = textbox.inputField; - if (Zotero.isFx30) { - textbox.firstChild.hidden = (t.value == ""); - } - if (typeof clear != 'undefined') { if (clear){ t.value = ''; @@ -798,13 +790,10 @@ </xul:hbox> <xul:hbox> - <xul:label id="tags-search-filter" value="&zotero.tagSelector.filter;" hidden="true"/> + <!-- TODO: &zotero.tagSelector.filter; is now unused --> <xul:textbox id="tags-search" flex="1" type="search" timeout="250" dir="reverse" oncommand="document.getBindingParent(this).handleKeyPress(); event.stopPropagation()" - onkeypress="if (event.keyCode == event.DOM_VK_ESCAPE) { document.getBindingParent(this).handleKeyPress(true); }"> - <xul:toolbarbutton id="search-cancel" - oncommand="this.parentNode.focus(); document.getBindingParent(this).handleKeyPress(true)" hidden="true"/> - </xul:textbox> + onkeypress="if (event.keyCode == event.DOM_VK_ESCAPE) { document.getBindingParent(this).handleKeyPress(true); }"/> <xul:toolbarbutton id="view-settings-menu" tooltiptext="&zotero.toolbar.actions.label;" image="chrome://zotero/skin/tag-selector-menu.png" type="menu"> <xul:menupopup id="view-settings-popup"> diff --git a/chrome/content/zotero/integration/addCitationDialog.xul b/chrome/content/zotero/integration/addCitationDialog.xul @@ -57,9 +57,7 @@ <hbox align="center" pack="end"> <label value="&zotero.toolbar.search.label;" control="zotero-tb-search"/> <textbox id="zotero-tb-search" type="timed" timeout="250" oncommand="onSearch()" dir="reverse" tabindex="1" - onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { if (this.value == '') { cancelDialog(); return false; } this.value = ''; this.doCommand('cmd_zotero_search'); return false; } return true;"> - <toolbarbutton id="zotero-tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/> - </textbox> + onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { if (this.value == '') { cancelDialog(); return false; } this.value = ''; this.doCommand('cmd_zotero_search'); return false; } return true;"/> </hbox> <hbox flex="1" style="margin-top: 5px"> <tree id="zotero-collections-tree" diff --git a/chrome/content/zotero/integration/editBibliographyDialog.xul b/chrome/content/zotero/integration/editBibliographyDialog.xul @@ -57,9 +57,7 @@ <vbox align="stretch" flex="1"> <hbox align="center" pack="end"> <label value="&zotero.toolbar.search.label;" control="zotero-tb-search"/> - <textbox id="zotero-tb-search" type="timed" timeout="250" oncommand="onSearch()" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; } return true;"> - <toolbarbutton id="zotero-tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/> - </textbox> + <textbox id="zotero-tb-search" type="timed" timeout="250" oncommand="onSearch()" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; } return true;"/> </hbox> <hbox flex="1" style="margin-top: 5px"> <tree id="zotero-collections-tree" diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js @@ -118,7 +118,6 @@ var ZoteroPane = new function() document.getElementById('zotero-pane-stack').setAttribute('platform', 'win'); } - if(Zotero.isFx30) document.documentElement.setAttribute("moz-version", "3.0"); if(Zotero.isFx35) document.documentElement.setAttribute("moz-version", "3.5"); //Initialize collections view @@ -213,12 +212,6 @@ var ZoteroPane = new function() document.getElementById('zotero-tb-actions-showDuplicates').hidden = false; } - // use appropriate search box - if(Zotero.isFx30) { - document.getElementById("zotero-tb-search-label").hidden = false; - document.getElementById("zotero-tb-search").setAttribute("type", "conditional-timed"); - } - if(Zotero.isStandalone) { this.toggleDisplay(); this.fullScreen(true); @@ -1619,12 +1612,7 @@ var ZoteroPane = new function() } var searchVal = search.value; this.itemsView.setFilter('search', searchVal); - - if (Zotero.isFx30) { - document.getElementById('zotero-tb-search-cancel').hidden = searchVal == ""; - } } - } @@ -2363,34 +2351,21 @@ var ZoteroPane = new function() this.startDrag = function (event, element) { - if (Zotero.isFx2 || Zotero.isFx30) { - nsDragAndDrop.startDrag(event, element); - return; - } element.onDragStart(event); } this.dragEnter = function (event, element) { - if (Zotero.isFx2 || Zotero.isFx30) { - return; - } return element.onDragEnter(event); } this.dragOver = function (event, element) { - if (Zotero.isFx2 || Zotero.isFx30) { - return nsDragAndDrop.dragOver(event, element); - } return element.onDragOver(event); } this.dragDrop = function (event, element) { - if (Zotero.isFx2 || Zotero.isFx30) { - return nsDragAndDrop.drop(event, element); - } return element.onDrop(event); } diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul @@ -236,11 +236,9 @@ <toolbarseparator/> <toolbarbutton id="zotero-tb-advanced-search" class="zotero-tb-button" tooltiptext="&zotero.toolbar.advancedSearch;" oncommand="ZoteroPane.openAdvancedSearchWindow()"/> <spacer flex="1"/> - <label id="zotero-tb-search-label" value="&zotero.toolbar.search.label;" control="zotero-tb-search" hidden="true"/> <textbox id="zotero-tb-search" type="search" timeout="250" command="cmd_zotero_search" dir="reverse" onkeypress="ZoteroPane.handleSearchKeypress(this, event)" oninput="ZoteroPane.handleSearchInput(this, event)"> - <toolbarbutton id="zotero-tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/> </textbox> </hbox> diff --git a/chrome/content/zotero/selectItemsDialog.js b/chrome/content/zotero/selectItemsDialog.js @@ -92,8 +92,6 @@ function onSearch() { var searchVal = document.getElementById('zotero-tb-search').value; itemsView.setFilter('search', searchVal); - - document.getElementById('zotero-tb-search-cancel').hidden = searchVal == ""; } } diff --git a/chrome/content/zotero/selectItemsDialog.xul b/chrome/content/zotero/selectItemsDialog.xul @@ -49,9 +49,7 @@ <hbox align="center" pack="end"> <label value="&zotero.toolbar.search.label;" control="zotero-tb-search"/> <textbox id="zotero-tb-search" type="timed" timeout="250" oncommand="onSearch()" dir="reverse" - onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { if (this.value == '') { cancelDialog(); return false; } this.value = ''; this.doCommand('cmd_zotero_search'); return false; } return true;"> - <toolbarbutton id="zotero-tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/> - </textbox> + onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { if (this.value == '') { cancelDialog(); return false; } this.value = ''; this.doCommand('cmd_zotero_search'); return false; } return true;"/> </hbox> <hbox flex="1"> diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js @@ -1010,7 +1010,7 @@ Zotero.CollectionTreeCommandController.prototype.onEvent = function(evt) /** - * Start a drag using nsDragAndDrop.js or HTML 5 Drag and Drop + * Start a drag using HTML 5 Drag and Drop */ Zotero.CollectionTreeView.prototype.onDragStart = function(event, transferData, action) { var itemGroup = this._getItemAtRow(this.selection.currentIndex); @@ -1019,16 +1019,7 @@ Zotero.CollectionTreeView.prototype.onDragStart = function(event, transferData, } var collectionID = itemGroup.ref.id; - // Use nsDragAndDrop.js interface for Firefox 2 and Firefox 3.0 - var oldMethod = Zotero.isFx2 || Zotero.isFx30; - - if (oldMethod) { - transferData.data = new TransferData(); - transferData.data.addDataForFlavour("zotero/collection", collectionID); - } - else { - event.dataTransfer.setData("zotero/collection", collectionID); - } + event.dataTransfer.setData("zotero/collection", collectionID); } @@ -1566,7 +1557,7 @@ Zotero.CollectionTreeView.prototype.onDragEnter = function (event) { /* - * Called by nsDragAndDrop.js and HTML 5 Drag and Drop when dragging over the tree + * Called by HTML 5 Drag and Drop when dragging over the tree */ Zotero.CollectionTreeView.prototype.onDragOver = function (event, dropdata, session) { return false; @@ -1574,7 +1565,7 @@ Zotero.CollectionTreeView.prototype.onDragOver = function (event, dropdata, sess /* - * Called by nsDragAndDrop.js and HTML 5 Drag and Drop when dropping onto the tree + * Called by HTML 5 Drag and Drop when dropping onto the tree */ Zotero.CollectionTreeView.prototype.onDrop = function (event, dropdata, session) { return false; diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js @@ -805,7 +805,7 @@ Zotero.ItemTreeView.prototype.cycleHeader = function(column) { // If not yet selected, start with ascending if (!col.element.getAttribute('sortActive')) { - col.element.setAttribute('sortDirection', Zotero.isFx30 ? 'descending' : 'ascending'); + col.element.setAttribute('sortDirection', 'ascending'); } else { col.element.setAttribute('sortDirection', col.element.getAttribute('sortDirection') == 'descending' ? 'ascending' : 'descending'); @@ -860,13 +860,7 @@ Zotero.ItemTreeView.prototype.sort = function(itemID) var columnField = this.getSortField(); - // Firefox 3 is upside-down - if (Zotero.isFx30) { - var order = this.getSortDirection() == 'ascending'; - } - else { - var order = this.getSortDirection() == 'descending'; - } + var order = this.getSortDirection() == 'descending'; var collation = Zotero.getLocaleCollation(); @@ -1571,7 +1565,7 @@ Zotero.ItemTreeView.prototype.getSortField = function() { Zotero.ItemTreeView.prototype.getSortDirection = function() { var column = this._treebox.columns.getSortedColumn(); if (!column) { - return Zotero.isFx30 ? 'descending' : 'ascending'; + return 'ascending'; } return column.element.getAttribute('sortDirection'); } @@ -1626,9 +1620,6 @@ Zotero.ItemTreeCommandController.prototype.onEvent = function(evt) * Start a drag using nsDragAndDrop.js or HTML 5 Drag and Drop */ Zotero.ItemTreeView.prototype.onDragStart = function (event, transferData, action) { - // Use nsDragAndDrop.js interface for Firefox 2 and Firefox 3.0 - var oldMethod = Zotero.isFx2 || Zotero.isFx30; - // Quick implementation of dragging of XML item format if (this._itemGroup.isShare()) { var items = this.getSelectedItems(); @@ -1639,30 +1630,18 @@ Zotero.ItemTreeView.prototype.onDragStart = function (event, transferData, actio xml.items.item += xmlNode; } Zotero.debug(xml.toXMLString()); - if (oldMethod) { - transferData.data = new TransferData(); - transferData.data.addDataForFlavour("zotero/item-xml", xml.toXMLString()); - } - else { - event.dataTransfer.setData("zotero/item-xml", xml.toXMLString()); - } + event.dataTransfer.setData("zotero/item-xml", xml.toXMLString()); return; } var itemIDs = this.saveSelection(); var items = Zotero.Items.get(itemIDs); - if (oldMethod) { - transferData.data = new TransferData(); - transferData.data.addDataForFlavour("zotero/item", itemIDs.join()); - } - else { - event.dataTransfer.setData("zotero/item", itemIDs.join()); - } + event.dataTransfer.setData("zotero/item", itemIDs.join()); // Multi-file drag - // - Doesn't work on Firefox >=3.0/Windows - if (Zotero.isFx2 || !Zotero.isWin) { + // - Doesn't work on Windows + if (!Zotero.isWin) { // If at least one file is a non-web-link attachment and can be found, // enable dragging to file system for (var i=0; i<items.length; i++) { @@ -1671,26 +1650,16 @@ Zotero.ItemTreeView.prototype.onDragStart = function (event, transferData, actio != Zotero.Attachments.LINK_MODE_LINKED_URL && items[i].getFile()) { Zotero.debug("Adding file via x-moz-file-promise"); - if (oldMethod) { - transferData.data.addDataForFlavour( - "application/x-moz-file-promise", - new Zotero.ItemTreeView.fileDragDataProvider(), - 0, - Components.interfaces.nsISupports - ); - } - else { - event.dataTransfer.mozSetDataAt( - "application/x-moz-file-promise", - new Zotero.ItemTreeView.fileDragDataProvider(), - 0 - ); - } + event.dataTransfer.mozSetDataAt( + "application/x-moz-file-promise", + new Zotero.ItemTreeView.fileDragDataProvider(), + 0 + ); break; } } } - // Copy first file on Firefox >=3.0 Windows + // Copy first file on Windows else { var index = 0; for (var i=0; i<items.length; i++) { @@ -1705,20 +1674,12 @@ Zotero.ItemTreeView.prototype.onDragStart = function (event, transferData, actio .createInstance(Components.interfaces.nsIFileProtocolHandler); var uri = fph.getURLSpecFromFile(file); - if (oldMethod) { - transferData.data.addDataForFlavour("text/x-moz-url", uri + "\n" + file.leafName); - transferData.data.addDataForFlavour("application/x-moz-file", file); - transferData.data.addDataForFlavour("application/x-moz-file-promise-url", uri); - break; - } - else { - event.dataTransfer.mozSetDataAt("text/x-moz-url", uri + "\n" + file.leafName, index); - event.dataTransfer.mozSetDataAt("application/x-moz-file", file, index); - event.dataTransfer.mozSetDataAt("application/x-moz-file-promise-url", uri, index); - // DEBUG: possible to drag multiple files without x-moz-file-promise? - break; - index++ - } + event.dataTransfer.mozSetDataAt("text/x-moz-url", uri + "\n" + file.leafName, index); + event.dataTransfer.mozSetDataAt("application/x-moz-file", file, index); + event.dataTransfer.mozSetDataAt("application/x-moz-file-promise-url", uri, index); + // DEBUG: possible to drag multiple files without x-moz-file-promise? + break; + index++ } } } @@ -1737,12 +1698,7 @@ Zotero.ItemTreeView.prototype.onDragStart = function (event, transferData, actio } var text = obj.output.replace(/\r\n/g, "\n"); - if (oldMethod) { - transferData.data.addDataForFlavour("text/unicode", text); - } - else { - event.dataTransfer.setData("text/plain", text); - } + event.dataTransfer.setData("text/plain", text); } try { @@ -1753,18 +1709,10 @@ Zotero.ItemTreeView.prototype.onDragStart = function (event, transferData, actio else if (mode.indexOf('bibliography') == 0) { var content = Zotero.QuickCopy.getContentFromItems(items, format, null, event.shiftKey); if (content) { - if (oldMethod) { - if (content.html) { - transferData.data.addDataForFlavour("text/html", content.html); - } - transferData.data.addDataForFlavour("text/unicode", content.text); - } - else { - if (content.html) { - event.dataTransfer.setData("text/html", content.html); - } - event.dataTransfer.setData("text/plain", content.text); + if (content.html) { + event.dataTransfer.setData("text/html", content.html); } + event.dataTransfer.setData("text/plain", content.text); } } else { diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js @@ -1057,34 +1057,16 @@ Zotero.Utilities.HTTP = new function() { return false; } - // Workaround for "Accept third-party cookies" being off in Firefox 3.0.1 - // https://www.zotero.org/trac/ticket/1070 - if (Zotero.isFx30) { - const Cc = Components.classes; - const Ci = Components.interfaces; - var ds = Cc["@mozilla.org/webshell;1"]. - createInstance(Components.interfaces.nsIDocShellTreeItem). - QueryInterface(Ci.nsIInterfaceRequestor); - ds.itemType = Ci.nsIDocShellTreeItem.typeContent; - var xmlhttp = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]. - createInstance(Ci.nsIXMLHttpRequest); - xmlhttp.mozBackgroundRequest = true; - xmlhttp.open("GET", url, true); - xmlhttp.channel.loadGroup = ds.getInterface(Ci.nsILoadGroup); - xmlhttp.channel.loadFlags |= Ci.nsIChannel.LOAD_DOCUMENT_URI; - } - else { - var xmlhttp = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] - .createInstance(); - // Prevent certificate/authentication dialogs from popping up - xmlhttp.mozBackgroundRequest = true; - xmlhttp.open('GET', url, true); - // Send cookie even if "Allow third-party cookies" is disabled (>=Fx3.6 only) - if (!Zotero.isFx35) { - var channel = xmlhttp.channel; - channel.QueryInterface(Components.interfaces.nsIHttpChannelInternal); - channel.forceAllowThirdPartyCookie = true; - } + var xmlhttp = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] + .createInstance(); + // Prevent certificate/authentication dialogs from popping up + xmlhttp.mozBackgroundRequest = true; + xmlhttp.open('GET', url, true); + // Send cookie even if "Allow third-party cookies" is disabled (>=Fx3.6 only) + if (!Zotero.isFx35) { + var channel = xmlhttp.channel; + channel.QueryInterface(Components.interfaces.nsIHttpChannelInternal); + channel.forceAllowThirdPartyCookie = true; } // Don't cache GET requests @@ -1135,34 +1117,16 @@ Zotero.Utilities.HTTP = new function() { return false; } - // Workaround for "Accept third-party cookies" being off in Firefox 3.0.1 - // https://www.zotero.org/trac/ticket/1070 - if (Zotero.isFx30) { - const Cc = Components.classes; - const Ci = Components.interfaces; - var ds = Cc["@mozilla.org/webshell;1"]. - createInstance(Components.interfaces.nsIDocShellTreeItem). - QueryInterface(Ci.nsIInterfaceRequestor); - ds.itemType = Ci.nsIDocShellTreeItem.typeContent; - var xmlhttp = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]. - createInstance(Ci.nsIXMLHttpRequest); - xmlhttp.mozBackgroundRequest = true; - xmlhttp.open("POST", url, true); - xmlhttp.channel.loadGroup = ds.getInterface(Ci.nsILoadGroup); - xmlhttp.channel.loadFlags |= Ci.nsIChannel.LOAD_DOCUMENT_URI; - } - else { - var xmlhttp = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] - .createInstance(); - // Prevent certificate/authentication dialogs from popping up - xmlhttp.mozBackgroundRequest = true; - xmlhttp.open('POST', url, true); - // Send cookie even if "Allow third-party cookies" is disabled (>=Fx3.6 only) - if (!Zotero.isFx35) { - var channel = xmlhttp.channel; - channel.QueryInterface(Components.interfaces.nsIHttpChannelInternal); - channel.forceAllowThirdPartyCookie = true; - } + var xmlhttp = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] + .createInstance(); + // Prevent certificate/authentication dialogs from popping up + xmlhttp.mozBackgroundRequest = true; + xmlhttp.open('POST', url, true); + // Send cookie even if "Allow third-party cookies" is disabled (>=Fx3.6 only) + if (!Zotero.isFx35) { + var channel = xmlhttp.channel; + channel.QueryInterface(Components.interfaces.nsIHttpChannelInternal); + channel.forceAllowThirdPartyCookie = true; } if (headers) { @@ -1224,35 +1188,16 @@ Zotero.Utilities.HTTP = new function() { return false; } - // Workaround for "Accept third-party cookies" being off in Firefox 3.0.1 - // https://www.zotero.org/trac/ticket/1070 - if (Zotero.isFx30) { - const Cc = Components.classes; - const Ci = Components.interfaces; - var ds = Cc["@mozilla.org/webshell;1"]. - createInstance(Components.interfaces.nsIDocShellTreeItem). - QueryInterface(Ci.nsIInterfaceRequestor); - ds.itemType = Ci.nsIDocShellTreeItem.typeContent; - var xmlhttp = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]. - createInstance(Ci.nsIXMLHttpRequest); - // Prevent certificate/authentication dialogs from popping up - xmlhttp.mozBackgroundRequest = true; - xmlhttp.open("HEAD", url, true); - xmlhttp.channel.loadGroup = ds.getInterface(Ci.nsILoadGroup); - xmlhttp.channel.loadFlags |= Ci.nsIChannel.LOAD_DOCUMENT_URI; - } - else { - var xmlhttp = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] - .createInstance(); - // Prevent certificate/authentication dialogs from popping up - xmlhttp.mozBackgroundRequest = true; - xmlhttp.open('HEAD', url, true); - // Send cookie even if "Allow third-party cookies" is disabled (>=Fx3.6 only) - if (!Zotero.isFx35) { - var channel = xmlhttp.channel; - channel.QueryInterface(Components.interfaces.nsIHttpChannelInternal); - channel.forceAllowThirdPartyCookie = true; - } + var xmlhttp = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] + .createInstance(); + // Prevent certificate/authentication dialogs from popping up + xmlhttp.mozBackgroundRequest = true; + xmlhttp.open('HEAD', url, true); + // Send cookie even if "Allow third-party cookies" is disabled (>=Fx3.6 only) + if (!Zotero.isFx35) { + var channel = xmlhttp.channel; + channel.QueryInterface(Components.interfaces.nsIHttpChannelInternal); + channel.forceAllowThirdPartyCookie = true; } if (requestHeaders) { @@ -1592,7 +1537,7 @@ Zotero.Utilities.HTTP = new function() { if(typeof(urls) == "string") urls = [urls]; var prevUrl; - var loadEvent = Zotero.isFx2 ? "load" : "pageshow"; + var loadEvent = "pageshow"; var hiddenBrowser = Zotero.Browser.createHiddenBrowser(); hiddenBrowser.addEventListener(loadEvent, onLoad, true); diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js @@ -190,10 +190,7 @@ var Zotero = new function(){ Components.classes["@mozilla.org/xre/app-info;1"]. getService(Components.interfaces.nsIXULAppInfo); this.appName = appInfo.name; - this.isFx2 = appInfo.platformVersion.indexOf('1.8') === 0; // TODO: remove this.isFx3 = appInfo.platformVersion.indexOf('1.9') === 0; - this.isFx30 = appInfo.platformVersion == '1.9' - || appInfo.platformVersion.indexOf('1.9.0') === 0; this.isFx35 = appInfo.platformVersion.indexOf('1.9.1') === 0; this.isFx31 = this.isFx35; this.isFx36 = appInfo.platformVersion.indexOf('1.9.2') === 0; @@ -2363,107 +2360,48 @@ Zotero.DragDrop = { data: [] }; - // Use nsDragAndDrop.js interface for Firefox 2 and Firefox 3.0 - var oldMethod = Zotero.isFx2 || Zotero.isFx30; - if (oldMethod) { - try { - var dataSet = nsTransferable.get( - element.getSupportedFlavours(), - nsDragAndDrop.getDragData, - true - ); - } - catch (e) { - // A work around a limitation in nsDragAndDrop.js -- the mDragSession - // is not set until the drag moves over another control. - // (This will only happen if the first drag is from the item list.) - nsDragAndDrop.mDragSession = nsDragAndDrop.mDragService.getCurrentSession(); - return false; - } - - var firstData = dataSet.first.first; - dragData.dataType = firstData.flavour.contentType; - - var dataList = dataSet.dataList; - var len = firstOnly ? 1 : dataList.length; - - //Zotero.debug("Drag data type is " + dragData.dataType); - - switch (dragData.dataType) { - case 'zotero/collection': - case 'zotero/item': - var ids = firstData.data.split(','); // ids of rows we are dragging in - dragData.data = ids; - break; - - case 'text/x-moz-url': - var urls = []; - for (var i=0; i<len; i++) { - var url = dataList[i].first.data.split("\n")[0]; - urls.push(url); - } - dragData.data = urls; - break; - - case 'application/x-moz-file': - var files = []; - for (var i=0; i<len; i++) { - var file = dataList[i].first.data; - file.QueryInterface(Components.interfaces.nsIFile); - // Don't allow folder drag - if (file.isDirectory()) { - continue; - } - files.push(file); - } - dragData.data = files; - break; - } + var dt = this.currentDataTransfer; + if (!dt) { + Zotero.debug("Drag data not available"); + return false; } - // Firefox 3.1 and higher - else { - var dt = this.currentDataTransfer; - if (!dt) { - Zotero.debug("Drag data not available"); - return false; - } - - var len = firstOnly ? 1 : dt.mozItemCount; - - if (dt.types.contains('zotero/collection')) { - dragData.dataType = 'zotero/collection'; - var ids = dt.getData('zotero/collection').split(","); - dragData.data = ids; - } - else if (dt.types.contains('zotero/item')) { - dragData.dataType = 'zotero/item'; - var ids = dt.getData('zotero/item').split(","); - dragData.data = ids; - } - else if (dt.types.contains('application/x-moz-file')) { - dragData.dataType = 'application/x-moz-file'; - var files = []; - for (var i=0; i<len; i++) { - var file = dt.mozGetDataAt("application/x-moz-file", i); - file.QueryInterface(Components.interfaces.nsIFile); - // Don't allow folder drag - if (file.isDirectory()) { - continue; - } - files.push(file); - } - dragData.data = files; - } - else if (dt.types.contains('text/x-moz-url')) { - dragData.dataType = 'text/x-moz-url'; - var urls = []; - for (var i=0; i<len; i++) { - var url = dt.getData("text/x-moz-url").split("\n")[0]; - urls.push(url); + + var len = firstOnly ? 1 : dt.mozItemCount; + + if (dt.types.contains('zotero/collection')) { + dragData.dataType = 'zotero/collection'; + var ids = dt.getData('zotero/collection').split(","); + dragData.data = ids; + } + else if (dt.types.contains('zotero/item')) { + dragData.dataType = 'zotero/item'; + var ids = dt.getData('zotero/item').split(","); + dragData.data = ids; + } + else if (dt.types.contains('application/x-moz-file')) { + dragData.dataType = 'application/x-moz-file'; + var files = []; + for (var i=0; i<len; i++) { + var file = dt.mozGetDataAt("application/x-moz-file", i); + file.QueryInterface(Components.interfaces.nsIFile); + // Don't allow folder drag + if (file.isDirectory()) { + continue; } - dragData.data = urls; + files.push(file); + } + dragData.data = files; + } + else if (dt.types.contains('text/x-moz-url')) { + dragData.dataType = 'text/x-moz-url'; + var urls = []; + for (var i=0; i<len; i++) { + var url = dt.getData("text/x-moz-url").split("\n")[0]; + urls.push(url); } + dragData.data = urls; } + return dragData; } } diff --git a/chrome/locale/af-ZA/zotero/zotero.dtd b/chrome/locale/af-ZA/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "About Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Advanced Search"> -<!ENTITY zotero.toolbar.search.label "Search:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Toggle Fullscreen Mode"> <!ENTITY zotero.toolbar.openURL.label "Locate"> <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Save as RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Save as HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copy to Clipboard"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "Print"> <!ENTITY zotero.integration.docPrefs.title "Document Preferences"> diff --git a/chrome/locale/ar/zotero/zotero.dtd b/chrome/locale/ar/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "حول زوتيرو"> <!ENTITY zotero.toolbar.advancedSearch "بحث متقدم"> -<!ENTITY zotero.toolbar.search.label "بحث:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "فعّل نمط الشاشة الكاملة"> <!ENTITY zotero.toolbar.openURL.label "إيجاد الموضع"> <!ENTITY zotero.toolbar.openURL.tooltip "ابحث في مكتبتك المحلية"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "حفظ كملف RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "حفظ كملف HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "نسخ للحافظة"> -<!ENTITY zotero.bibliography.macClipboardWarning "(ستخسر تنسيقات النص)"> <!ENTITY zotero.bibliography.print.label "طباعة"> <!ENTITY zotero.integration.docPrefs.title "تفضيلات المستند"> diff --git a/chrome/locale/bg-BG/zotero/zotero.dtd b/chrome/locale/bg-BG/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Подръжка и документация"> <!ENTITY zotero.toolbar.about.label "За Зотеро"> <!ENTITY zotero.toolbar.advancedSearch "Търсене за напреднали"> -<!ENTITY zotero.toolbar.search.label "Търси:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Превключва режим на цял екран"> <!ENTITY zotero.toolbar.openURL.label "Открива"> <!ENTITY zotero.toolbar.openURL.tooltip "Открива чрез вашата локална библиотека"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Записва като RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Записва като HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Копира в клипборда"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Богатото форматиране на текста ще бъде загубено.)"> <!ENTITY zotero.bibliography.print.label "Печат"> <!ENTITY zotero.integration.docPrefs.title "Настройки на докумета"> diff --git a/chrome/locale/ca-AD/zotero/zotero.dtd b/chrome/locale/ca-AD/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "Sobre Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Cerca avançada"> -<!ENTITY zotero.toolbar.search.label "Cerca:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Canvia al mode de pantalla completa"> <!ENTITY zotero.toolbar.openURL.label "Localitza"> <!ENTITY zotero.toolbar.openURL.tooltip "Cerca&apos;l a la teva biblioteca local"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Desa com a RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Desa com a HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Desa al portaretalls"> -<!ENTITY zotero.bibliography.macClipboardWarning "(El format de text enriquit es perdrà.)"> <!ENTITY zotero.bibliography.print.label "Imprimeix"> <!ENTITY zotero.integration.docPrefs.title "Preferències del document"> diff --git a/chrome/locale/cs-CZ/zotero/zotero.dtd b/chrome/locale/cs-CZ/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Podpora a dokumentace"> <!ENTITY zotero.toolbar.about.label "O Zoteru"> <!ENTITY zotero.toolbar.advancedSearch "Pokročilé vyhledávání"> -<!ENTITY zotero.toolbar.search.label "Hledat:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Tlačítko celoobrazovkového módu"> <!ENTITY zotero.toolbar.openURL.label "Najít"> <!ENTITY zotero.toolbar.openURL.tooltip "Najít prostřednictvím vaší místní knihovny"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Uložit jako RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Uložit jako HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Kopírovat do schránky"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formátování bude ztraceno.)"> <!ENTITY zotero.bibliography.print.label "Tisknout"> <!ENTITY zotero.integration.docPrefs.title "Vlastnosti dokumentu"> diff --git a/chrome/locale/da-DK/zotero/zotero.dtd b/chrome/locale/da-DK/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "About Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Advanced Search"> -<!ENTITY zotero.toolbar.search.label "Search:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Toggle Fullscreen Mode"> <!ENTITY zotero.toolbar.openURL.label "Locate"> <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Save as RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Save as HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copy to Clipboard"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "Print"> <!ENTITY zotero.integration.docPrefs.title "Document Preferences"> diff --git a/chrome/locale/de-AT/zotero/zotero.dtd b/chrome/locale/de-AT/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "Über Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Advanced Search"> -<!ENTITY zotero.toolbar.search.label "Suche:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Fullscreen-Modus an/aus"> <!ENTITY zotero.toolbar.openURL.label "Finden"> <!ENTITY zotero.toolbar.openURL.tooltip "In lokaler Bibliothek finden"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Als RTF speichern"> <!ENTITY zotero.bibliography.saveAsHTML.label "Als HTML speicher"> <!ENTITY zotero.bibliography.copyToClipboard.label "In die Zwischenablage kopieren"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "Drucken"> <!ENTITY zotero.integration.docPrefs.title "Dokument-Eigenschaften"> diff --git a/chrome/locale/de-CH/zotero/zotero.dtd b/chrome/locale/de-CH/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "Über Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Advanced Search"> -<!ENTITY zotero.toolbar.search.label "Suche:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Fullscreen-Modus an/aus"> <!ENTITY zotero.toolbar.openURL.label "Finden"> <!ENTITY zotero.toolbar.openURL.tooltip "In lokaler Bibliothek finden"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Als RTF speichern"> <!ENTITY zotero.bibliography.saveAsHTML.label "Als HTML speicher"> <!ENTITY zotero.bibliography.copyToClipboard.label "In die Zwischenablage kopieren"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "Drucken"> <!ENTITY zotero.integration.docPrefs.title "Dokument-Eigenschaften"> diff --git a/chrome/locale/de-DE/zotero/zotero.dtd b/chrome/locale/de-DE/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Hilfe und Dokumentation"> <!ENTITY zotero.toolbar.about.label "Über Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Erweiterte Suche"> -<!ENTITY zotero.toolbar.search.label "Suche:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Vollbild-Modus an/aus"> <!ENTITY zotero.toolbar.openURL.label "Finden"> <!ENTITY zotero.toolbar.openURL.tooltip "In lokaler Bibliothek finden"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Als RTF speichern"> <!ENTITY zotero.bibliography.saveAsHTML.label "Als HTML speichern"> <!ENTITY zotero.bibliography.copyToClipboard.label "In die Zwischenablage kopieren"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-Text-Formatierung geht dabei verloren.)"> <!ENTITY zotero.bibliography.print.label "Drucken"> <!ENTITY zotero.integration.docPrefs.title "Dokument-Eigenschaften"> diff --git a/chrome/locale/el-GR/zotero/zotero.dtd b/chrome/locale/el-GR/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "About Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Advanced Search"> -<!ENTITY zotero.toolbar.search.label "Search:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Toggle Fullscreen Mode"> <!ENTITY zotero.toolbar.openURL.label "Locate"> <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Save as RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Save as HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copy to Clipboard"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "Print"> <!ENTITY zotero.integration.docPrefs.title "Document Preferences"> diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "About Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Advanced Search"> -<!ENTITY zotero.toolbar.search.label "Search:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Toggle Fullscreen Mode"> <!ENTITY zotero.toolbar.openURL.label "Locate"> <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Save as RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Save as HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copy to Clipboard"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "Print"> <!ENTITY zotero.integration.docPrefs.title "Document Preferences"> diff --git a/chrome/locale/es-ES/zotero/zotero.dtd b/chrome/locale/es-ES/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "Acerca de Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Búsqueda avanzada"> -<!ENTITY zotero.toolbar.search.label "Buscar:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Conmutar el modo de pantalla completa"> <!ENTITY zotero.toolbar.openURL.label "Localizar"> <!ENTITY zotero.toolbar.openURL.tooltip "Encontrar mediante tu biblioteca local"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Guardar como RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Guardar como HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copiar al portapapeles"> -<!ENTITY zotero.bibliography.macClipboardWarning "(El formato especial se perderá)"> <!ENTITY zotero.bibliography.print.label "Imprimir"> <!ENTITY zotero.integration.docPrefs.title "Ajustes de documento"> diff --git a/chrome/locale/et-EE/zotero/zotero.dtd b/chrome/locale/et-EE/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "About Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Advanced Search"> -<!ENTITY zotero.toolbar.search.label "Search:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Toggle Fullscreen Mode"> <!ENTITY zotero.toolbar.openURL.label "Locate"> <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Save as RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Save as HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copy to Clipboard"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "Print"> <!ENTITY zotero.integration.docPrefs.title "Document Preferences"> diff --git a/chrome/locale/eu-ES/zotero/zotero.dtd b/chrome/locale/eu-ES/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Laguntza eta dokumentazioa"> <!ENTITY zotero.toolbar.about.label "Zotero-ri buruz"> <!ENTITY zotero.toolbar.advancedSearch "Bilaketa aurreratua"> -<!ENTITY zotero.toolbar.search.label "Bilaketa:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Zotero paintaila osoan"> <!ENTITY zotero.toolbar.openURL.label "Aurkitu"> <!ENTITY zotero.toolbar.openURL.tooltip "Liburutegi publikoan bilatu"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "RTF gisa gorde"> <!ENTITY zotero.bibliography.saveAsHTML.label "HTML gisa gorde"> <!ENTITY zotero.bibliography.copyToClipboard.label "Arbelera kopiatu"> -<!ENTITY zotero.bibliography.macClipboardWarning "(RTF formatua galdu egingo da.)"> <!ENTITY zotero.bibliography.print.label "Inprimatu"> <!ENTITY zotero.integration.docPrefs.title "Dokumentu honetako ezaugarriak"> diff --git a/chrome/locale/fi-FI/zotero/zotero.dtd b/chrome/locale/fi-FI/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "About Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Advanced Search"> -<!ENTITY zotero.toolbar.search.label "Search:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Toggle Fullscreen Mode"> <!ENTITY zotero.toolbar.openURL.label "Locate"> <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Save as RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Save as HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copy to Clipboard"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "Print"> <!ENTITY zotero.integration.docPrefs.title "Document Preferences"> diff --git a/chrome/locale/fr-FR/zotero/zotero.dtd b/chrome/locale/fr-FR/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Assistance et documentation"> <!ENTITY zotero.toolbar.about.label "À propos de Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Recherche avancée"> -<!ENTITY zotero.toolbar.search.label "Recherche :"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Bascule du mode plein écran"> <!ENTITY zotero.toolbar.openURL.label "Localiser"> <!ENTITY zotero.toolbar.openURL.tooltip "Chercher dans votre bibliothèque locale"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Enregistrer au format RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Enregistrer au format HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copier dans le presse-papiers"> -<!ENTITY zotero.bibliography.macClipboardWarning "(le formatage en texte enrichi sera perdu.)"> <!ENTITY zotero.bibliography.print.label "Imprimer"> <!ENTITY zotero.integration.docPrefs.title "Préférences du document"> diff --git a/chrome/locale/gl-ES/zotero/zotero.dtd b/chrome/locale/gl-ES/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Axuda e Documentación"> <!ENTITY zotero.toolbar.about.label "Verbo do Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Procura Avanzada"> -<!ENTITY zotero.toolbar.search.label "Procura:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Cambiar a Modo de Pantalla Completa"> <!ENTITY zotero.toolbar.openURL.label "Localizar"> <!ENTITY zotero.toolbar.openURL.tooltip "Atopar a través da súa biblioteca local"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Gravar como RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Gravar como HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copiar no Portapapeis"> -<!ENTITY zotero.bibliography.macClipboardWarning "(perderase o formato Rich-Text.)"> <!ENTITY zotero.bibliography.print.label "Imprimir"> <!ENTITY zotero.integration.docPrefs.title "Preferencias do Documento"> diff --git a/chrome/locale/he-IL/zotero/zotero.dtd b/chrome/locale/he-IL/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "About Zotero"> <!ENTITY zotero.toolbar.advancedSearch "חיפוש מתקדם"> -<!ENTITY zotero.toolbar.search.label ":חיפוש"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Toggle Fullscreen Mode"> <!ENTITY zotero.toolbar.openURL.label "Locate"> <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "שמור כ-RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "שמור כ-HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copy to Clipboard"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "הדפסה"> <!ENTITY zotero.integration.docPrefs.title "Document Preferences"> diff --git a/chrome/locale/hr-HR/zotero/zotero.dtd b/chrome/locale/hr-HR/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "About Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Advanced Search"> -<!ENTITY zotero.toolbar.search.label "Search:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Toggle Fullscreen Mode"> <!ENTITY zotero.toolbar.openURL.label "Locate"> <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Save as RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Save as HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copy to Clipboard"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "Print"> <!ENTITY zotero.integration.docPrefs.title "Document Preferences"> diff --git a/chrome/locale/hu-HU/zotero/zotero.dtd b/chrome/locale/hu-HU/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Támogatás és dokumentáció"> <!ENTITY zotero.toolbar.about.label "Névjegy"> <!ENTITY zotero.toolbar.advancedSearch "Haladó keresés"> -<!ENTITY zotero.toolbar.search.label "Keresés:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Teljes képernyős üzemmód"> <!ENTITY zotero.toolbar.openURL.label "Keresés"> <!ENTITY zotero.toolbar.openURL.tooltip "Hol találom a helyi könyvtárban?"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Mentés RTF-ként"> <!ENTITY zotero.bibliography.saveAsHTML.label "Mentés HTML-ként"> <!ENTITY zotero.bibliography.copyToClipboard.label "Másolás a vágólapra"> -<!ENTITY zotero.bibliography.macClipboardWarning "(A formázás elveszik.)"> <!ENTITY zotero.bibliography.print.label "Nyomtatás"> <!ENTITY zotero.integration.docPrefs.title "Dokumentum beállításai"> diff --git a/chrome/locale/is-IS/zotero/zotero.dtd b/chrome/locale/is-IS/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "About Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Advanced Search"> -<!ENTITY zotero.toolbar.search.label "Search:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Toggle Fullscreen Mode"> <!ENTITY zotero.toolbar.openURL.label "Locate"> <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Save as RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Save as HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copy to Clipboard"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "Print"> <!ENTITY zotero.integration.docPrefs.title "Document Preferences"> diff --git a/chrome/locale/it-IT/zotero/zotero.dtd b/chrome/locale/it-IT/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "Informazioni su Zotero..."> <!ENTITY zotero.toolbar.advancedSearch "Ricerca avanzata"> -<!ENTITY zotero.toolbar.search.label "Cerca:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Attiva o disattiva schermo intero"> <!ENTITY zotero.toolbar.openURL.label "Trova"> <!ENTITY zotero.toolbar.openURL.tooltip "Cerca nelle librerie personali"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Salva come RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Salva come HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copia negli Appunti"> -<!ENTITY zotero.bibliography.macClipboardWarning "(La formattazione RTF andrà persa)"> <!ENTITY zotero.bibliography.print.label "Stampa"> <!ENTITY zotero.integration.docPrefs.title "Impostazioni documento"> diff --git a/chrome/locale/ja-JP/zotero/zotero.dtd b/chrome/locale/ja-JP/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "Zoteroについて"> <!ENTITY zotero.toolbar.advancedSearch "詳細検索"> -<!ENTITY zotero.toolbar.search.label "検索:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "全画面表示"> <!ENTITY zotero.toolbar.openURL.label "所在確認"> <!ENTITY zotero.toolbar.openURL.tooltip "あなたのローカル図書館を通して発見"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "RTFとして保存"> <!ENTITY zotero.bibliography.saveAsHTML.label "HTMLとして保存"> <!ENTITY zotero.bibliography.copyToClipboard.label "クリップボードにコピー"> -<!ENTITY zotero.bibliography.macClipboardWarning "(リッチテキストフォーマットは失われます)"> <!ENTITY zotero.bibliography.print.label "印刷"> <!ENTITY zotero.integration.docPrefs.title "ドキュメントの設定"> diff --git a/chrome/locale/ko-KR/zotero/zotero.dtd b/chrome/locale/ko-KR/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "지원 및 문서"> <!ENTITY zotero.toolbar.about.label "Zotero 정보"> <!ENTITY zotero.toolbar.advancedSearch "고급 검색"> -<!ENTITY zotero.toolbar.search.label "검색:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "전체화면 모드 끄기/켜기"> <!ENTITY zotero.toolbar.openURL.label "위치"> <!ENTITY zotero.toolbar.openURL.tooltip "지역 라이브러리를 통해 검색"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "RTF로 저장"> <!ENTITY zotero.bibliography.saveAsHTML.label "HTML로 저장"> <!ENTITY zotero.bibliography.copyToClipboard.label "클립보드로 복사"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text 형식을 잃을 겁니다.)"> <!ENTITY zotero.bibliography.print.label "인쇄"> <!ENTITY zotero.integration.docPrefs.title "문서 환경설정"> diff --git a/chrome/locale/mn-MN/zotero/zotero.dtd b/chrome/locale/mn-MN/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "Зотерогийн тухай"> <!ENTITY zotero.toolbar.advancedSearch "Advanced Search"> -<!ENTITY zotero.toolbar.search.label "Хайх:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Toggle Fullscreen Mode"> <!ENTITY zotero.toolbar.openURL.label "Locate"> <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "RTF-р хадгалах"> <!ENTITY zotero.bibliography.saveAsHTML.label "HTML-р хадгалах"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copy to Clipboard"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "Хэвлэх"> <!ENTITY zotero.integration.docPrefs.title "Document Preferences"> diff --git a/chrome/locale/nb-NO/zotero/zotero.dtd b/chrome/locale/nb-NO/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "Om Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Avansert søk"> -<!ENTITY zotero.toolbar.search.label "Søk:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Velg fullskjermmodus"> <!ENTITY zotero.toolbar.openURL.label "Lokaliser"> <!ENTITY zotero.toolbar.openURL.tooltip "Finn gjennom ditt lokale bibliotek"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Lagre som RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Lagre som HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Kopier til utklippstavle"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rik-tekst-formatering forsvinner)"> <!ENTITY zotero.bibliography.print.label "Skriv ut"> <!ENTITY zotero.integration.docPrefs.title "Dokumentegenskaper"> diff --git a/chrome/locale/nl-NL/zotero/zotero.dtd b/chrome/locale/nl-NL/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Ondersteuning en documentatie"> <!ENTITY zotero.toolbar.about.label "Over Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Uitgebreid zoeken"> -<!ENTITY zotero.toolbar.search.label "Zoeken:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Zotero schermvullend maken"> <!ENTITY zotero.toolbar.openURL.label "Opzoeken"> <!ENTITY zotero.toolbar.openURL.tooltip "Bij uw bibliotheek opzoeken"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Bewaar als RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Bewaar als HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Naar klembord kopiëren"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Tekstopmaak zal verloren gaan.)"> <!ENTITY zotero.bibliography.print.label "Afdrukken"> <!ENTITY zotero.integration.docPrefs.title "Documentvoorkeuren"> diff --git a/chrome/locale/pl-PL/zotero/zotero.dtd b/chrome/locale/pl-PL/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "Zotero - informacje"> <!ENTITY zotero.toolbar.advancedSearch "Wyszukiwanie zaawansowane"> -<!ENTITY zotero.toolbar.search.label "Znajdź:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Maksymalizuj/Minimalizuj"> <!ENTITY zotero.toolbar.openURL.label "Wyszukaj lokalnie"> <!ENTITY zotero.toolbar.openURL.tooltip "Wyszukuje w katalogu lokalnej biblioteki"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Zapisz jako RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Zapisz jako HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Kopiuj do schowka"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Formatowanie RTF zostanie utracone)"> <!ENTITY zotero.bibliography.print.label "Drukuj"> <!ENTITY zotero.integration.docPrefs.title "Ustawienia dokumentu"> diff --git a/chrome/locale/pt-BR/zotero/zotero.dtd b/chrome/locale/pt-BR/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "Sobre Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Advanced Search"> -<!ENTITY zotero.toolbar.search.label "Pesquisa:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Modo Tela Cheia"> <!ENTITY zotero.toolbar.openURL.label "Localizar"> <!ENTITY zotero.toolbar.openURL.tooltip "Encontrar através de sua biblioteca local"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Salvar como RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Salvar como HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copiar para Área de Transferência"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "Imprimir"> <!ENTITY zotero.integration.docPrefs.title "Preferências do documento"> diff --git a/chrome/locale/pt-PT/zotero/zotero.dtd b/chrome/locale/pt-PT/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Suporte e Documentação"> <!ENTITY zotero.toolbar.about.label "Acerca do Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Procura Avançada"> -<!ENTITY zotero.toolbar.search.label "Procurar:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Alternar Modo de Ecrã Inteiro"> <!ENTITY zotero.toolbar.openURL.label "Localizar"> <!ENTITY zotero.toolbar.openURL.tooltip "Encontrar através da sua biblioteca local"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Guardar como RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Guardar como HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copiar"> -<!ENTITY zotero.bibliography.macClipboardWarning "(A formação em texto rico perder-se-á.)"> <!ENTITY zotero.bibliography.print.label "Imprimir"> <!ENTITY zotero.integration.docPrefs.title "Preferências do Documento"> diff --git a/chrome/locale/ro-RO/zotero/zotero.dtd b/chrome/locale/ro-RO/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Suport și documentație"> <!ENTITY zotero.toolbar.about.label "Despre Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Căutare avansată"> -<!ENTITY zotero.toolbar.search.label "Caută:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Extinde pe tot ecranul"> <!ENTITY zotero.toolbar.openURL.label "Localizare"> <!ENTITY zotero.toolbar.openURL.tooltip "Găsește în biblioteca ta locală"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Salvează ca RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Salvează ca HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Copiază în memoria clipboard"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Formatările RTF vor fi pierdute.)"> <!ENTITY zotero.bibliography.print.label "Imprimare"> <!ENTITY zotero.integration.docPrefs.title "Preferințe document"> diff --git a/chrome/locale/ru-RU/zotero/zotero.dtd b/chrome/locale/ru-RU/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Поддержка и документация"> <!ENTITY zotero.toolbar.about.label "О Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Расширенный поиск"> -<!ENTITY zotero.toolbar.search.label "Поиск:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Переключение полноэкранного Режима"> <!ENTITY zotero.toolbar.openURL.label "Найти"> <!ENTITY zotero.toolbar.openURL.tooltip "Найти через местную библиотеку"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Сохранить как RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Сохранить как HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Скопировать в буфер обмена"> -<!ENTITY zotero.bibliography.macClipboardWarning "(форматирование RTF будет утрачено.)"> <!ENTITY zotero.bibliography.print.label "Распечатать"> <!ENTITY zotero.integration.docPrefs.title "Параметры документа"> diff --git a/chrome/locale/sk-SK/zotero/zotero.dtd b/chrome/locale/sk-SK/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Podpora a dokumentácia"> <!ENTITY zotero.toolbar.about.label "O Zotere"> <!ENTITY zotero.toolbar.advancedSearch "Pokročilé vyhľadávanie"> -<!ENTITY zotero.toolbar.search.label "Hľadať:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Zväčšiť do celého okna"> <!ENTITY zotero.toolbar.openURL.label "Nájsť"> <!ENTITY zotero.toolbar.openURL.tooltip "Nájdi v miestnej knižnici"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Uložiť ako RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Uložiť ako HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Skopírovať do schránky"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Formátovanie textu sa nezachová)"> <!ENTITY zotero.bibliography.print.label "Tlačiť"> <!ENTITY zotero.integration.docPrefs.title "Vlastnosti dokumentu"> diff --git a/chrome/locale/sl-SI/zotero/zotero.dtd b/chrome/locale/sl-SI/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Podpora in dokumentacija"> <!ENTITY zotero.toolbar.about.label "O Zoteru"> <!ENTITY zotero.toolbar.advancedSearch "Napredno izkanje"> -<!ENTITY zotero.toolbar.search.label "Išči:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Vključi/izključi celozaslonski način"> <!ENTITY zotero.toolbar.openURL.label "Najdi"> <!ENTITY zotero.toolbar.openURL.tooltip "Poišči v krajevni knjižnici"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Shrani kot RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Shrani kot HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Kopiraj na odložišče"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Oblikovanje bo izgubljeno.)"> <!ENTITY zotero.bibliography.print.label "Natisni"> <!ENTITY zotero.integration.docPrefs.title "Lastnosti dokumenta"> diff --git a/chrome/locale/sr-RS/zotero/zotero.dtd b/chrome/locale/sr-RS/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Подршка и документација"> <!ENTITY zotero.toolbar.about.label "О програму Зотеро"> <!ENTITY zotero.toolbar.advancedSearch "Напредна претрага"> -<!ENTITY zotero.toolbar.search.label "Претражи:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Укључи/искључи приказ преко читавог екрана"> <!ENTITY zotero.toolbar.openURL.label "Пронађи"> <!ENTITY zotero.toolbar.openURL.tooltip "Нађи кроз вашу локалну библиотеку"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Сними као RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Сними као HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Умножи"> -<!ENTITY zotero.bibliography.macClipboardWarning "(rich-text формат ће бити изгубљен.)"> <!ENTITY zotero.bibliography.print.label "Штампај"> <!ENTITY zotero.integration.docPrefs.title "Поставке документа"> diff --git a/chrome/locale/sv-SE/zotero/zotero.dtd b/chrome/locale/sv-SE/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "Om Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Avancerad sök:"> -<!ENTITY zotero.toolbar.search.label "Sök:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Växla fullskärmsläge"> <!ENTITY zotero.toolbar.openURL.label "Hitta"> <!ENTITY zotero.toolbar.openURL.tooltip "Hitta genom ditt lokala bibliotek"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Spara som RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Spara som HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Kopiera till klippbord"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-textformattering kommer att förloras.)"> <!ENTITY zotero.bibliography.print.label "Skriv ut"> <!ENTITY zotero.integration.docPrefs.title "Dokumentinställningar"> diff --git a/chrome/locale/th-TH/zotero/zotero.dtd b/chrome/locale/th-TH/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "เกี่ยวกับโซแทโร"> <!ENTITY zotero.toolbar.advancedSearch "Advanced Search"> -<!ENTITY zotero.toolbar.search.label "ค้นหา:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Toggle Fullscreen Mode"> <!ENTITY zotero.toolbar.openURL.label "Locate"> <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "บันทึกเป็น RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "บันทึกเป็น HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "ทำสำเนาไปคลิปบอร์ด"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Rich-text formatting will be lost.)"> <!ENTITY zotero.bibliography.print.label "พิมพ์"> <!ENTITY zotero.integration.docPrefs.title "Document Preferences"> diff --git a/chrome/locale/tr-TR/zotero/zotero.dtd b/chrome/locale/tr-TR/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Destek ve Belgeleme"> <!ENTITY zotero.toolbar.about.label "Zotero Hakkında"> <!ENTITY zotero.toolbar.advancedSearch "Gelişmiş Arama"> -<!ENTITY zotero.toolbar.search.label "Arama:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Tam Ekran Moduna Geç"> <!ENTITY zotero.toolbar.openURL.label "Yerini Belirle"> <!ENTITY zotero.toolbar.openURL.tooltip "Yerel Kitaplığınızda Bul"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "RTF olarak Kaydet"> <!ENTITY zotero.bibliography.saveAsHTML.label "HTML olarak Kaydet"> <!ENTITY zotero.bibliography.copyToClipboard.label "Pano'ya Kopyala"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Zengin-metin biçimi kaybedilecek)"> <!ENTITY zotero.bibliography.print.label "Yazdır"> <!ENTITY zotero.integration.docPrefs.title "Döküman Tercihleri"> diff --git a/chrome/locale/vi-VN/zotero/zotero.dtd b/chrome/locale/vi-VN/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "Giới thiệu về Zotero"> <!ENTITY zotero.toolbar.advancedSearch "Tìm kiếm Nâng cao"> -<!ENTITY zotero.toolbar.search.label "Tìm kiếm:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "Bật/Tắt chế độ Toàn màn hình"> <!ENTITY zotero.toolbar.openURL.label "Định vị"> <!ENTITY zotero.toolbar.openURL.tooltip "Tìm trong thư viện cục bộ của bạn"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "Lưu dưới dạng RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "Lưu dưới dạng HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "Sao chép vào Clipboard"> -<!ENTITY zotero.bibliography.macClipboardWarning "(Định dạng rich-text sẽ bị mất.)"> <!ENTITY zotero.bibliography.print.label "In"> <!ENTITY zotero.integration.docPrefs.title "Các tùy chọn về Tài liệu"> diff --git a/chrome/locale/zh-CN/zotero/zotero.dtd b/chrome/locale/zh-CN/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation"> <!ENTITY zotero.toolbar.about.label "关于 Zotero"> <!ENTITY zotero.toolbar.advancedSearch "高级检索"> -<!ENTITY zotero.toolbar.search.label "检索:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "切换全屏模式"> <!ENTITY zotero.toolbar.openURL.label "定位"> <!ENTITY zotero.toolbar.openURL.tooltip "在本地图书馆里查找"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "另存为 RTF"> <!ENTITY zotero.bibliography.saveAsHTML.label "另存为 HTML"> <!ENTITY zotero.bibliography.copyToClipboard.label "复制到剪贴板"> -<!ENTITY zotero.bibliography.macClipboardWarning "(富文本格式将会丢失.)"> <!ENTITY zotero.bibliography.print.label "打印"> <!ENTITY zotero.integration.docPrefs.title "文档选项"> diff --git a/chrome/locale/zh-TW/zotero/zotero.dtd b/chrome/locale/zh-TW/zotero/zotero.dtd @@ -87,7 +87,6 @@ <!ENTITY zotero.toolbar.supportAndDocumentation "支援及說明文件"> <!ENTITY zotero.toolbar.about.label "關於 Zotero…"> <!ENTITY zotero.toolbar.advancedSearch "進階搜尋"> -<!ENTITY zotero.toolbar.search.label "搜尋:"> <!ENTITY zotero.toolbar.fullscreen.tooltip "切換全螢幕模式"> <!ENTITY zotero.toolbar.openURL.label "找出"> <!ENTITY zotero.toolbar.openURL.tooltip "用你本地的圖書館來尋找"> @@ -128,7 +127,6 @@ <!ENTITY zotero.bibliography.saveAsRTF.label "儲存成 RTF 檔"> <!ENTITY zotero.bibliography.saveAsHTML.label "儲存成 HTML 檔"> <!ENTITY zotero.bibliography.copyToClipboard.label "複製到剪貼簿"> -<!ENTITY zotero.bibliography.macClipboardWarning "(會失去 rich-text 的格式。)"> <!ENTITY zotero.bibliography.print.label "列印"> <!ENTITY zotero.integration.docPrefs.title "文件的偏好設定"> diff --git a/chrome/skin/default/zotero/bindings/tagselector.css b/chrome/skin/default/zotero/bindings/tagselector.css @@ -57,17 +57,6 @@ textbox font-size: 11px !important; /* Keep font size in Linux within reason */ } -#search-cancel -{ - width: 0; - height: 0; - margin: 0; - padding: 0; - cursor: default; - list-style-image: url('chrome://zotero/skin/search-cancel.png'); - -moz-appearance: none !important; /* Fix rendering problems on Linux */ -} - groupbox > hbox > hbox { -moz-box-flex: 1; diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css @@ -45,6 +45,11 @@ background: #FFFF99 !important; } +/*#zotero-collections-tree treechildren::-moz-tree-row(separator) +{ + height: .25em; +}*/ + #zotero-pane splitter { border: 0; @@ -261,22 +266,6 @@ width: 150px; } -#zotero-tb-search[type=conditional-timed] > #zotero-tb-search-cancel -{ - width: 10px; - height: 10px; - margin: 0; - padding: 0; - cursor: default; - list-style-image: url('chrome://zotero/skin/search-cancel.png'); - -moz-appearance: none !important; /* Fix rendering problems on Linux */ -} - -#zotero-tb-search[type=conditional-timed] > #zotero-tb-search-cancel:hover:active -{ - list-style-image: url('chrome://zotero/skin/search-cancel-active.png'); -} - #zotero-view-tabbox, #zotero-item-pane-content > groupbox { margin: 0; diff --git a/chrome/skin/default/zotero/search-cancel-active.png b/chrome/skin/default/zotero/search-cancel-active.png Binary files differ. diff --git a/chrome/skin/default/zotero/search-cancel.png b/chrome/skin/default/zotero/search-cancel.png Binary files differ. diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css @@ -53,11 +53,6 @@ toolbar[iconsize="small"] #zotero-toolbar-button:active /* Bindings */ -textbox[type="conditional-timed"] -{ - -moz-binding: url('chrome://zotero/content/bindings/conditional-timed-textbox.xml#conditional-timed-textbox'); -} - textbox[multiline="true"][type="timed"] { -moz-binding: url('chrome://zotero/content/bindings/timedtextarea.xml#timed-textarea'); diff --git a/components/zotero-autocomplete.js b/components/zotero-autocomplete.js @@ -206,7 +206,7 @@ ZoteroAutoComplete.prototype.startSearch = function(searchString, searchParam, p } // Disable asynchronous until we figure out the hangs - if (true || this._zotero.isFx30) { + if (true) { var rows = this._zotero.DB.query(sql, sqlParams); var results = []; var comments = [];