| author | Josh <jokajak@gmail.com> | 2012-03-17 19:29:33 (UTC) |
|---|---|---|
| committer | Josh <jokajak@gmail.com> | 2012-03-17 19:29:33 (UTC) |
| commit | 0e396afdc4aa9ec8734ba48f90e9fefbad3b2b33 (patch) (side-by-side diff) | |
| tree | 2ace8ec32d24c1d34b4578fe9297c4e4b4b97720 /scripts/builder/frontendBuilder.py | |
| parent | ff33328861685c1a2d5f9b729a2b3595509c38ee (diff) | |
| parent | 6f7ead0446aae6dd9f40b183e402b059a33d0517 (diff) | |
| download | clipperz-0e396afdc4aa9ec8734ba48f90e9fefbad3b2b33.zip clipperz-0e396afdc4aa9ec8734ba48f90e9fefbad3b2b33.tar.gz clipperz-0e396afdc4aa9ec8734ba48f90e9fefbad3b2b33.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts/builder/frontendBuilder.py') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | scripts/builder/frontendBuilder.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/builder/frontendBuilder.py b/scripts/builder/frontendBuilder.py index dae837b..1f0f92f 100644 --- a/scripts/builder/frontendBuilder.py +++ b/scripts/builder/frontendBuilder.py @@ -88,7 +88,8 @@ class FrontendBuilder(object): def template (self): processedFile = 'html_template' if not self.processedFiles.has_key(processedFile): - self.processedFiles[processedFile] = self.loadFilesContent('html', ['index_template.html']) + # self.processedFiles[processedFile] = self.loadFilesContent('html', ['index_template.html']) + self.processedFiles[processedFile] = self.loadFilesContent('html', [self.settings['html.template']]) return self.processedFiles[processedFile] @@ -319,7 +320,7 @@ class FrontendBuilder(object): def scriptTagsForFiles (self, basePath, files): #<script type='text/javascript' src='./js/src/bookmarklet.js'></script> - return '\n'.join(map(lambda file: '<script type="text/javascript" src="' + basePath + '/' + file + '"></script>', files)) + return '\n'.join(map(lambda file: '<script type="text/javascript" src="' + basePath + '/' + file + '" charset="utf-8"></script>', files)) def scriptTagForContent (self, content): |