diff --git a/CHANGELOG b/CHANGELOG index 196032b1..e019746d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +0.4.6 +-------------------------------------------------------- +- BUG修复模块 + * base/util 模块的 _$url2origin 接口支持相对协议 + 0.4.5 (2017-09-14) -------------------------------------------------------- - 功能支持 diff --git a/src/base/util.js b/src/base/util.js index 7f995dfa..237f22a7 100644 --- a/src/base/util.js +++ b/src/base/util.js @@ -766,7 +766,13 @@ NEJ.define([ _p._$url2origin = (function(){ var _reg = /^([\w]+?:\/\/.*?(?=\/|$))/i; return function(_url){ - if (_reg.test(_url||'')) + _url = _url||''; + // fix relative protocol + if (_url.indexOf('//')===0){ + _url = location.protocol+_url; + } + // dump origin + if (_reg.test(_url)) return RegExp.$1.toLowerCase(); return ''; };