Skip to content

Commit

Permalink
0.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
danielstjules committed Mar 9, 2015
1 parent 0a546a6 commit 06b3d83
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cross-storage",
"version": "0.6.0",
"version": "0.6.1",
"description": "Cross domain local storage",
"license": "Apache-2.0",
"authors": [
Expand Down
12 changes: 9 additions & 3 deletions dist/client.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* cross-storage - Cross domain local storage
*
* @version 0.6.0
* @version 0.6.1
* @link https://github.com/zendesk/cross-storage
* @author Daniel St. Jules <[email protected]>
* @copyright Zendesk
Expand Down Expand Up @@ -100,7 +100,7 @@ CrossStorageClient.frameStyle = {
* @returns {string} The origin of the url
*/
CrossStorageClient._getOrigin = function(url) {
var uri, origin;
var uri, protocol, origin;

uri = document.createElement('a');
uri.href = url;
Expand All @@ -109,7 +109,13 @@ CrossStorageClient._getOrigin = function(url) {
uri = window.location;
}

origin = uri.protocol + '//' + uri.host;
if (!uri.protocol || uri.protocol === ':') {
protocol = window.location.protocol;
} else {
protocol = uri.protocol;
}

origin = protocol + '//' + uri.host;
origin = origin.replace(/:80$|:443$/, '');

return origin;
Expand Down
4 changes: 2 additions & 2 deletions dist/client.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/hub.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* cross-storage - Cross domain local storage
*
* @version 0.6.0
* @version 0.6.1
* @link https://github.com/zendesk/cross-storage
* @author Daniel St. Jules <[email protected]>
* @copyright Zendesk
Expand Down
2 changes: 1 addition & 1 deletion dist/hub.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cross-storage",
"version": "0.6.0",
"version": "0.6.1",
"description": "Cross domain local storage",
"keywords": [
"local",
Expand Down

0 comments on commit 06b3d83

Please sign in to comment.