amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-02 05:36:23 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 18957933ff736ec180d169de7fd49cb3822d876b

Browse Source 
Monotone-Revision: 3d1fc008307ae248946dc870848b9b73d180f2b6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-12-09T14:47:39
This commit is contained in:
Wolfgang Sourdeau
2011-12-09 14:47:39 +00:00
parent 86c4de27d8
commit 39a545ffed
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2011-12-09 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/generic.js (parent$): handle the case
where window.opener is null.
2011-12-06 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/ContactsUI.js (contactsListCallback):

10
UI/WebServerResources/generic.js
View File

@@ -868,7 +868,7 @@ function log(message) {
try {
if (window.frameElement && window.frameElement.id) {
logWindow = parent.window;
while (logWindow.frameElement && window.frameElement.id)
while (logWindow.frameElement && window.frameElement.id)
logWindow = logWindow.parent.window;
}
else {
@@ -1029,7 +1029,7 @@ function setSearchCriteria(event) {
if (searchValue.ghostPhrase == searchValue.value)
searchValue.value = "";
searchValue.ghostPhrase = this.innerHTML;
searchCriteria.value = this.getAttribute('id');
@@ -1797,10 +1797,12 @@ function parent$(element) {
if (div)
p = parent.document;
else
else if (this.opener)
p = this.opener.document;
else
p = null;
return p.getElementById(element);
return (p ? p.getElementById(element) : null);
}
/* stubs */