Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into integration

Conflicts:
	js/io/system/ninjalibrary.json

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
 
         for (var i = 0, cssTag; (cssTag = cssTags[i]); i++) {
             if ((url = cssTag.getAttribute("href"))) {
-                if (! /^http:\/\/|^\//.test(url)) { // TODO: look into base links...
+                if (! /^https?:\/\/|^\//.test(url)) { // TODO: look into base links...
                     url = rootUrl + url;
                 }
 
@@ -547,7 +547,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
             src = script.getAttribute("src");
             scriptNode = doc.importNode(script, true);
             if (src) {
-                if (! /^http:\/\/|^\//.test(src)) { // TODO: look into base links...
+                if (! /^https?:\/\/|^\//.test(src)) { // TODO: look into base links...
                     scriptNode.src = src = rootUrl + src;
                 }
                 if (src in externalScriptsLoaded) continue;
@@ -688,7 +688,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
                 url = link.getAttribute("href"),
                 rootUrl = this._rootUrl ? this._rootUrl[0] : "";
 
-            if (! /^http:\/\/|^\//.test(url)) {
+            if (! /^https?:\/\/|^\//.test(url)) {
                 url = rootUrl + url;
             }