infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Revert "fix undefined reference" 

This reverts commit 7d65540123.

To restore functionality in convert.js
pull/1/head
ansuz 2016-03-09 10:32:57 +01:00
parent c67451bc1a
commit 8258018c1d
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
www/common/convert.js
View File

@ -1,14 +1,16 @@
define([
'/common/virtual-dom.js',
'/common/hyperjson.js',
'/common/hyperscript.js'
], function (hyperjson, hyperscript) {
], function (vdom, hyperjson, hyperscript) {
// complain if you don't find the required APIs
if (!(hyperjson && hyperscript)) { throw new Error(); }
if (!(vdom && hyperjson && hyperscript)) { throw new Error(); }
// Generate a matrix of conversions
/*
convert.dom.to.hjson, convert.hjson.to.dom,
convert.dom.to.vdom, convert.vdom.to.dom,
convert.vdom.to.hjson, convert.hjson.to.vdom
and of course, identify functions in case you try to
convert a datatype to itself
@ -34,8 +36,17 @@ define([
vdom: function (H) {
return hyperjson.callOn(H, vdom.h);
}
},
vdom:{
vdom: Self,
dom: function (V) {
return vdom.create(V);
},
hjson: function (V) {
return hyperjson.fromDOM(vdom.create(V));
}
}
},
},
convert = {};
Object.keys(methods).forEach(function (method) {
convert[method] = { to: methods[method] };
@ -44,6 +55,7 @@ define([
}());
convert.core = {
vdom: vdom,
hyperjson: hyperjson,
hyperscript: hyperscript
};