CriticalDepsMirror/clay
1
0
Fork 0
mirror of https://github.com/pebble-dev/clay.git synced 2026-09-03 23:57:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56 from pebble/#55/unicode-support

Browse Source 
Allow unicode characters in config
This commit is contained in:
keegan-lillo
2016-03-16 09:12:30 +11:00
parent b466c48487 4ff38eb0ba
commit 08e3a21429
3 changed files with 25 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev/emulator.html
+6 -1
View File
@@ -20,9 +20,14 @@
var returnTo = getQueryParam('return_to'); var returnTo = getQueryParam('return_to');
var data = decodeURIComponent(location.hash.substring(1)); var data = decodeURIComponent(location.hash.substring(1));
if (data) {
// Check if we dealing with a base64 encoded URI
if (data && data.charAt(0) !== '<') {
data = window.atob(data).replace('$$RETURN_TO$$', returnTo); data = window.atob(data).replace('$$RETURN_TO$$', returnTo);
window.location.href = 'data:text/html;base64,' + encodeURIComponent(window.btoa(data)); window.location.href = 'data:text/html;base64,' + encodeURIComponent(window.btoa(data));
} else if (data) {
data = data.replace('$$RETURN_TO$$', returnTo);
window.location.href = 'data:text/html;charset=utf-8,' + encodeURIComponent(data);
} }
</script> </script>
<body> <body>
index.js
+3 -49
View File
@@ -184,58 +184,12 @@ Clay.prototype.getSettings = function(response, convert) {
/** /**
* @param {string} input * @param {string} input
* @param {string} [prefix] * @param {string} [prefix='data:text/html;charset=utf-8,']
* @returns {string} * @returns {string}
*/ */
Clay.encodeDataUri = function(input, prefix) { Clay.encodeDataUri = function(input, prefix) {
prefix = typeof prefix !== 'undefined' ? prefix : 'data:text/html;base64,'; prefix = typeof prefix !== 'undefined' ? prefix : 'data:text/html;charset=utf-8,';
return prefix + encodeURIComponent(input);
if (window.btoa) {
return prefix + encodeURIComponent(window.btoa(input));
}
// iOS doesn't have a window so we need to polyfil window.btoa
// extracted from https://github.com/inexorabletash/polyfill
var B64_ALPHABET =
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
input = String(input);
var position = 0;
var out = [];
var o1;
var o2;
var o3;
var e1;
var e2;
var e3;
var e4;
if (/[^\x00-\xFF]/.test(input)) { throw Error('InvalidCharacterError'); }
while (position < input.length) {
o1 = input.charCodeAt(position++);
o2 = input.charCodeAt(position++);
o3 = input.charCodeAt(position++);
// 111111 112222 222233 333333
e1 = o1 >> 2;
e2 = ((o1 & 0x3) << 4) | (o2 >> 4);
e3 = ((o2 & 0xf) << 2) | (o3 >> 6);
e4 = o3 & 0x3f;
if (position === input.length + 2) {
e3 = 64;
e4 = 64;
} else if (position === input.length + 1) {
e4 = 64;
}
out.push(B64_ALPHABET.charAt(e1),
B64_ALPHABET.charAt(e2),
B64_ALPHABET.charAt(e3),
B64_ALPHABET.charAt(e4));
}
return prefix + encodeURIComponent(out.join(''));
}; };
/** /**
test/spec/index.js
+16 -41
View File
@@ -153,7 +153,7 @@ describe('Clay', function() {
* @returns {string} * @returns {string}
*/ */
function decodeUrl(url) { function decodeUrl(url) {
return atob(decodeURIComponent(url.replace(/^.*?[#,]/, ''))); return decodeURIComponent(url.replace(/^.*?[#,]/, ''));
} }
describe('string substitutions', function() { describe('string substitutions', function() {
@@ -360,50 +360,25 @@ describe('Clay', function() {
}); });
describe('Clay.encodeDataUri()', function() { describe('Clay.encodeDataUri()', function() {
it('adds the correct prefix', function() {
/** assert.equal(Clay.encodeDataUri('<test>', 'prefix:'), 'prefix:%3Ctest%3E');
* @return {void} assert.equal(
*/ Clay.encodeDataUri('<test>'),
function testEncodeDataUri() { 'data:text/html;charset=utf-8,%3Ctest%3E'
it('adds the correct prefix', function() { );
assert.equal(Clay.encodeDataUri('test', 'prefix:'), 'prefix:dGVzdA%3D%3D');
assert.equal(
Clay.encodeDataUri('test'),
'data:text/html;base64,dGVzdA%3D%3D'
);
});
it('encodes the data correctly', function() {
assert.equal(Clay.encodeDataUri('test', ''), 'dGVzdA%3D%3D');
assert.equal(Clay.encodeDataUri('test{2}', ''), 'dGVzdHsyfQ%3D%3D');
assert.equal(Clay.encodeDataUri('test{10}', ''), 'dGVzdHsxMH0%3D');
});
it('throws if the input is invalid', function() {
assert.throws(function() {
Clay.encodeDataUri('♥');
});
});
}
describe('native', function() {
testEncodeDataUri();
}); });
describe('polyfill', function() { it('encodes the data correctly', function() {
var btoaOriginal = window.btoa; assert.equal(Clay.encodeDataUri('test', ''), 'test');
assert.equal(Clay.encodeDataUri('test{2}', ''), 'test%7B2%7D');
before(function() { assert.equal(Clay.encodeDataUri('test{10}', ''), 'test%7B10%7D');
window.btoa = undefined;
});
testEncodeDataUri();
after(function() {
window.btoa = btoaOriginal;
});
}); });
it('does not throw if unicode character is provided', function() {
assert.doesNotThrow(function() {
Clay.encodeDataUri('♥');
});
});
}); });
describe('.prepareForAppMessage', function() { describe('.prepareForAppMessage', function() {