amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-05 08:34:30 +00:00
Code Issues Projects Releases Wiki Activity

Improve detection of theme-specific JavaScript

Browse Source
This commit is contained in:
Francis Lachapelle
2014-08-13 16:11:28 -04:00
parent a70287870b
commit c8ea3da5bc
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Common/UIxPageFrame.m
+13 -6
View File
@@ -273,42 +273,49 @@
- (NSString *) pageJavaScriptURL
{
WOComponent *page;
NSString *theme, *filename;
NSString *theme, *filename, *url;
url = nil;
page = [context page];
theme = [context objectForKey: @"theme"];
if ([theme length])
{
filename = [NSString stringWithFormat: @"js/%@/%@.js", theme, NSStringFromClass([page class])];
url = [self urlForResourceFilename: filename];
}
else
if ([url length] == 0)
{
// No theme defined or no specific JavaScript for the theme; rollback to default JavaScript
filename = [NSString stringWithFormat: @"js/%@.js", NSStringFromClass([page class])];
url = [self urlForResourceFilename: filename];
}
NSLog(@"pageJavaScript => %@", filename);
return [self urlForResourceFilename: filename];
return url;
}
- (NSString *) productJavaScriptURL
{
WOComponent *page;
NSString *theme, *filename;
NSString *theme, *filename, *url;
url = nil;
page = [context page];
[context resourceLookupLanguages];
theme = [context objectForKey: @"theme"];
if ([theme length])
{
filename = [NSString stringWithFormat: @"js/%@/%@.js", theme, [page frameworkName]];
url = [self urlForResourceFilename: filename];
}
else
if ([url length] == 0)
{
filename = [NSString stringWithFormat: @"js/%@.js", [page frameworkName]];
url = [self urlForResourceFilename: filename];
}
NSLog(@"productJavaScript => %@", filename);
return [self urlForResourceFilename: filename];
return url;
}
- (BOOL) hasPageSpecificJavaScript