Merge from upstream master

Juris-M · Feb 11, 2017 · 84f26a3 · 84f26a3
2 parents 22618ec + 469d689
commit 84f26a3
Show file tree

Hide file tree

Showing 182 changed files with 6,322 additions and 1,096 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,16 +3,20 @@ language: cpp
 compiler:
     - gcc
 env:
-    - FX_VERSION="49.0.2"
+    - FX_VERSION="50.1.0"
+    - FX_VERSION="45.0.2esr"
 matrix:
     fast_finish: true
     #allow_failures:
     #    - env: FX_CHANNEL="beta"
 notifications:
     email: false
 install:
-    - if [ $FX_VERSION = "49.0.2" ]; then
-        wget -O tarball "https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-release-linux64-add-on-devel/1476892163/firefox-49.0.2.en-US.linux-x86_64-add-on-devel.tar.bz2";
+    - if [ $FX_VERSION = "45.0.2esr" ]; then
+        wget -O tarball "https://archive.mozilla.org/pub/firefox/releases/45.0.2esr/linux-x86_64/en-US/firefox-45.0.2esr.tar.bz2";
+      fi
+    - if [ $FX_VERSION = "50.1.0" ]; then
+        wget -O tarball "http://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-release-linux64-add-on-devel/1481240107/firefox-50.1.0.en-US.linux-x86_64-add-on-devel.tar.bz2";
       fi
     - tar xf tarball
 before_script:

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
@@ -213,7 +213,7 @@
 	background: -moz-linear-gradient(top, #ededed, #cccccc);
 	border-style: solid;
 	border-width: 0 0 1px 0;
-	border-color: #5e5e5e;
+	border-color: #bdbdbd;
 	padding: 2px 0 2px 0;
 }
 
@@ -297,28 +297,34 @@
 	list-style-image: url("chrome://zotero/skin/mac/twisty-selected-open.svg");
 }
 
-#zotero-collections-splitter, #zotero-items-splitter
+#zotero-collections-splitter:not([state=collapsed]),
+#zotero-items-splitter:not([state=collapsed])[orient=horizontal]
 {
 	-moz-appearance: none;
-	-moz-border-start: none !important;
-	-moz-border-end: none !important;
-	background-color: #8b8b8b !important;
-}
-
-#zotero-collections-splitter, #zotero-items-splitter[orient=horizontal]
-{
-	max-width: 1px !important;
-	min-width: 1px !important;
-	width: 1px !important;
+	border-inline-start: 1px solid #bdbdbd;
+	margin-inline-end: -4px;
+	width: 5px !important;
+	min-width: 5px;
+	position: relative;
+	background-image: none;
 }
 
 #zotero-items-splitter[orient=vertical]
 {
+	-moz-border-start: none !important;
+	-moz-border-end: none !important;
+	background-color: #bdbdbd !important;
 	max-height: 1px !important;
 	min-height: 1px !important;
 	height: 1px !important;
 }
 
+#zotero-collections-splitter:not([state=collapsed]) > grippy,
+#zotero-items-splitter:not([state=collapsed]) > grippy
+{
+	display: none;
+}
+
 #zotero-collections-splitter[state=collapsed], #zotero-items-splitter[state=collapsed] {
 	border: 0 solid #d6d6d6 !important;
 	padding: 0;

diff --git a/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul b/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul
@@ -33,10 +33,9 @@
 
 
 <!DOCTYPE overlay [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" >
-%standaloneDTD;
+	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
+	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd"> %standaloneDTD;
+	<!ENTITY % browserDTD SYSTEM "chrome://zotero/locale/mozilla/browser.dtd"> %browserDTD;
 ]>
 <overlay id="menuOverlay"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -84,7 +83,7 @@
         <menuitem id="menu_preferences"
 				label="&preferencesCmdMac.label;"
 				key="key_preferencesCmdMac"
-				oncommand="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').ZoteroPane.openPreferences();"/>
+				oncommand="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').Zotero.Utilities.Internal.openPreferences();"/>
         <menuitem id="menu_mac_services"
 				label="&servicesMenuMac.label;"/>
         <menuitem id="menu_mac_hide_app"

diff --git a/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul b/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul
@@ -33,10 +33,9 @@
 
 
 <!DOCTYPE overlay [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" >
-%standaloneDTD;
+	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
+	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd"> %standaloneDTD;
+	<!ENTITY % browserDTD SYSTEM "chrome://zotero/locale/mozilla/browser.dtd"> %browserDTD;
 ]>
 <overlay id="menuOverlay"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -51,7 +50,8 @@
     <menupopup id="menu_EditPopup">
 		<menuseparator/>
         <menuitem id="menu_preferences"
