Skip to content

Commit 9b680c9

Browse files
committed
0.6.0
1 parent b9de228 commit 9b680c9

File tree

6 files changed

+26
-22
lines changed

6 files changed

+26
-22
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cross-storage",
3-
"version": "0.5.1",
3+
"version": "0.6.0",
44
"description": "Cross domain local storage",
55
"license": "Apache-2.0",
66
"authors": [

dist/client.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* cross-storage - Cross domain local storage
33
*
4-
* @version 0.5.1
4+
* @version 0.6.0
55
* @link https://github.com/zendesk/cross-storage
66
* @author Daniel St. Jules <[email protected]>
77
* @copyright Zendesk
@@ -275,7 +275,7 @@ CrossStorageClient.prototype._installListener = function() {
275275
if (message.origin !== client._origin) return;
276276

277277
// LocalStorage isn't available in the hub
278-
if (message.data === 'unavailable') {
278+
if (message.data === 'cross-storage:unavailable') {
279279
if (!client._closed) client.close();
280280
if (!client._requests.connect) return;
281281

@@ -288,7 +288,7 @@ CrossStorageClient.prototype._installListener = function() {
288288
}
289289

290290
// Handle initial connection
291-
if (!client._connected) {
291+
if (message.data.indexOf('cross-storage:') !== -1 && !client._connected) {
292292
client._connected = true;
293293
if (!client._requests.connect) return;
294294

@@ -298,7 +298,7 @@ CrossStorageClient.prototype._installListener = function() {
298298
delete client._requests.connect;
299299
}
300300

301-
if (message.data === 'ready') return;
301+
if (message.data === 'cross-storage:ready') return;
302302

303303
// All other messages
304304
try {
@@ -335,7 +335,7 @@ CrossStorageClient.prototype._poll = function() {
335335
if (client._connected) return clearInterval(interval);
336336
if (!client._hub) return;
337337

338-
client._hub.postMessage('poll', client._origin);
338+
client._hub.postMessage('cross-storage:poll', client._origin);
339339
}, 1000);
340340
};
341341

@@ -391,7 +391,7 @@ CrossStorageClient.prototype._request = function(method, params) {
391391

392392
req = {
393393
id: this._id + ':' + client._count,
394-
method: method,
394+
method: 'cross-storage:' + method,
395395
params: params
396396
};
397397

dist/client.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/hub.js

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* cross-storage - Cross domain local storage
33
*
4-
* @version 0.5.1
4+
* @version 0.6.0
55
* @link https://github.com/zendesk/cross-storage
66
* @author Daniel St. Jules <[email protected]>
77
* @copyright Zendesk
@@ -40,15 +40,15 @@ CrossStorageHub.init = function(permissions) {
4040

4141
if (!available) {
4242
try {
43-
return window.parent.postMessage('unavailable', '*');
43+
return window.parent.postMessage('cross-storage:unavailable', '*');
4444
} catch (e) {
4545
return;
4646
}
4747
}
4848

4949
CrossStorageHub._permissions = permissions || [];
5050
CrossStorageHub._installListener();
51-
window.parent.postMessage('ready', '*');
51+
window.parent.postMessage('cross-storage:ready', '*');
5252
};
5353

5454
/**
@@ -75,22 +75,26 @@ CrossStorageHub._installListener = function() {
7575
* @param {MessageEvent} message A message to be processed
7676
*/
7777
CrossStorageHub._listener = function(message) {
78-
var uri, available, request, error, result, response;
78+
var uri, available, request, method, error, result, response;
7979

8080
// Handle polling for a ready message
81-
if (message.data === 'poll') {
82-
return window.parent.postMessage('ready', message.origin);
81+
if (message.data === 'cross-storage:poll') {
82+
return window.parent.postMessage('cross-storage:ready', message.origin);
8383
}
8484

8585
// Ignore the ready message when viewing the hub directly
86-
if (message.data === 'ready') return;
86+
if (message.data === 'cross-storage:ready') return;
87+
8788
request = JSON.parse(message.data);
89+
method = request.method.split('cross-storage:')[1];
8890

89-
if (!CrossStorageHub._permitted(message.origin, request.method)) {
90-
error = 'Invalid permissions for ' + request.method;
91+
if (!method) {
92+
return;
93+
} else if (!CrossStorageHub._permitted(message.origin, method)) {
94+
error = 'Invalid permissions for ' + method;
9195
} else {
9296
try {
93-
result = CrossStorageHub['_' + request.method](request.params);
97+
result = CrossStorageHub['_' + method](request.params);
9498
} catch (err) {
9599
error = err.message;
96100
}

dist/hub.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cross-storage",
3-
"version": "0.5.1",
3+
"version": "0.6.0",
44
"description": "Cross domain local storage",
55
"keywords": [
66
"local",

0 commit comments

Comments
 (0)