diff options
author | Nivesh Rajbhandari | 2012-03-27 09:32:53 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-27 09:32:53 -0700 |
commit | 406bbfc63f8ed42d7da105dbd068a49ff8fb5f09 (patch) | |
tree | 3a8b45f4802f002269ff1bcf596f94cee4679a07 /node_modules/montage/ui/template.js | |
parent | bda9f8f5829c943486f8850e68c991e83f8fb8c8 (diff) | |
parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
download | ninja-406bbfc63f8ed42d7da105dbd068a49ff8fb5f09.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/template.js')
-rwxr-xr-x | node_modules/montage/ui/template.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node_modules/montage/ui/template.js b/node_modules/montage/ui/template.js index c6589b35..210d8cb7 100755 --- a/node_modules/montage/ui/template.js +++ b/node_modules/montage/ui/template.js | |||
@@ -438,7 +438,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont | |||
438 | 438 | ||
439 | for (var i = 0, cssTag; (cssTag = cssTags[i]); i++) { | 439 | for (var i = 0, cssTag; (cssTag = cssTags[i]); i++) { |
440 | if ((url = cssTag.getAttribute("href"))) { | 440 | if ((url = cssTag.getAttribute("href"))) { |
441 | if (! /^http:\/\/|^\//.test(url)) { // TODO: look into base links... | 441 | if (! /^https?:\/\/|^\//.test(url)) { // TODO: look into base links... |
442 | url = rootUrl + url; | 442 | url = rootUrl + url; |
443 | } | 443 | } |
444 | 444 | ||
@@ -547,7 +547,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont | |||
547 | src = script.getAttribute("src"); | 547 | src = script.getAttribute("src"); |
548 | scriptNode = doc.importNode(script, true); | 548 | scriptNode = doc.importNode(script, true); |
549 | if (src) { | 549 | if (src) { |
550 | if (! /^http:\/\/|^\//.test(src)) { // TODO: look into base links... | 550 | if (! /^https?:\/\/|^\//.test(src)) { // TODO: look into base links... |
551 | scriptNode.src = src = rootUrl + src; | 551 | scriptNode.src = src = rootUrl + src; |
552 | } | 552 | } |
553 | if (src in externalScriptsLoaded) continue; | 553 | if (src in externalScriptsLoaded) continue; |
@@ -688,7 +688,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont | |||
688 | url = link.getAttribute("href"), | 688 | url = link.getAttribute("href"), |
689 | rootUrl = this._rootUrl ? this._rootUrl[0] : ""; | 689 | rootUrl = this._rootUrl ? this._rootUrl[0] : ""; |
690 | 690 | ||
691 | if (! /^http:\/\/|^\//.test(url)) { | 691 | if (! /^https?:\/\/|^\//.test(url)) { |
692 | url = rootUrl + url; | 692 | url = rootUrl + url; |
693 | } | 693 | } |
694 | 694 | ||