-				label="&preferencesCmd.label;"
-				oncommand="ZoteroPane.openPreferences();"/>
+				label="&preferencesCmdUnix.label;"
+				accesskey="&preferencesCmdUnix.accesskey;"
+				oncommand="Zotero.Utilities.Internal.openPreferences();"/>
     </menupopup>
 </overlay>
diff --git a/chrome/content/zotero-platform/win/standalone/menuOverlay.xul b/chrome/content/zotero-platform/win/standalone/menuOverlay.xul
@@ -33,10 +33,9 @@
 
 
 <!DOCTYPE overlay [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" >
-%standaloneDTD;
+	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
+	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd"> %standaloneDTD;
+	<!ENTITY % browserDTD SYSTEM "chrome://zotero/locale/mozilla/browser.dtd"> %browserDTD;
 ]>
 <overlay id="menuOverlay"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -51,7 +50,8 @@
     <menupopup id="menu_ToolsPopup">
 		<menuseparator/>
         <menuitem id="menu_preferences"
-				label="&preferencesCmd.label;"
-				oncommand="ZoteroPane.openPreferences();"/>
+				label="&preferencesCmd2.label;"
+				accesskey="&preferencesCmd2.accesskey;"
+				oncommand="Zotero.Utilities.Internal.openPreferences();"/>
     </menupopup>
 </overlay>
diff --git a/chrome/content/zotero/about.xul b/chrome/content/zotero/about.xul
@@ -18,17 +18,20 @@
 	<vbox id="aboutcontent">
 		<label id="name" value="Zotero"/>
 		<hbox>
-			<label class="zotero-text-link" href="http://zotero.org" value="http://zotero.org"/>
+			<label class="zotero-text-link" href="https://www.zotero.org" value="https://www.zotero.org"/>
+		</hbox>
+		<hbox>
+			<label id="version"/>
+			<label class="zotero-text-link" href="https://www.zotero.org/support/changelog" value="&zotero.whatsNew;"/>
 		</hbox>
-		<label id="version" value="&zotero.version; "/>
 		<script>
-			document.getElementById('version').value += Zotero.version;
+			document.getElementById('version').textContent = Zotero.version;
 		</script>
 		<hbox>
 			<vbox id="column1">
 				<label class="subhead" value="&zotero.createdby;"/>
 				<vbox class="subcontent">
-					<label class="zotero-text-link" href="http://chnm.gmu.edu" value="Center for History and New Media"/>
+					<label class="zotero-text-link" href="https://rrchnm.org/" value="Roy Rosenzweig Center for History and New Media"/>
 					<label value="George Mason University"/>
 					<label value="Fairfax, VA, USA"/>
 				</vbox>
@@ -48,25 +51,25 @@
 					<label class="zotero-text-link" href="http://www.imls.gov/" value="Institute of Museum and Library Services"/>
 					<label class="zotero-text-link" href="http://www.sloan.org/" value="Alfred P. Sloan Foundation"/>
 				</vbox>
-				<label class="zotero-text-link" href="http://www.zotero.org/support/credits_and_acknowledgments" value="&zotero.moreCreditsAndAcknowledgements;"/>
+				<label class="zotero-text-link" href="https://www.zotero.org/support/credits_and_acknowledgments" value="&zotero.moreCreditsAndAcknowledgements;"/>
 			</vbox>
 			<vbox id="column2">
 				<label class="subhead" value="&zotero.citationProcessing;"/>
 				<vbox class="subcontent">
 					<label class="zotero-text-link" href="http://citationstyles.org/" value="Citation Style Language"/>
-					<label class="zotero-text-link" href="http://bitbucket.org/fbennett/citeproc-js/" value="citeproc-js (Frank Bennett)"/>
+					<label class="zotero-text-link" href="https://github.com/Juris-M/citeproc-js" value="citeproc-js (Frank Bennett)"/>
 				</vbox>
 				<label class="subhead" value="&zotero.about.additionalSoftware;"/>
 				<vbox class="subcontent">
+					<label class="zotero-text-link" href="http://bluebirdjs.com/" value="Bluebird"/>
 					<label class="zotero-text-link" href="http://p.yusukekamiyamane.com/" value="Fugue icons (by Yusuke Kamiyamane)"/>
 					<label class="zotero-text-link" href="http://www.davidashen.net/rnv.html" value="RNV (CSL validation)"/>
