LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use double-quotes for setTimeout of UIxJSClose.wox

pull/89/head
Francis Lachapelle 2015-06-10 09:08:10 -04:00
parent a56dbeb6a9
commit e1ecf797f5
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
UI/Contacts/UIxContactEditor.m
View File

@ -1,6 +1,6 @@
/* /*
Copyright (C) 2004-2005 SKYRIX Software AG Copyright (C) 2004-2005 SKYRIX Software AG
Copyright (C) 2005-2010 Inverse inc. Copyright (C) 2005-2015 Inverse inc.
This file is part of SOGo This file is part of SOGo
@ -378,9 +378,8 @@ static Class SOGoContactGCSEntryK = Nil;
result = [self redirectToLocation: [self modulePath]]; result = [self redirectToLocation: [self modulePath]];
else else
{ {
jsRefreshMethod jsRefreshMethod = [NSString stringWithFormat: @"refreshContacts('%@')",
= [NSString stringWithFormat: @"refreshContacts(\"%@\")", [contact nameInContainer]];
[contact nameInContainer]];
result = [self jsCloseWithRefreshMethod: jsRefreshMethod]; result = [self jsCloseWithRefreshMethod: jsRefreshMethod];
} }

9
UI/Contacts/UIxListEditor.m
View File

@ -1,6 +1,6 @@
/* UIxListEditor.m - this file is part of SOGo /* UIxListEditor.m - this file is part of SOGo
* *
* Copyright (C) 2008-2014 Inverse inc. * Copyright (C) 2008-2015 Inverse inc.
* *
* This file is free software; you can redistribute it and/or modify * This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -29,6 +29,8 @@
#import <NGCards/NGVCardReference.h> #import <NGCards/NGVCardReference.h>
#import <NGCards/NGVList.h> #import <NGCards/NGVList.h>
#import <SOGo/NSString+Utilities.h>
#import <Contacts/SOGoContactGCSEntry.h> #import <Contacts/SOGoContactGCSEntry.h>
#import <Contacts/SOGoContactGCSFolder.h> #import <Contacts/SOGoContactGCSFolder.h>
#import <Contacts/SOGoContactGCSList.h> #import <Contacts/SOGoContactGCSList.h>
@ -289,9 +291,8 @@
result = [self redirectToLocation: [self modulePath]]; result = [self redirectToLocation: [self modulePath]];
else else
{ {
jsRefreshMethod jsRefreshMethod = [NSString stringWithFormat: @"refreshContacts('%@')",
= [NSString stringWithFormat: @"refreshContacts(\"%@\")", [co nameInContainer]];
[co nameInContainer]];
result = [self jsCloseWithRefreshMethod: jsRefreshMethod]; result = [self jsCloseWithRefreshMethod: jsRefreshMethod];
} }
} }

4
UI/SOGoUI/UIxComponent.m
View File

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2007-2012 Inverse inc. Copyright (C) 2007-2015 Inverse inc.
Copyright (C) 2004 SKYRIX Software AG Copyright (C) 2004 SKYRIX Software AG
This file is part of SOGo This file is part of SOGo
@ -452,7 +452,7 @@ static SoProduct *commonProduct = nil;
jsClose = [UIxJSClose new]; jsClose = [UIxJSClose new];
[jsClose autorelease]; [jsClose autorelease];
[jsClose setRefreshMethod: methodName]; [jsClose setRefreshMethod: [methodName doubleQuotedString]];
return jsClose; return jsClose;
} }

2
UI/Templates/UIxJSClose.wox
View File

@ -17,7 +17,7 @@
><script type="text/javascript" ><script type="text/javascript"
><var:if condition="hasRefreshMethod"> ><var:if condition="hasRefreshMethod">
var p = <var:if condition="singleWindowModeEnabled">parent</var:if><var:if condition="singleWindowModeEnabled" const:negate="YES">window.opener</var:if>; var p = <var:if condition="singleWindowModeEnabled">parent</var:if><var:if condition="singleWindowModeEnabled" const:negate="YES">window.opener</var:if>;
if (p) p.setTimeout('<var:string value="refreshMethod" const:escapeHTML="NO" />;', 50); if (p) p.setTimeout(<var:string value="refreshMethod" const:escapeHTML="NO" />, 50);
</var:if> </var:if>
onCloseButtonClick(); onCloseButtonClick();
</script> </script>