diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css index b68163f77..a0818694b 100644 --- a/chrome/content/zotero-platform/mac/overlay.css +++ b/chrome/content/zotero-platform/mac/overlay.css @@ -174,13 +174,24 @@ -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-selected-down.png") 0 4 0 5 repeat stretch; } -:root:not([active]) #zotero-view-tabbox > tabs > * { - color: #7C7C7C !important; /* remove this when we support click-through */ +#zotero-view-tabbox:-moz-window-inactive > tabs > * { + color: #7C7C7C !important; -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-inactive.png") 0 4 0 5 repeat stretch; } -:root:not([active]) #zotero-view-tabbox > tabs > tab[selected=true] { - color: #C5C5C5 !important; /* remove this when we support click-through */ +#zotero-view-tabbox:-moz-window-inactive > tabs > tab[selected=true] { + color: #C5C5C5 !important; + -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-selected-inactive.png") 0 4 0 5 repeat stretch; +} + +/* Since Fx4 doesn't recognize the -moz-window-inactive pseudoclass as valid, these have to be separate (duplicate) rules to be parsed */ +:root:not([active]) #zotero-pane:not([isFx4]) > #zotero-item-pane > #zotero-item-pane-content > #zotero-view-tabbox > tabs > * { + color: #7C7C7C !important; + -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-inactive.png") 0 4 0 5 repeat stretch; +} + +:root:not([active]) #zotero-pane:not([isFx4]) > #zotero-item-pane > #zotero-item-pane-content > #zotero-view-tabbox > tabs > tab[selected=true] { + color: #C5C5C5 !important; -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-selected-inactive.png") 0 4 0 5 repeat stretch; } @@ -220,6 +231,15 @@ -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-inactive.png") 0 4 0 6 repeat stretch; } +/* Since Fx4 doesn't recognize the -moz-window-inactive pseudoclass as valid, these have to be separate (duplicate) rules to be parsed */ + +: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([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], diff --git a/chrome/content/zotero/xpcom/openurl.js b/chrome/content/zotero/xpcom/openurl.js index e826d047b..261d8df8b 100644 --- a/chrome/content/zotero/xpcom/openurl.js +++ b/chrome/content/zotero/xpcom/openurl.js @@ -109,15 +109,15 @@ Zotero.OpenURL = new function() { if(version == "0.1") { var co = "sid=Zotero:"+encodeURIComponent(Zotero.version); - for each(identifier in identifiers) { - co += "&id="+encodeURIComponent(identifier); + for(var i=0; i= au.firstName.length && - pAu.firstName.substr(0, au.firstName.length) == au.firstName))) { + if(item.creators[j].lastName == complexAu[i].lastName && + (item.creators[j].firstName == complexAu[i].firstName == "" || + (item.creators[j].firstName.length >= complexAu[i].firstName.length && + item.creators[j].firstName.substr(0, complexAu[i].firstName.length) == complexAu[i].firstName))) { pushMe = false; break; } diff --git a/chrome/content/zotero/xpcom/translate.js b/chrome/content/zotero/xpcom/translate.js index 02ae96aa8..5bc6aae70 100644 --- a/chrome/content/zotero/xpcom/translate.js +++ b/chrome/content/zotero/xpcom/translate.js @@ -939,8 +939,8 @@ Zotero.Translate.prototype._generateSandbox = function() { var m = searchSandboxRe.exec(tempURL); if(m) sandboxLocation = m[0]; } - //} else if(this._sandboxLocation) { - // sandboxLocation = this._sandboxLocation; + } else if(this._sandboxLocation) { + sandboxLocation = this._sandboxLocation; } Zotero.debug("Translate: Binding sandbox to "+(typeof sandboxLocation == "object" ? sandboxLocation.document.location : sandboxLocation), 4); diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js index 4f4ace1e5..cb0c70a8c 100644 --- a/chrome/content/zotero/xpcom/utilities.js +++ b/chrome/content/zotero/xpcom/utilities.js @@ -261,17 +261,17 @@ Zotero.Utilities = { var parts = []; var splits = str.split(/(]+>[^<]*<\/a>)/); - for each(var split in splits) { + for(var i=0; i]+)>([^<]*)<\/a>/); + if (splits[i].indexOf(']+)>([^<]*)<\/a>/); if (matches) { // Attribute pairs var attributes = {}; var pairs = matches[1].match(/([^ =]+)="([^"]+")/g); - for each (var pair in pairs) { - var [key, val] = pair.split(/=/); - attributes[key] = val.substr(1, val.length - 2); + for(var j=0; j