Https handling

This commit is contained in:
2015-11-24 19:30:53 +08:00
parent 86605da37a
commit 3b898d0a63
5 changed files with 38 additions and 1 deletions

View File

@@ -10,7 +10,10 @@
var IE = Boolean( document[ "all" ] );
var ALLOWED_ORIGINS = window[ "allowed_origins" ] || [];
var SECURE_HTTP = window.location.href.match( /^https:\/\// );
ns[ NS_EXPORT ]( EX_READONLY_GETTER, "debug", debug );
ns[ NS_EXPORT ]( EX_CONST, "IE", IE );
ns[ NS_EXPORT ]( EX_CONST, "ALLOWED_ORIGINS", ALLOWED_ORIGINS );
ns[ NS_EXPORT ]( EX_CONST, "SECURE_HTTP", SECURE_HTTP );
})();

View File

@@ -1,5 +1,7 @@
(function(){
var ns = __namespace( "System.utils" );
var Global = __import( "System.Global" );
// Get prop from obj if obj.<prop> is <type>
var objGetProp = function ( obj, prop, type )
@@ -35,7 +37,28 @@
}
};
var SiteProto = function( path )
{
if( path.match( /^https?:\/\// ) )
{
if( Global.SECURE_HTTP )
{
return path.replace( /^http:\/\//, "https://" );
}
else
{
return path.replace( /^https:\/\//, "http://" );
}
}
else
{
return "http" + ( Global.SECURE_HTTP ? "s" : "" ) + "://" + path;;
}
};
ns[ NS_EXPORT ]( EX_FUNC, "objGetProp", objGetProp );
ns[ NS_EXPORT ]( EX_FUNC, "objSearch", objSearch );
ns[ NS_EXPORT ]( EX_FUNC, "objMap", objMap );
ns[ NS_EXPORT ]( EX_FUNC, "siteProto", SiteProto );
})();