-					<label class="zotero-text-link" href="http://documentup.com/kriskowal/q/" value="Q (by Kristopher Michael Kowal)"/>
 					<label class="zotero-text-link" href="https://codefisher.org/pastel-svg/" value="Pastel SVG icons (by Michael Buckley)"/>
 					<label class="zotero-text-link" href="http://www.famfamfam.com/lab/icons/silk/" value="Silk icons (by Mark James)"/>
 					<label class="zotero-text-link" href="http://simile.mit.edu/timeline/" value="SIMILE Project (Timeline)"/>
 					<label class="zotero-text-link" href="http://www.w3.org/2005/ajar/tab" value="Tabulator (RDF parser)"/>
 					<label class="zotero-text-link" href="http://tango.freedesktop.org/Tango_Desktop_Project" value="Tango Desktop Project (pref icons)"/>
-					<label class="zotero-text-link" href="http://tinymce.moxiecode.com/" value="TinyMCE (rich-text editing)"/>
+					<label class="zotero-text-link" href="https://www.tinymce.com/" value="TinyMCE (rich-text editing)"/>
 					<label class="zotero-text-link" href="http://www.foolabs.com/xpdf/" value="Xpdf (pdftotext)"/>
 				</vbox>
 			</vbox>

diff --git a/chrome/content/zotero/bindings/noteeditor.xml b/chrome/content/zotero/bindings/noteeditor.xml
@@ -171,6 +171,10 @@
 							//Zotero.debug("Skipping notification from current note field");
 							continue;
 						}
+						if (this.noteField.changed) {
+							//Zotero.debug("Note has changed since last save -- skipping refresh");
+							return;
+						}
 						this.refresh();
 						break;
 					}
@@ -181,7 +185,7 @@
 				<body><![CDATA[
 					Zotero.debug('Refreshing note editor');
 					
-					var textbox = this._id('noteField');
+					var textbox = this.noteField;
 					var textboxReadOnly = this._id('noteFieldReadOnly');
 					var button = this._id('goButton');
 					
@@ -249,6 +253,7 @@
 							if (this.item) {
 								let changed = this.item.setNote(noteField.value);
 								if (changed && this.saveOnEdit) {
+									this.noteField.changed = false;
 									yield this.item.saveTx({
 										notifierData: {
 											noteEditorID: this._instanceID

diff --git a/chrome/content/zotero/bindings/styled-textbox.xml b/chrome/content/zotero/bindings/styled-textbox.xml
@@ -429,16 +429,22 @@
 											//Zotero.debug("Not a char");
 											return;
 										}
+										this._changed = true;
 										commandEvent = true;
 										break;
 									
 									// 'change' includes text added via drag-and-drop
 									case 'change':
 									case 'undo':
 									case 'redo':
+										this._changed = true;
 										commandEvent = true;
 										break;
-
+									
+									case 'ZoteroLinkClick':
+										ZoteroPane.loadURI(event.value);
+										break;
+									
 									default:
 										return;
 								}
@@ -524,6 +530,7 @@
 					
 					if (this.value == val) {
 						Zotero.debug("Textbox value hasn't changed");
+						this._changed = false;
 						return;
 					}
 					
@@ -570,7 +577,7 @@
 					onset="this.setAttribute('timeout', val); return val;"
 					onget="return parseInt(this.getAttribute('timeout')) || 0;"/>
 
-			<property name="changed" onget="return this._changed;"/>
+			<property name="changed" onget="return this._changed;" onset="this._changed = !!val;"/>
 
 			<method name="focus">
 				<body>

diff --git a/chrome/content/zotero/browser.js b/chrome/content/zotero/browser.js
@@ -605,7 +605,7 @@ var Zotero_Browser = new function() {
 			return;
 		}
 
-		if (!Zotero.isConnector) {
+		if (!Zotero.isConnector && Zotero.DB.inTransaction()) {
 			yield Zotero.DB.waitForTransaction();
 		}
 

diff --git a/chrome/content/zotero/charsetMenu.js b/chrome/content/zotero/charsetMenu.js
@@ -68,7 +68,7 @@ var Zotero_Charset_Menu = new function() {
 			Components.utils.import("resource://gre/modules/CharsetMenu.jsm");
 			var cmData = CharsetMenu.getData();
 			for (let charsetList of [cmData.pinnedCharsets, cmData.otherCharsets]) {
-				for each(var charsetInfo in charsetList) {
+				for (let charsetInfo of charsetList) {
 					if(charsetInfo.value == "UTF-8") {
 						charsets.push({
 							"label":"Unicode (UTF-8)",