diff options
| author | Armen Kesablyan | 2012-06-25 11:14:40 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-25 11:14:40 -0700 |
| commit | 446f475c35e3d0d5d6cb6ca35346e548de6c36f9 (patch) | |
| tree | 0b7e7154979754db2c0ebb7b7908c555068d515d /js/document | |
| parent | 7867aec2620b65605180979b5049cfa154ca7dd1 (diff) | |
| parent | 35aebe8d72ccfa9ea010eb79c09ecf89cc1ed44d (diff) | |
| download | ninja-446f475c35e3d0d5d6cb6ca35346e548de6c36f9.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/document')
| -rwxr-xr-x | js/document/helpers/url-parser.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/document/helpers/url-parser.js b/js/document/helpers/url-parser.js index 5e71d148..7bded27d 100755 --- a/js/document/helpers/url-parser.js +++ b/js/document/helpers/url-parser.js | |||
| @@ -53,7 +53,7 @@ exports.UrlParser = Montage.create(Component, { | |||
| 53 | //Getting file URI (not URL since we must load through I/O API) | 53 | //Getting file URI (not URL since we must load through I/O API) |
| 54 | var css = {}, file; | 54 | var css = {}, file; |
| 55 | css.cssUrl = href.split(this.application.ninja.coreIoApi.rootUrl)[1]; | 55 | css.cssUrl = href.split(this.application.ninja.coreIoApi.rootUrl)[1]; |
| 56 | css.fileUri = this.application.ninja.coreIoApi.cloudData.root + css.cssUrl; | 56 | css.fileUri = this.application.ninja.coreIoApi.cloudData.root + unescape(css.cssUrl); |
| 57 | //Loading data from CSS file | 57 | //Loading data from CSS file |
| 58 | file = this.application.ninja.coreIoApi.readFile({uri: css.fileUri}); | 58 | file = this.application.ninja.coreIoApi.readFile({uri: css.fileUri}); |
| 59 | //Checking for file to be writable on disk | 59 | //Checking for file to be writable on disk |